merge changes from HEAD

diff --git a/bwmon.py b/bwmon.py
index 4cac1d7..dd92913 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.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
 #
 
 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):
             # 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.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:
                 self.ExemptByteThresh = int(self.ExemptByteMax * .8)
 
         except Exception, err:


@@ -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.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:
             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
         slices = {}
 
     # Get special slice IDs

diff --git a/pl_mom.spec b/pl_mom.spec
index 394e216..3df4c34 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,5 +1,5 @@
 %define name pl_mom
 %define name pl_mom

-%define version 0.7
+%define version 0.8

 %define release 10%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab node monitoring tools
 %define release 10%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab node monitoring tools