merge

CMakeLists.txt

@@ -4,6 +4,9 @@ cmake_minimum_required (VERSION 2.6)
 
 set(APPLICATION_NAME ${PROJECT_NAME})
 
+set(APPLICATION_VERSION_MAJOR 0)
+set(APPLICATION_VERSION_MINOR 5)
+
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 include(DefineInstallationPaths)
@@ -107,15 +110,15 @@ if(STATS STREQUAL "global")
 endif(STATS STREQUAL "global")
 
 configure_file (
-	"${PROJECT_SOURCE_DIR}/dmm_config.h.in"
-	"${PROJECT_BINARY_DIR}/dmm_config.h"
+	"${PROJECT_SOURCE_DIR}/config.h.cmake"
+	"${PROJECT_BINARY_DIR}/dmmlib/config.h"
 )
 
 install(
   FILES
-    ${PROJECT_BINARY_DIR}/dmm_config.h
+    ${PROJECT_BINARY_DIR}/dmmlib/config.h
   DESTINATION
-    ${INCLUDE_INSTALL_DIR}
+    ${INCLUDE_INSTALL_DIR}/dmmlib
   COMPONENT
     headers
 )
@@ -134,7 +137,7 @@ if(WITH_DOC)
 endif (WITH_DOC)
 
 message(STATUS "********************************************")
-message(STATUS "********** ${PROJECT_NAME} build options : **********")
+message(STATUS "********** ${PROJECT_NAME} v${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR} build options : **********")
 message(STATUS "OS call for memory requests: " ${WITH_SYSTEM_CALLS})
 if(NOT WITH_SYSTEM_CALLS STREQUAL "none")
   message(STATUS "Default allocation size for OS calls: " ${SYS_ALLOC_SIZE} " bytes")

dmm_config.h.in

@@ -1,5 +1,5 @@
 /*
- *   Copyright Institute of Communication and Computer Systems (ICCS) 
+ *   Copyright Institute of Communication and Computer Systems (ICCS)
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -16,19 +16,36 @@
  */
 
 /**
- * @file   dmm_config.h
+ * @file   dmmlib/config.h
  * @author Ioannis Koutras (joko@microlab.ntua.gr)
- * @date   November 2012
+ * @date   December 2012
  * @brief  Macro defines for dmmlib.
  *
- * Warning: This is a file which is generated automatically, you have to
- * configure, compile and install dmmlib again in order to change the following
- * macros.
+ * Warning: This is an automatically-generated file, you have to configure,
+ * compile and install dmmlib again in order to change the following macros.
  */
 
 #ifndef DMM_CONFIG_H
 #define DMM_CONFIG_H
 
+/* Version Numbers */
+
+/**
+ * @brief The main version of dmmlib
+ *
+ * This version is checked at library initialization time. A major version match
+ * is required in order to properly setup the runtime communication, otherwise
+ * the library initilization shall fail.
+ */
+#define DMMLIB_VERSION_MAJOR @APPLICATION_VERSION_MAJOR@
+/**
+ * @brief The revision version of dmmlib
+ *
+ * The minor version is increased at each internal library update which does not
+ * cause any backward incompatibility.
+ */
+#define DMMLIB_VERSION_MINOR @APPLICATION_VERSION_MINOR@
+
 /* General Settings */
 
 /** Support for freelist-organized raw blocks */

examples/test_for_memory_space_aware.c

@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <dmmlib/initialize_allocator.h>
 #include <dmmlib/dmmlib.h>
-#include <dmm_config.h>
+#include <dmmlib/config.h>
 
 #define ALLOCATOR_SIZE 2*MAX_COAL_SIZE*sizeof(char)
 

include/dmmlib/allocator.h

@@ -24,7 +24,7 @@
 
 #ifndef ALLOCATOR_H
 #define ALLOCATOR_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 #include "dmmlib/raw_block.h"
 
 #ifdef HAVE_LOCKS

include/dmmlib/freelist/block_header.h

@@ -29,7 +29,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 #include "dmmlib/lists.h"
 
 /** The header structure of every memory block inside a heap. */

include/dmmlib/freelist/freelist.h

@@ -23,7 +23,7 @@
 
 #ifndef FREELIST_H
 #define FREELIST_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "dmmlib/freelist/freelist_rb.h"
 

include/dmmlib/knobs.h

@@ -25,7 +25,7 @@
 #ifndef KNOBS_H
 #define KNOBS_H
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include <dmmlib/dmmstats.h>
 

include/dmmlib/raw_block.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright Institute of Communication and Computer Systems (ICCS) 
+ *   Copyright Institute of Communication and Computer Systems (ICCS)
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 #ifndef RAW_BLOCK_H
 #define RAW_BLOCK_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include <stddef.h>
 

private-include/bitmap/bitmap.h

@@ -23,7 +23,7 @@
 
 #ifndef BITMAP_H
 #define BITMAP_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "bitmap/bitmap_rb.h"
 

private-include/bitmap/bitmap_other.h

@@ -24,7 +24,7 @@
 
 #ifndef BITMAP_OTHER_H
 #define BITMAP_OTHER_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "bitmap/bitmap_rb.h"
 

private-include/bitmap/bitmap_rb.h

