# 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.19 2007/01/08 21:58:13 faiyaza Exp $
#
import syslog
# 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)
except Exception, err:
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.16 2006/12/19 16:52:24 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.16 2006/12/19 16:52:24 faiyaza Exp $"
+ version = "$Id: bwmon.py,v 1.19 2007/01/08 21:58:13 faiyaza Exp $"
slices = {}
# Get special slice IDs