Disabled temporarily knobs and dmm_adaptor.

DefineOptions.cmake

@@ -52,14 +52,12 @@ if(WITH_COALESCING STREQUAL "fixed")
   set(COALESCING_FIXED ON)
 elseif(WITH_COALESCING STREQUAL "variable")
   set(WITH_OWNERSHIP ON)
-  set(WITH_KNOBS ON)
   set(COALESCING_VARIABLE ON)
 endif(WITH_COALESCING STREQUAL "fixed")
 
 if(WITH_SPLITTING STREQUAL "fixed")
-	set(SPLITTING_FIXED ON)
+  set(SPLITTING_FIXED ON)
 elseif(WITH_SPLITTING STREQUAL "variable")
-  set(WITH_KNOBS ON)
   set(SPLITTING_VARIABLE ON)
 endif(WITH_SPLITTING STREQUAL "fixed")
 

src/CMakeLists.txt

@@ -37,7 +37,7 @@ set(dmmlib_SRCS
   other.c
   initialize_allocator.c
   sys_alloc.c
-  dmm_adaptor.c
+  #  dmm_adaptor.c
   print_stats.c
 )
 

src/custom_free.c

@@ -24,7 +24,9 @@
 #if defined (COALESCING_FIXED) || defined (COALESCING_VARIABLE)
 #include "coalesce.h"
 #endif /* COALESCING_FIXED || COALESCING_VARIABLE */
+#ifdef WITH_KNOBS
 #include "dmm_adaptor.h"
+#endif /* WITH_KNOBS */
 #include "block_header.h"
 
 void custom_ahfree(allocator_t *allocator, heap_t* heap, void *ptr) {

src/custom_malloc.c

@@ -29,7 +29,9 @@
 #include "linked_lists/search_algorithms.h"
 #include "sys_alloc.h"
 #include "block_header.h"
+#ifdef WITH_KNOBS
 #include "dmm_adaptor.h"
+#endif /* WITH_KNOBS */
 
 void * custom_ahmalloc(allocator_t* allocator, heap_t* heap, size_t size) {
     void *ptr;