* NM rate values are in bits/s. Fixed Byte limits.

[mom.git] / bwmon.py

diff --git a/bwmon.py b/bwmon.py
index 14c089f..4c4df99 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
 #
-# $Id: bwmon.py,v 1.16 2006/12/19 16:52:24 faiyaza Exp $
+# $Id: bwmon.py,v 1.17 2007/01/03 20:15:06 faiyaza Exp $
 #
 
 import syslog
@@ -160,13 +160,24 @@ 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)
 
+            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
 
@@ -336,11 +347,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.17 2007/01/03 20:15:06 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.17 2007/01/03 20:15:06 faiyaza Exp $"
         slices = {}
 
     # Get special slice IDs