@@ -24,7 +24,7 @@
 
 #ifndef BITMAP_RB_H
 #define BITMAP_RB_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include <inttypes.h>
 #include <limits.h>

private-include/bitmap/debug.h

@@ -24,7 +24,7 @@
 
 #ifndef BITMAP_DEBUG_H
 #define BITMAP_DEBUG_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "bitmap/bitmap_rb.h"
 

private-include/debug.h

@@ -24,7 +24,7 @@
 
 #ifndef DEBUG_H
 #define DEBUG_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "dmmlib/allocator.h"
 #include "dmmlib/raw_block.h"

private-include/default_rb.h

@@ -26,7 +26,7 @@
 #ifndef DEFAULT_RB_H
 #define DEFAULT_RB_H
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #ifdef BITMAP_RB_ONLY
 #include "bitmap/bitmap.h"

private-include/freelist/coalesce.h

@@ -17,7 +17,7 @@
 
 #ifndef COALESCE_H
 #define COALESCE_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "dmmlib/freelist/freelist_rb.h"
 #include "dmmlib/freelist/block_header.h"

private-include/freelist/fitting_policy.h

@@ -26,7 +26,7 @@
 #ifndef FL_FITTING_POLICY_H
 #define FL_FITTING_POLICY_H
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 /**
  * @def SEARCH_LIST

private-include/freelist/freelist_debug.h

@@ -24,7 +24,7 @@
 
 #ifndef FREELIST_DEBUG_H
 #define FREELIST_DEBUG_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "dmmlib/freelist/freelist_rb.h"
 

private-include/freelist/ordering_policy.h

@@ -26,7 +26,7 @@
 #ifndef FL_ORDERING_POLICY_H
 #define FL_ORDERING_POLICY_H
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "dmmlib/lists.h"
 

private-include/freelist/split.h

@@ -17,7 +17,7 @@
 
 #ifndef SPLIT_H
 #define SPLIT_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "dmmlib/freelist/freelist_rb.h"
 #include "dmmlib/freelist/block_header.h"

private-include/locks.h

@@ -22,7 +22,7 @@
  * @brief  Locking functions
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #ifndef LOCKS_H
 #define LOCKS_H

private-include/other.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright Institute of Communication and Computer Systems (ICCS) 
+ *   Copyright Institute of Communication and Computer Systems (ICCS)
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 #ifndef OTHER_H
 #define OTHER_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "dmmlib/raw_block.h"
 

private-include/statistics.h

@@ -24,7 +24,7 @@
 
 #ifndef STATISTICS_H
 #define STATISTICS_H
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include <inttypes.h>
 #include "dmmlib/dmmstats.h"

private-include/sys_alloc.h

@@ -18,7 +18,7 @@
 #ifndef SYS_ALLOC_H
 #define SYS_ALLOC_H
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 #include <dmmlib/pool.h>
 
 void *sys_alloc(pool_t *pool, size_t size);

private-include/trace.h

@@ -24,7 +24,7 @@
 
 #ifndef _DMMLIB_TRACE_H_
 #define _DMMLIB_TRACE_H_
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #ifdef WITH_MEM_TRACE
 #include <stdio.h>

src/freelist/coalesce.c

@@ -15,7 +15,7 @@
  *
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #ifdef WITH_KNOBS
 #include "dmmlib/dmmlib.h"

src/freelist/fitting/best.c

@@ -15,7 +15,7 @@
  *
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "freelist/fitting/best.h"
 #include "freelist/ordering_policy.h"

src/freelist/fitting/first.c

@@ -15,7 +15,7 @@
  *
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "freelist/fitting/first.h"
 #include "freelist/ordering_policy.h"

src/freelist/fitting/good.c

@@ -15,7 +15,7 @@
  *
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #ifdef WITH_KNOBS
 #include "dmmlib/dmmlib.h"

src/freelist/split.c

@@ -17,7 +17,7 @@
 
 #include "freelist/split.h"
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #ifdef WITH_KNOBS
 #include "dmmlib/dmmlib.h"

src/initialize.c

@@ -22,7 +22,7 @@
  * @brief  System allocator's global object initializer.
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 #include "dmmlib/dmmlib.h"
 
 /** Global variable storing allocator's settings */

src/knobs.c

@@ -22,7 +22,7 @@
  * @brief  Knobs initialization and configuration routines.
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 #include "dmmlib/dmmlib.h"
 
 #include "locks.h"

src/memalign.c

@@ -30,7 +30,7 @@
 #include <sys/mman.h>
 #include <assert.h>
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 #include "dmmlib/dmmlib.h"
 #include "memcpy.h"
 #include "locks.h"

src/parse_env.c

@@ -22,7 +22,7 @@
  * @brief  Parse the DMMLIB_OPTS enviroment variable.
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include <stdlib.h>
 #include <string.h>

src/print_stats.c

@@ -16,7 +16,7 @@
  */
 
 #include <dmmlib/print_stats.h>
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include <stdio.h>
 

src/request_memory_mmap_linux.c

@@ -22,7 +22,7 @@
  * \brief  Request additional memory space via mmap() in Linux.
  */
 
-#include "dmm_config.h"
+#include <dmmlib/config.h>
 
 #include "request_memory.h"
 #include <sys/stat.h> /* for open() */