From e3621eb0573e44288a510fc0e380d06271a1c143 Mon Sep 17 00:00:00 2001
From: Brandon Heller <brandonh@stanford.edu>
Date: Sat, 26 Dec 2009 07:40:57 -0800
Subject: [PATCH] Move fixLimits function to util
---
mininet/net.py | 9 ++-------
mininet/util.py | 9 ++++++++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/mininet/net.py b/mininet/net.py
index c9f525e5..47f94562 100755
--- a/mininet/net.py
+++ b/mininet/net.py
@@ -71,12 +71,11 @@
from time import sleep
import os, re, signal, sys, select
flush = sys.stdout.flush
-from resource import setrlimit, RLIMIT_NPROC, RLIMIT_NOFILE
from mininet.logging_mod import lg, set_loglevel
from mininet.node import Node, Host, Controller, Switch
from mininet.util import run, checkRun, quietRun, makeIntfPair, moveIntf
-from mininet.util import createLink
+from mininet.util import createLink, setLimits
DATAPATHS = ['user', 'kernel']
@@ -532,11 +531,7 @@ def run( self ):
else:
lg.error("cli: unknown node or command: < %s >\n" % first)
lg.info("*** cli: exiting\n")
-
-def fixLimits():
- "Fix ridiculously small resource limits."
- setrlimit( RLIMIT_NPROC, ( 4096, 8192 ) )
- setrlimit( RLIMIT_NOFILE, ( 16384, 32768 ) )
+
def init():
"Initialize Mininet."
diff --git a/mininet/util.py b/mininet/util.py
index 1b41165e..ab398e4a 100644
--- a/mininet/util.py
+++ b/mininet/util.py
@@ -2,6 +2,7 @@
'''Utility functions for Mininet.'''
from time import sleep
+from resource import setrlimit, RLIMIT_NPROC, RLIMIT_NOFILE
import select
from subprocess import call, check_call, Popen, PIPE, STDOUT
@@ -166,4 +167,10 @@ def createLink(node1, node2):
retry(3, MOVEINTF_DELAY, moveIntf, intf2, node2)
node1.connection[intf1] = (node2, intf2)
node2.connection[intf2] = (node1, intf1)
- return intf1, intf2
\ No newline at end of file
+ return intf1, intf2
+
+
+def fixLimits():
+ '''Fix ridiculously small resource limits.'''
+ setrlimit( RLIMIT_NPROC, (4096, 8192))
+ setrlimit( RLIMIT_NOFILE, (16384, 32768))
\ No newline at end of file
--
GitLab