X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bwmon.py;h=0af380da57d254c8682b892290ea90d952a2c622;hb=7c33ef6eebc6b1e32e87d09efc43e20f96bc30f9;hp=4c4df999cd3ae2a23463a9d80f7b7fe55c35325a;hpb=1b8727be0f8a423eeb0de828fdfffaf48b946386;p=mom.git

diff --git a/bwmon.py b/bwmon.py
index 4c4df99..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.17 2007/01/03 20:15:06 faiyaza Exp $
+# $Id: bwmon.py,v 1.19 2007/01/08 21:58:13 faiyaza Exp $
 #
 
 import syslog
@@ -167,17 +167,6 @@ class Slice:
                 self.ExemptByteMax = int(avgexemptrate * period / 8)
                 self.ExemptByteThresh = int(self.ExemptByteMax * .8)
 
-            if debug and verbose:
-                print "%s - \n" \
-                    "  self.maxrate %s \n" \
-                    "  self.maxexemptrate %s \n" \
-                    "  ByteMax %s \n" \
-                    "  ExemptByteMax %s \n" \
-                    "  ByteThresh %s \n" \
-                    "  ExemptByteThresh %s \n" \
-                    "  avgrate - %s \n" \
-                    "  avgexemptrate - %s" % (self.name, self.maxrate, self.maxexemptrate, ByteMax, ExemptByteMax, ByteThresh, ExemptByteThresh, avgrate, avgexemptrate)
-
         except Exception, err:
             print "Warning: Exception received while querying NM:", err
 
@@ -226,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:
@@ -251,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:
@@ -347,11 +336,11 @@ def main():
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file
-        if version != "$Id: bwmon.py,v 1.17 2007/01/03 20:15:06 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.17 2007/01/03 20:15:06 faiyaza Exp $"
+        version = "$Id: bwmon.py,v 1.19 2007/01/08 21:58:13 faiyaza Exp $"
         slices = {}
 
     # Get special slice IDs