From 0deff10e66e50033cc5df289e3bdfda44a953872 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Mon, 18 Feb 2013 11:47:43 -0600
Subject: [PATCH] Reduce memory footprint

---
 speedtest-cli   | 14 ++++++++------
 speedtest-cli-3 | 16 ++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/speedtest-cli b/speedtest-cli
index 4caa118..0b6e873 100755
--- a/speedtest-cli
+++ b/speedtest-cli
@@ -96,9 +96,10 @@ def downloadSpeed(files, quiet=False):
         while len(finished) < total_files:
             thread = q.get(True)
             thread.join()
-            finished.append(thread.get_result())
+            finished.append(len(thread.result))
+            thread.result = ''
 
-    q = Queue(3)
+    q = Queue(6)
     start = time.time()
     prod_thread = threading.Thread(target=producer, args=(q, files))
     cons_thread = threading.Thread(target=consumer, args=(q, len(files)))
@@ -106,7 +107,7 @@ def downloadSpeed(files, quiet=False):
     cons_thread.start()
     prod_thread.join()
     cons_thread.join()
-    return (len(''.join(finished))/(time.time()-start))
+    return (sum(finished)/(time.time()-start))
 
 
 class FilePutter(threading.Thread):
@@ -153,9 +154,10 @@ def uploadSpeed(url, sizes, quiet=False):
         while len(finished) < total_sizes:
             thread = q.get(True)
             thread.join()
-            finished.append(thread.get_result())
+            finished.append(len(thread.result))
+            thread.result = ''
 
-    q = Queue(9)
+    q = Queue(6)
     start = time.time()
     prod_thread = threading.Thread(target=producer, args=(q, sizes))
     cons_thread = threading.Thread(target=consumer, args=(q, len(sizes)))
@@ -163,7 +165,7 @@ def uploadSpeed(url, sizes, quiet=False):
     cons_thread.start()
     prod_thread.join()
     cons_thread.join()
-    return (len(''.join(finished))/(time.time()-start))
+    return (sum(finished)/(time.time()-start))
 
 
 def getAttributesByTagName(dom, tagName):
diff --git a/speedtest-cli-3 b/speedtest-cli-3
index 1daf3fc..3326ea3 100755
--- a/speedtest-cli-3
+++ b/speedtest-cli-3
@@ -89,9 +89,10 @@ def downloadSpeed(files, quiet=False):
         while len(finished) < total_files:
             thread = q.get(True)
             thread.join()
-            finished.append(thread.get_result())
+            finished.append(len(thread.result))
+            thread.result = ''
 
-    q = Queue(3)
+    q = Queue(6)
     start = time.time()
     prod_thread = threading.Thread(target=producer, args=(q, files))
     cons_thread = threading.Thread(target=consumer, args=(q, len(files)))
@@ -99,8 +100,7 @@ def downloadSpeed(files, quiet=False):
     cons_thread.start()
     prod_thread.join()
     cons_thread.join()
-    return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode()
-            for chunk in finished]))/(time.time()-start))
+    return (sum(finished)/(time.time()-start))
 
 
 class FilePutter(threading.Thread):
@@ -147,9 +147,10 @@ def uploadSpeed(url, sizes, quiet=False):
         while len(finished) < total_sizes:
             thread = q.get(True)
             thread.join()
-            finished.append(thread.get_result())
+            finished.append(len(thread.result))
+            thread.result = ''
 
-    q = Queue(9)
+    q = Queue(6)
     start = time.time()
     prod_thread = threading.Thread(target=producer, args=(q, sizes))
     cons_thread = threading.Thread(target=consumer, args=(q, len(sizes)))
@@ -157,8 +158,7 @@ def uploadSpeed(url, sizes, quiet=False):
     cons_thread.start()
     prod_thread.join()
     cons_thread.join()
-    return (len(b''.join([chunk if isinstance(chunk, bytes) else chunk.encode()
-            for chunk in finished]))/(time.time()-start))
+    return (sum(finished)/(time.time()-start))
 
 
 def getConfig():