Merge branch 'master' of https://github.com/plasma-umass/scalene

rafaelnogalha · Feb 20, 2023 · a2c43c9 · a2c43c9
2 parents 23079a6 + 5290b62
commit a2c43c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scalene/scalene_profiler.py b/scalene/scalene_profiler.py
@@ -775,7 +775,7 @@ def __init__(
             cmdline += f" --pid={os.getpid()} ---"
             payload = """#!/bin/bash
     echo $$
-    %s %s -m scalene %s $@
+    %s %s -m scalene %s "$@"
     """ % (
                 preface,
                 sys.executable,

diff --git a/src/include/samplefile.hpp b/src/include/samplefile.hpp
@@ -117,8 +117,13 @@ class SampleFile {
     close(init_fd);
   }
   ~SampleFile() {
-    munmap(_mmap, MAX_FILE_SIZE);
-    munmap(_lastpos, LOCK_FD_SIZE);
+    // NOTE: These unmaps were causing issues
+    // sometimes leading to a SIGSEGV when BLAS
+    // threads were tearing down.
+    // Removing these unmaps resolved the issue
+    //
+    // munmap(_mmap, MAX_FILE_SIZE);
+    // munmap(_lastpos, LOCK_FD_SIZE);
     unlink(_signalfile);
     unlink(_lockfile);
     unlink(_init_filename);