aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fl.fischer@fau.de>2019-03-22 19:20:23 +0100
committerFlorian Fischer <florian.fl.fischer@fau.de>2019-03-22 19:20:23 +0100
commit415390baaf9cf3f1d56d614d664ec72968e7937b (patch)
treea85eb3cfb490813126dd162e665718f6e2dd7c65 /src
parent179583714f9b8806390245f17d8a969aefeb1952 (diff)
downloadallocbench-415390baaf9cf3f1d56d614d664ec72968e7937b.tar.gz
allocbench-415390baaf9cf3f1d56d614d664ec72968e7937b.zip
alwys reset LD_PRELOAD even when a exception occurs
Diffstat (limited to 'src')
-rw-r--r--src/benchmark.py3
-rw-r--r--src/facter.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/benchmark.py b/src/benchmark.py
index 38cb5a4..3159fdd 100644
--- a/src/benchmark.py
+++ b/src/benchmark.py
@@ -48,6 +48,9 @@ class Benchmark (object):
return nthreads
+ def __str__(self):
+ return self.name
+
def __init__(self):
# Set default values
for k in Benchmark.defaults:
diff --git a/src/facter.py b/src/facter.py
index e5fa799..8786aa3 100644
--- a/src/facter.py
+++ b/src/facter.py
@@ -14,6 +14,7 @@ def collect_facts():
gv.facts["kernel"] = _uname.release
gv.facts["arch"] = _uname.machine
gv.facts["cpus"] = multiprocessing.cpu_count()
+ gv.facts["LD_PRELOAD"] = os.environ.get("LD_PRELOAD", None)
with open(os.path.join(gv.builddir, "ccinfo"), "r") as ccinfo:
gv.facts["cc"] = ccinfo.readlines()[-1][:-1]