diff options
| -rwxr-xr-x | bench.py | 11 | ||||
| -rw-r--r-- | src/benchmark.py | 3 | ||||
| -rw-r--r-- | src/facter.py | 1 |
3 files changed, 14 insertions, 1 deletions
@@ -178,8 +178,17 @@ def main(): os.chdir(cwd) print_error(traceback.format_exc()) - print_error("Skipping", bench.name, "!") + print_error("Skipping", bench, "!") + + # reset LD_PRELOAD + if src.globalvars.facts["LD_PRELOAD"] != os.environ.get("LD_PRELOAD", None): + if src.globalvars.facts["LD_PRELOAD"] is None: + del(os.environ["LD_PRELOAD"]) + else: + os.environ["LD_PRELOAD"] = src.globalvars.facts["LD_PRELOAD"] + continue + if __name__ == "__main__": main() 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] |