Cleaned up the CMake status messages

CMakeLists.txt

@@ -34,64 +34,68 @@ endif (WITH_DOC)
 
 message(STATUS "********************************************")
 message(STATUS "********** ${PROJECT_NAME} build options : **********")
-message(STATUS "Support for just one allocator: " ${WITH_SINGLE_ALLOCATOR})
 message(STATUS "OS call for memory requests: " ${WITH_SYSTEM_CALLS})
 if(NOT WITH_SYSTEM_CALLS STREQUAL "none")
   message(STATUS "Requesting blocks multiple of: " ${SYS_ALLOC_SIZE} " bytes")
 endif(NOT WITH_SYSTEM_CALLS STREQUAL "none")
 message(STATUS "POSIX locking mechanisms: " ${HAVE_LOCKS})
-message(STATUS "Number of heaps per allocator: " ${NUM_HEAPS})
-if(BLOCKS_ORGANIZATION STREQUAL "dll")
-  message(STATUS "Block organization: Doubly-Linked Lists")
-else(BLOCKS_ORGANIZATION STREQUAL "dll")
-  message(STATUS "Block organization: Singly-Linked Lists")
-endif(BLOCKS_ORGANIZATION STREQUAL "dll")
-if(SORT_POLICY STREQUAL "lifo")
-	message(STATUS "Block sorting policy: LIFO-ordered")
-elseif(SORT_POLICY STREQUAL "fifo")
-	message(STATUS "Block sorting policy: FIFO-ordered")
-elseif(SORT_POLICY STREQUAL "size")
-  message(STATUS "Block sorting policy: Size-ordered")
-elseif(SORT_POLICY STREQUAL "address")
-  message(STATUS "Block sorting policy: Address-ordered")
-endif(SORT_POLICY STREQUAL "lifo")
-message(STATUS "Predefined lists of fixed-sized blocks: " ${WITH_FIXED_LISTS})
-message(STATUS "Requested Size per Block: " ${REQUEST_SIZE_INFO})
-message(STATUS "Heap Ownership per Block: " ${WITH_OWNERSHIP})
+
+message(STATUS "Raw blocks type: " ${RAW_BLOCKS_TYPE})
+
+if(RAW_BLOCKS_TYPE STREQUAL "freelist")
+
+  if(BLOCKS_ORGANIZATION STREQUAL "dll")
+    message(STATUS "Block organization: Doubly-Linked Lists")
+  else(BLOCKS_ORGANIZATION STREQUAL "dll")
+    message(STATUS "Block organization: Singly-Linked Lists")
+  endif(BLOCKS_ORGANIZATION STREQUAL "dll")
+
+  if(SORT_POLICY STREQUAL "lifo")
+    message(STATUS "Block sorting policy: LIFO-ordered")
+  elseif(SORT_POLICY STREQUAL "fifo")
+    message(STATUS "Block sorting policy: FIFO-ordered")
+  elseif(SORT_POLICY STREQUAL "size")
+    message(STATUS "Block sorting policy: Size-ordered")
+  elseif(SORT_POLICY STREQUAL "address")
+    message(STATUS "Block sorting policy: Address-ordered")
+  endif(SORT_POLICY STREQUAL "lifo")
+
+  message(STATUS "Search policy: " ${SEARCH_POLICY})
+  if(ALLOC_VAR_FIT OR HEAP_VAR_FIT)
+    message(STATUS "Initial search policy: " ${INITIAL_SEARCH_POLICY})
+  endif(ALLOC_VAR_FIT OR HEAP_VAR_FIT)
+
+  if(GOOD_FIT)
+    message(STATUS "Acceptable fit percentage: " ${FIT_PERCENTAGE})
+  endif(GOOD_FIT)
+
+  message(STATUS "Coalescing: " ${WITH_COALESCING})
+  if(MAX_COALESCE_SIZE)
+    if(WITH_COALESCING STREQUAL "fixed")
+      message(STATUS "  with max. coalescing size: " ${MAX_COALESCE_SIZE} " bytes")
+    elseif(WITH_COALESCING STREQUAL "variable")
+      message(STATUS "  with initial max. coalescing size: " ${MAX_COALESCE_SIZE}
+        " bytes")
+    endif(WITH_COALESCING STREQUAL "fixed")
+  endif(MAX_COALESCE_SIZE)
+
+  message(STATUS "Splitting: " ${WITH_SPLITTING})
+  if(MIN_SPLITTING_SIZE)
+    if(WITH_SPLITTING STREQUAL "fixed")
+      message(STATUS "  with min. spliting size: " ${MIN_SPLITTING_SIZE} " bytes")
+    elseif(WITH_SPLITTING STREQUAL "variable")
+      message(STATUS "  with initial min. spliting size: "
+        ${MIN_SPLITTING_SIZE} " bytes")
+    endif(WITH_SPLITTING STREQUAL "fixed")
+    if(COALESCE_AFTER_SPLIT)
+      message(STATUS "Coalesce after split: " ${COALESCE_AFTER_SPLIT})
+    endif(COALESCE_AFTER_SPLIT)
+  endif(MIN_SPLITTING_SIZE)
+
+endif(RAW_BLOCKS_TYPE STREQUAL "freelist")
+
 message(STATUS "Have statistics: " ${WITH_STATS})
