Merge branch 'fix/aligned-buffer' into 'master'

Fix memory issues in per-thread data See merge request multicore/drace!43
siemens · Jul 11, 2019 · 9a386f3 · 9a386f3
2 parents 09e2883 + 80d4a3c
commit 9a386f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/drace-client/include/aligned-buffer.h b/drace-client/include/aligned-buffer.h
@@ -83,9 +83,14 @@ namespace drace {
 				// copy this as value is modified by std::align
 				size_t space_size = _size_in_bytes;
 				_mem = dr_thread_alloc(drcontext, _size_in_bytes);
-				data = (T*)std::align(alignment, capacity, _mem, space_size);
+                // std::align changes pointer to memspace, hence copy
+                void * mem_align = _mem;
+                DR_ASSERT_MSG(
+                    std::align(alignment, capacity, mem_align, space_size) != nullptr,
+                    "could not allocate aligned memory");
+                data = (T*)mem_align;
 				DR_ASSERT(((uint64_t)data % alignment) == 0);
 			}
 		}
 	};
-}
+}
diff --git a/drace-client/src/memory-tracker.cpp b/drace-client/src/memory-tracker.cpp
@@ -273,6 +273,8 @@ namespace drace {
         data->stack.deallocate(drcontext);
         data->mem_buf.deallocate(drcontext);
 
+        hashtable_delete(&(data->mutex_book));
+
         // free statistics
         data->stats->~Statistics();
         dr_thread_free(drcontext, data->stats, sizeof(Statistics));