git://git.onelab.eu
/
mom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88c1112
)
* bwlimit.set() expects bits/s. Was giving it bytes/s.
author
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Wed, 10 Jan 2007 16:51:04 +0000
(16:51 +0000)
committer
Faiyaz Ahmed
<faiyaza@cs.princeton.edu>
Wed, 10 Jan 2007 16:51:04 +0000
(16:51 +0000)
bwmon.py
patch
|
blob
|
history
diff --git
a/bwmon.py
b/bwmon.py
index
bc7c0bb
..
0af380d
100755
(executable)
--- a/
bwmon.py
+++ b/
bwmon.py
@@
-15,7
+15,7
@@
# Faiyaz Ahmed <faiyaza@cs.princeton.edu>
# Copyright (C) 2004-2006 The Trustees of Princeton University
#
# Faiyaz Ahmed <faiyaza@cs.princeton.edu>
# Copyright (C) 2004-2006 The Trustees of Princeton University
#
-# $Id: bwmon.py,v 1.1
7 2007/01/03 20:15:06
faiyaza Exp $
+# $Id: bwmon.py,v 1.1
9 2007/01/08 21:58:13
faiyaza Exp $
#
import syslog
#
import syslog
@@
-215,7
+215,7
@@
class Slice:
if bytes >= (self.bytes + self.ByteThresh):
new_maxrate = \
if bytes >= (self.bytes + self.ByteThresh):
new_maxrate = \
- int((
self.ByteMax - (bytes - self.bytes)
)/(period - int(time.time() - self.time)))
+ int((
(self.ByteMax - (bytes - self.bytes)) * 8
)/(period - int(time.time() - self.time)))
if new_maxrate < default_MinRate:
new_maxrate = default_MinRate
else:
if new_maxrate < default_MinRate:
new_maxrate = default_MinRate
else:
@@
-240,7
+240,7
@@
class Slice:
if exemptbytes >= (self.exemptbytes + self.ExemptByteThresh):
new_maxexemptrate = \
if exemptbytes >= (self.exemptbytes + self.ExemptByteThresh):
new_maxexemptrate = \
- int((
self.ExemptByteMax - (self.bytes - bytes)
)/(period - int(time.time() - self.time)))
+ int((
(self.ExemptByteMax - (self.bytes - bytes)) * 8
)/(period - int(time.time() - self.time)))
if new_maxexemptrate < default_MinRate:
new_maxexemptrate = default_MinRate
else:
if new_maxexemptrate < default_MinRate:
new_maxexemptrate = default_MinRate
else:
@@
-336,11
+336,11
@@
def main():
(version, slices) = pickle.load(f)
f.close()
# Check version of data file
(version, slices) = pickle.load(f)
f.close()
# Check version of data file
- if version != "$Id: bwmon.py,v 1.1
7 2007/01/03 20:15:06
faiyaza Exp $":
+ if version != "$Id: bwmon.py,v 1.1
9 2007/01/08 21:58:13
faiyaza Exp $":
print "Not using old version '%s' data file %s" % (version, datafile)
raise Exception
except Exception:
print "Not using old version '%s' data file %s" % (version, datafile)
raise Exception
except Exception:
- version = "$Id: bwmon.py,v 1.1
7 2007/01/03 20:15:06
faiyaza Exp $"
+ version = "$Id: bwmon.py,v 1.1
9 2007/01/08 21:58:13
faiyaza Exp $"
slices = {}
# Get special slice IDs
slices = {}
# Get special slice IDs