git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Port changes to release branch
[util-vserver.git]
/
python
/
bwlimit.py
diff --git
a/python/bwlimit.py
b/python/bwlimit.py
index
b408caa
..
bfab4f7
100644
(file)
--- a/
python/bwlimit.py
+++ b/
python/bwlimit.py
@@
-80,7
+80,7
@@
def get_defaults(cap_file="/etc/planetlab/bwcap", default_cap="10mbit"):
return cap, cburst, share, quantum
return cap, cburst, share, quantum
-def init(eth):
+def init(eth
= "eth0"
):
global TC, OPS
cap, cburst, share, quantum = get_defaults()
global TC, OPS
cap, cburst, share, quantum = get_defaults()
@@
-115,16
+115,18
@@
def init(eth):
(TC, op, eth)
if run(cmd): break
(TC, op, eth)
if run(cmd): break
-def on(xid, eth,
bwlimit, cap, minrate, maxrat
e):
+def on(xid, eth,
share, minrate, maxrate = Non
e):
global TC, OPS
default_cap, default_cburst, default_share, default_quantum = get_defaults()
global TC, OPS
default_cap, default_cburst, default_share, default_quantum = get_defaults()
- quantum = bwlimit * default_quantum
+ if maxrate == None:
+ maxrate = default_cap
+ quantum = share * default_quantum
# Set up the per-vserver token bucket
for op in OPS:
cmd = "%s class %s dev %s parent 1:1 classid 1:%d htb rate %s ceil %s quantum %d cburst %d" % \
# Set up the per-vserver token bucket
for op in OPS:
cmd = "%s class %s dev %s parent 1:1 classid 1:%d htb rate %s ceil %s quantum %d cburst %d" % \
- (TC, op, eth, xid, minrate,
cap
, quantum, default_cburst)
+ (TC, op, eth, xid, minrate,
maxrate
, quantum, default_cburst)
if run(cmd): break
# The next command appears to throttle back processes that are
if run(cmd): break
# The next command appears to throttle back processes that are