aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fl.fischer@fau.de>2018-07-25 10:23:21 +0200
committerFlorian Fischer <florian.fl.fischer@fau.de>2018-07-25 10:23:21 +0200
commit7a074e374245224e9d4fa9c7ec03beb453b71e92 (patch)
tree6ef7f19f85c4a1a5c276929c5dfe27d157bbb1d3
parent05ae8dc69c97ff8d8d8372fe56bc563399f9da7a (diff)
downloadallocbench-7a074e374245224e9d4fa9c7ec03beb453b71e92.tar.gz
allocbench-7a074e374245224e9d4fa9c7ec03beb453b71e92.zip
fix memusage results
-rw-r--r--mysql.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/mysql.py b/mysql.py
index 5ca6b9a..7eed9be 100644
--- a/mysql.py
+++ b/mysql.py
@@ -3,6 +3,7 @@ import matplotlib.pyplot as plt
import numpy as np
import os
import pickle
+import psutil
import re
import shutil
import subprocess
@@ -27,8 +28,8 @@ class Benchmark_MYSQL( Benchmark ):
def __init__(self):
self.name = "mysql"
self.descrition = """See sysbench documentation."""
+ self.targets = copy.copy(common_targets)
if "klmalloc" in self.targets:
- self.targets = copy.copy(common_targets)
del(self.targets["klmalloc"])
self.nthreads = range(1, psutil.cpu_count() * 2 + 1)
@@ -120,9 +121,10 @@ class Benchmark_MYSQL( Benchmark ):
return False
# Get initial memory footprint
+ heap_size = {}
for m in p.memory_maps():
if "[heap]" in m:
- self.results["memusage"][tname].append({"heap_start" : m.size)
+ p_size["heap_start"] = m.size
for i, thread in enumerate(self.nthreads):
print(tname + ":", i + 1, "of", n, "\r", end='')
@@ -159,7 +161,9 @@ class Benchmark_MYSQL( Benchmark ):
# Get final memory footprint
for m in p.memory_maps():
if "[heap]" in m:
- self.results["memusage"][tname].append({"heap_end" : m.size)
+ heap_size["heap_end"] = m.size
+
+ self.results["memusage"][tname].append(heap_size)
self.server.kill()
self.server.wait()