X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bwmon.py;h=0af380da57d254c8682b892290ea90d952a2c622;hb=c4f0234eb8faeef084d48c1c4f995a3a62666d40;hp=14c089fdc140c3c93182684cceeaa999fcf04e47;hpb=69c08c5f1b11b06b937f5ceda811a63676d80f31;p=mom.git

diff --git a/bwmon.py b/bwmon.py
index 14c089f..0af380d 100755
--- 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
 #
-# $Id: bwmon.py,v 1.16 2006/12/19 16:52:24 faiyaza Exp $
+# $Id: bwmon.py,v 1.19 2007/01/08 21:58:13 faiyaza Exp $
 #
 
 import syslog
@@ -160,11 +160,11 @@ class Slice:
             # If/when PLC switches to byte limits, the avgrates wont be used as
             # slice attributes and will return as 0
             if (avgrate != 0):
-                self.ByteMax = avgrate * period 
+                self.ByteMax = int(avgrate * period / 8) 
                 self.ByteThresh = int(self.ByteMax * .8)
 
             if (avgexemptrate != 0):
-                self.ExemptByteMax = avgexemptrate * period
+                self.ExemptByteMax = int(avgexemptrate * period / 8)
                 self.ExemptByteThresh = int(self.ExemptByteMax * .8)
 
         except Exception, err:
@@ -215,7 +215,7 @@ class Slice:
 
         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:
@@ -240,7 +240,7 @@ class Slice:
     
         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:
@@ -336,11 +336,11 @@ def main():
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file
-        if version != "$Id: bwmon.py,v 1.16 2006/12/19 16:52:24 faiyaza Exp $":
+        if version != "$Id: bwmon.py,v 1.19 2007/01/08 21:58:13 faiyaza Exp $":
             print "Not using old version '%s' data file %s" % (version, datafile)
             raise Exception
     except Exception:
-        version = "$Id: bwmon.py,v 1.16 2006/12/19 16:52:24 faiyaza Exp $"
+        version = "$Id: bwmon.py,v 1.19 2007/01/08 21:58:13 faiyaza Exp $"
         slices = {}
 
     # Get special slice IDs