-if (WITH_STATS)
-  message(STATUS "Count memory accesses: " ${COUNT_ACCESSES})
-  message(STATUS "Count hops per request: " ${COUNT_HOPS})
-endif (WITH_STATS)
-message(STATUS "Have knobs: " ${WITH_KNOBS})
-message(STATUS "Search policy: " ${SEARCH_POLICY})
-if(ALLOC_VAR_FIT OR HEAP_VAR_FIT)
-  message(STATUS "Initial search policy: " ${INITIAL_SEARCH_POLICY})
-endif(ALLOC_VAR_FIT OR HEAP_VAR_FIT)
-if(GOOD_FIT)
-  message(STATUS "Acceptable fit percentage: " ${FIT_PERCENTAGE})
-endif(GOOD_FIT)
-message(STATUS "Coalescing: " ${WITH_COALESCING})
-if(MAX_COALESCE_SIZE)
-  if(WITH_COALESCING STREQUAL "fixed")
-    message(STATUS "  with max. coalescing size: " ${MAX_COALESCE_SIZE} " bytes")
-  elseif(WITH_COALESCING STREQUAL "variable")
-    message(STATUS "  with initial max. coalescing size: " ${MAX_COALESCE_SIZE}
-      " bytes")
-  endif(WITH_COALESCING STREQUAL "fixed")
-endif(MAX_COALESCE_SIZE)
-message(STATUS "Splitting: " ${WITH_SPLITTING})
-if(MIN_SPLITTING_SIZE)
-  if(WITH_SPLITTING STREQUAL "fixed")
-    message(STATUS "  with min. spliting size: " ${MIN_SPLITTING_SIZE} " bytes")
-  elseif(WITH_SPLITTING STREQUAL "variable")
-    message(STATUS "  with initial min. spliting size: "
-      ${MIN_SPLITTING_SIZE} " bytes")
-  endif(WITH_SPLITTING STREQUAL "fixed")
-  if(COALESCE_AFTER_SPLIT)
-    message(STATUS "Coalesce after split: " ${COALESCE_AFTER_SPLIT})
-  endif(COALESCE_AFTER_SPLIT)
-endif(MIN_SPLITTING_SIZE)
+message(STATUS "Requested Size per Block: " ${REQUEST_SIZE_INFO})
 message(STATUS "Adaptivity: " ${WITH_ADAPTIVITY})
 message(STATUS "Support for realloc(): " ${WITH_REALLOC})
 message(STATUS "********************************************")

private-include/freelist/freelist_malloc.h

@@ -18,14 +18,13 @@
 /**
  * \file    freelist_malloc.h
  * \author  Ioannis Koutras (joko@microlab.ntua.gr)
- *  
  * \brief   Memory allocation for free-list based raw blocks
  */
 
 #ifndef FREELIST_MALLOC_H
 #define FREELIST_MALLOC_H
 
-#include <dmmlib/raw_block.h>
+#include "dmmlib/raw_block.h"
 
 #ifdef FL_RB_ONLY
 #define dmmlib_malloc(raw_block, size) freelist_malloc(raw_block, size)