public_git
/
speedtest-cli
mirror of https://github.com/sivel/speedtest-cli.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Attempt to reduce memory footprint more

This commit is contained in:
Matt Martz 2013-02-18 12:02:18 -06:00
parent 0deff10e66
commit 11fb59d6ae
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
speedtest-cli
View File

@ -69,13 +69,18 @@ class FileGetter(threading.Thread):
try: try:
if (time.time() - self.starttime) <= 10: if (time.time() - self.starttime) <= 10:
f = urllib2.urlopen(self.url) f = urllib2.urlopen(self.url)
contents = f.read() self.result = 0
while 1:
contents = f.read(1024)
if contents:
self.result += len(contents)
else:
break
f.close() f.close()
self.result = contents
else: else:
self.result = '' self.result = 0
except IOError: except IOError:
self.result = '' self.result = 0
def downloadSpeed(files, quiet=False): def downloadSpeed(files, quiet=False):
@ -96,8 +101,8 @@ def downloadSpeed(files, quiet=False):
while len(finished) < total_files: while len(finished) < total_files:
thread = q.get(True) thread = q.get(True)
thread.join() thread.join()
finished.append(len(thread.result)) finished.append(thread.result)
thread.result = '' thread.result = 0
q = Queue(6) q = Queue(6)
start = time.time() start = time.time()
@ -129,11 +134,11 @@ class FilePutter(threading.Thread):
f = urllib2.urlopen(self.url, self.data) f = urllib2.urlopen(self.url, self.data)
contents = f.read() contents = f.read()
f.close() f.close()
self.result = self.data self.result = len(self.data)
else: else:
self.result = '' self.result = 0
except IOError: except IOError:
self.result = '' self.result = 0
def uploadSpeed(url, sizes, quiet=False): def uploadSpeed(url, sizes, quiet=False):
@ -154,8 +159,8 @@ def uploadSpeed(url, sizes, quiet=False):
while len(finished) < total_sizes: while len(finished) < total_sizes:
thread = q.get(True) thread = q.get(True)
thread.join() thread.join()
finished.append(len(thread.result)) finished.append(thread.result)
thread.result = '' thread.result = 0
q = Queue(6) q = Queue(6)
start = time.time() start = time.time()

29
speedtest-cli-3
View File

@ -62,13 +62,18 @@ class FileGetter(threading.Thread):
try: try:
if (time.time() - self.starttime) <= 10: if (time.time() - self.starttime) <= 10:
f = urllib.request.urlopen(self.url) f = urllib.request.urlopen(self.url)
contents = f.read() self.result = 0
while 1:
contents = f.read(1024)
if contents:
self.result += len(contents)
else:
break
f.close() f.close()
self.result = contents
else: else:
self.result = '' self.result = 0
except IOError: except IOError:
self.result = '' self.result = 0
def downloadSpeed(files, quiet=False): def downloadSpeed(files, quiet=False):
@ -89,8 +94,8 @@ def downloadSpeed(files, quiet=False):
while len(finished) < total_files: while len(finished) < total_files:
thread = q.get(True) thread = q.get(True)
thread.join() thread.join()
finished.append(len(thread.result)) finished.append(thread.result)
thread.result = '' thread.result = 0
q = Queue(6) q = Queue(6)
start = time.time() start = time.time()
@ -122,11 +127,11 @@ class FilePutter(threading.Thread):
f = urllib.request.urlopen(self.url, self.data.encode()) f = urllib.request.urlopen(self.url, self.data.encode())
contents = f.read() contents = f.read()
f.close() f.close()
self.result = self.data self.result = len(self.data)
else: else:
self.result = '' self.result = 0
except IOError: except IOError:
self.result = '' self.result = 0
def uploadSpeed(url, sizes, quiet=False): def uploadSpeed(url, sizes, quiet=False):
@ -147,8 +152,8 @@ def uploadSpeed(url, sizes, quiet=False):
while len(finished) < total_sizes: while len(finished) < total_sizes:
thread = q.get(True) thread = q.get(True)
thread.join() thread.join()
finished.append(len(thread.result)) finished.append(thread.result)
thread.result = '' thread.result = 0
q = Queue(6) q = Queue(6)
start = time.time() start = time.time()
@ -383,4 +388,4 @@ if __name__ == '__main__':
except KeyboardInterrupt: except KeyboardInterrupt:
print('\nCancelling...') print('\nCancelling...')
# vim:ts=2:sw=2:expandtab # vim:ts=4:sw=4:expandtab