merge changes from HEAD

diff --git a/bwmon.py b/bwmon.py
index dd92913..de4c8d2 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.19 2007/01/08 21:58:13 faiyaza Exp $
+# $Id: bwmon.py,v 1.20 2007/01/10 16:51:04 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.19 2007/01/08 21:58:13 faiyaza Exp $":
+        if version != "$Id: bwmon.py,v 1.20 2007/01/10 16:51:04 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.19 2007/01/08 21:58:13 faiyaza Exp $"
+        version = "$Id: bwmon.py,v 1.20 2007/01/10 16:51:04 faiyaza Exp $"

         slices = {}
 
     # Get special slice IDs
         slices = {}
 
     # Get special slice IDs

diff --git a/pl_mom.spec b/pl_mom.spec
index 3df4c34..2dc1e5f 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,6 @@
 %define name pl_mom
 %define version 0.8
 %define name pl_mom
 %define version 0.8

-%define release 10%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 11%{?pldistro:.%{pldistro}}%{?date:.%{date}}

  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}