SoftageRnD
diff --git a/‎memory-usage.py
Lines changed: 47 additions & 10 deletions b/‎memory-usage.py
Lines changed: 47 additions & 10 deletions
@@ -24,14 +24,26 @@ def create_site(rank, percent_self, percent_accum, live_bytes, live_objs, alloca
     return site
 
 
-def runTest(class_name):
+def create_test_sum(allocated_bytes_sum, allocated_objs_sum, class_name, live_bytes_sum, live_objs_sum, test_time):
+    test_sum = memory_usage_doc.createElement("test_sum")
+    test_sum.setAttribute("allocated_bytes", str(allocated_bytes_sum))
+    test_sum.setAttribute("allocated_objs", str(allocated_objs_sum))
+    test_sum.setAttribute("live_bytes", str(live_bytes_sum))
+    test_sum.setAttribute("live_objs", str(live_objs_sum))
+    test_sum.setAttribute("time", test_time)
+    test_sum.setAttribute("class_name", class_name)
+    return test_sum
+
+
+def run_test(class_name):
     print str.format("test \"{}\" is starting", class_name)
 
-    memory_usage = memory_usage_doc.documentElement
+    test_time = datetime.now().isoformat()
+
     test = memory_usage_doc.createElement("test")
     test.setAttribute("class_name", class_name)
-    test.setAttribute("time", datetime.now().isoformat())
-    memory_usage.appendChild(test)
+    test.setAttribute("time", test_time)
+    tests.appendChild(test)
 
     os.system("java -agentlib:hprof=heap=sites -cp " +
               "memory-usage-benchmarks/target/memory-usage-benchmarks-1.0-SNAPSHOT-jar-with-dependencies.jar " +
@@ -45,10 +57,28 @@ def runTest(class_name):
                   re.DOTALL)
     table = m.group(1)
 
+    allocated_bytes_sum = 0
+    allocated_objs_sum = 0
+    live_bytes_sum = 0
+    live_objs_sum = 0
+
     for m in re.finditer(r'\b\s*(\d+)\s*(\d+,\d+%)\s*(\d+,\d+%)\s*(\d+)\s*(\d+)\s*(\d+)\s*(\d+)\s*(\d+)\s*(.+)\s*\b',
                          table):
-        sites.appendChild(create_site(m.group(1), m.group(2), m.group(3), m.group(4), m.group(5), m.group(6),
-                                      m.group(7), m.group(8), m.group(9)))
+        live_bytes = m.group(4)
+        live_objs = m.group(5)
+        allocated_bytes = m.group(6)
+        allocated_objs = m.group(7)
+        sites.appendChild(create_site(m.group(1), m.group(2), m.group(3), live_bytes, live_objs, allocated_bytes,
+                                      allocated_objs, m.group(8), m.group(9)))
+        allocated_bytes_sum += int(allocated_bytes)
+        allocated_objs_sum += int(allocated_objs)
+        live_bytes_sum += int(live_bytes)
+        live_objs_sum += int(live_objs)
+
+    tests_sum.appendChild(
+        create_test_sum(allocated_bytes_sum, allocated_objs_sum, class_name, live_bytes_sum, live_objs_sum, test_time))
+
+    return test
 
 
 os.system("ant")
@@ -59,11 +89,18 @@ def runTest(class_name):
 os.chdir("..")
 
 memory_usage_doc = getDOMImplementation().createDocument(None, "memory-usage", None)
+memory_usage = memory_usage_doc.documentElement
+
+tests_sum = memory_usage_doc.createElement("tests-sum")
+memory_usage.appendChild(tests_sum)
+
+tests = memory_usage_doc.createElement("tests")
+memory_usage.appendChild(tests)
 
-runTest("ManyOldMutableSets")
-runTest("ManyNewMutableSets")
-runTest("BigOldMutableSet")
-runTest("BigNewMutableSet")
+run_test("ManyOldMutableSets")
+run_test("ManyNewMutableSets")
+run_test("BigOldMutableSet")
+run_test("BigNewMutableSet")
 
 os.remove(JAVA_HPROF_FILE_NAME)