# 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
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 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:
(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