From cbc497138d1c4b77860e54304705cc157c2b800a Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Sun, 22 Sep 2019 18:34:56 +0200 Subject: fix tbbmalloc definition --- .../SuperMalloc/remove_faulty_aligned_alloc_test.patch | 13 ------------- .../supermalloc/remove_faulty_aligned_alloc_test.patch | 13 +++++++++++++ src/allocators/tbbmalloc.py | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 src/allocators/SuperMalloc/remove_faulty_aligned_alloc_test.patch create mode 100644 src/allocators/supermalloc/remove_faulty_aligned_alloc_test.patch diff --git a/src/allocators/SuperMalloc/remove_faulty_aligned_alloc_test.patch b/src/allocators/SuperMalloc/remove_faulty_aligned_alloc_test.patch deleted file mode 100644 index dc7f7c4..0000000 --- a/src/allocators/SuperMalloc/remove_faulty_aligned_alloc_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.include b/Makefile.include -index bb3cef3..09ee7eb 100644 ---- a/Makefile.include -+++ b/Makefile.include -@@ -37,7 +37,7 @@ default: tests - #lib: $(LIB)/libsupermalloc.so - #.PHONY: lib - --TESTS = aligned_alloc calloc posix_memalign $(UNITTESTS) test-malloc_test new-malloc-test malloc-test-fixed-work test22 cache-index madvise-small test38 test-no-overlaps #unit-timing -+TESTS = calloc posix_memalign $(UNITTESTS) test-malloc_test new-malloc-test malloc-test-fixed-work test22 cache-index madvise-small test38 test-no-overlaps #unit-timing - TESTS_IN_DIR = $(patsubst %, $(BLD)/%, $(TESTS)) - - LDFLAGS += -ldl diff --git a/src/allocators/supermalloc/remove_faulty_aligned_alloc_test.patch b/src/allocators/supermalloc/remove_faulty_aligned_alloc_test.patch new file mode 100644 index 0000000..dc7f7c4 --- /dev/null +++ b/src/allocators/supermalloc/remove_faulty_aligned_alloc_test.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.include b/Makefile.include +index bb3cef3..09ee7eb 100644 +--- a/Makefile.include ++++ b/Makefile.include +@@ -37,7 +37,7 @@ default: tests + #lib: $(LIB)/libsupermalloc.so + #.PHONY: lib + +-TESTS = aligned_alloc calloc posix_memalign $(UNITTESTS) test-malloc_test new-malloc-test malloc-test-fixed-work test22 cache-index madvise-small test38 test-no-overlaps #unit-timing ++TESTS = calloc posix_memalign $(UNITTESTS) test-malloc_test new-malloc-test malloc-test-fixed-work test22 cache-index madvise-small test38 test-no-overlaps #unit-timing + TESTS_IN_DIR = $(patsubst %, $(BLD)/%, $(TESTS)) + + LDFLAGS += -ldl diff --git a/src/allocators/tbbmalloc.py b/src/allocators/tbbmalloc.py index 3dca919..a7af5a5 100644 --- a/src/allocators/tbbmalloc.py +++ b/src/allocators/tbbmalloc.py @@ -24,7 +24,7 @@ from src.artifact import GitArtifact class TBBMalloc(Allocator): """tbbmalloc allocator""" - source = GitArtifact("tbb", "https://github.com/intel/tbb.git"), + sources = GitArtifact("tbb", "https://github.com/intel/tbb.git") def __init__(self, name, **kwargs): self.LD_PRELOAD = "{dir}/libtbbmalloc.so" -- cgit v1.2.3