From c4f0234eb8faeef084d48c1c4f995a3a62666d40 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Wed, 10 Jan 2007 16:51:04 +0000 Subject: [PATCH] * bwlimit.set() expects bits/s. Was giving it bytes/s. --- bwmon.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bwmon.py b/bwmon.py index bc7c0bb..0af380d 100755 --- a/bwmon.py +++ b/bwmon.py @@ -15,7 +15,7 @@ # Faiyaz Ahmed # 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 @@ -215,7 +215,7 @@ class Slice: 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: @@ -240,7 +240,7 @@ class Slice: 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: @@ -336,11 +336,11 @@ def main(): (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 -- 2.43.0