[mc] Avoid memsetting twice

[simgrid.git] / include / xbt / mmalloc.h

diff --git a/include/xbt/mmalloc.h b/include/xbt/mmalloc.h
index 4eda7fe..f7c6f4a 100644 (file)
--- a/include/xbt/mmalloc.h
+++ b/include/xbt/mmalloc.h
@@ -1,12 +1,12 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-   This file was then part of the GNU C Library. */
-
 /* Copyright (c) 2010-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+   This file was then part of the GNU C Library. */
+
 #ifndef MMALLOC_H
 #define MMALLOC_H 1
 
@@ -22,7 +22,6 @@
 
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
-#include "mc/datatypes.h"
 
 /* Datatype representing a separate heap. The whole point of the mmalloc module
  * is to allow several such heaps in the process. It thus works by redefining
@@ -49,6 +48,10 @@ XBT_PUBLIC( void ) mfree(xbt_mheap_t md, void *ptr);
 
 XBT_PUBLIC( xbt_mheap_t ) xbt_mheap_new(int fd, void *baseaddr);
 
+#define XBT_MHEAP_OPTION_MEMSET 1
+
+XBT_PUBLIC( xbt_mheap_t ) xbt_mheap_new_options(int fd, void *baseaddr, int options);
+
 XBT_PUBLIC( void ) xbt_mheap_destroy_no_free(xbt_mheap_t md);
 
 XBT_PUBLIC( void ) *xbt_mheap_destroy(xbt_mheap_t md);
@@ -62,6 +65,8 @@ xbt_mheap_t mmalloc_get_current_heap(void);
 
 struct s_mc_snapshot;
 
+typedef struct s_dw_type *dw_type_t;
+
 int mmalloc_compare_heap(struct s_mc_snapshot* snapshot1, struct s_mc_snapshot* snapshot2, xbt_mheap_t heap1, xbt_mheap_t heap2);
 int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2);
 int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t to_ignore1, xbt_dynar_t to_ignore2);