diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2020-02-09 13:05:46 +0100 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2020-02-09 13:09:02 +0100 |
| commit | 241cec136189fbb22cdfa79e99e0001120a699c4 (patch) | |
| tree | 64eca343684a08bfbbf92a2b03d0d2230a9815a6 | |
| parent | 36425acd25b67a537d2e17b3093b7536281cf14b (diff) | |
| download | allocbench-241cec136189fbb22cdfa79e99e0001120a699c4.tar.gz allocbench-241cec136189fbb22cdfa79e99e0001120a699c4.zip | |
fix order of LD_PRELOAD
We prepend the currently set LD_PRELOAD.
LD_PRELOAD=print_status_on_exit sig_handlers allocater.so LD_PRELOAD
| -rw-r--r-- | src/benchmark.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/benchmark.py b/src/benchmark.py index 0ec388f..68e83ea 100644 --- a/src/benchmark.py +++ b/src/benchmark.py @@ -372,14 +372,15 @@ class Benchmark: skip = False env = dict(os.environ) - env["LD_PRELOAD"] = env.get("LD_PRELOAD", "") - env["LD_PRELOAD"] += " " + f"{src.globalvars.builddir}/print_status_on_exit.so" - env["LD_PRELOAD"] += " " + f"{src.globalvars.builddir}/sig_handlers.so" - env["LD_PRELOAD"] += " " + alloc["LD_PRELOAD"] + old_ld_preload = env.get('LD_PRELOAD', '') + env["LD_PRELOAD"] = f"{src.globalvars.builddir}/print_status_on_exit.so" + env["LD_PRELOAD"] += f" {src.globalvars.builddir}/sig_handlers.so" + env["LD_PRELOAD"] += f" {alloc['LD_PRELOAD']}" + env["LD_PRELOAD"] += f" {old_ld_preload}" if "LD_LIBRARY_PATH" in alloc: env["LD_LIBRARY_PATH"] = env.get("LD_LIBRARY_PATH", "") - env["LD_LIBRARY_PATH"] += ":" + alloc["LD_LIBRARY_PATH"] + env["LD_LIBRARY_PATH"] += f'{os.pathsep}{alloc["LD_LIBRARY_PATH"]}' try: self.start_servers(alloc_name=alloc_name, alloc=alloc, env=env) |
