X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/655040c6a7e0502c81e30219b8619e0c70b575dd..a9a3e089a22c469685cc78cf0c5fec1bfe8c0303:/src/xbt/mmalloc/mmprivate.h?ds=sidebyside

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index fa9b62afec..f351b59082 100644
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -26,14 +26,9 @@
 #  endif
 #endif
 
-#ifndef MIN
-#  define MIN(A, B) ((A) < (B) ? (A) : (B))
-#endif
-
 #define MMALLOC_MAGIC		"mmalloc"       /* Mapped file magic number */
 #define MMALLOC_MAGIC_SIZE	8       /* Size of magic number buf */
 #define MMALLOC_VERSION		1       /* Current mmalloc version */
-#define MMALLOC_KEYS		16      /* Keys for application use */
 
 /* The allocator divides the heap into blocks of fixed size; large
    requests receive one or more whole blocks, and small requests
@@ -93,8 +88,10 @@ typedef union {
         size_t nfree;           /* Free fragments in a fragmented block.  */
         size_t first;           /* First free fragment of the block.  */
       } frag;
-      /* Size (in blocks) of a large cluster.  */
-      size_t size;
+      struct {
+	size_t size; /* Size (in blocks) of a large cluster.  */
+	size_t busy_size; 
+      } block;
     } info;
   } busy;
   /* Heap information for a free block (that may be the first of
@@ -179,32 +176,6 @@ struct mdesc {
      needs to be maintained on a per-process basis. */
   void *(*morecore) (struct mdesc * mdp, int size);
 
-  /* Pointer to the function that causes an abort when the memory checking
-     features are activated.  By default this is set to abort(), but can
-     be set to another function by the application using mmalloc().
-
-     FIXME:  For mapped regions shared by more than one process, this
-     needs to be maintained on a per-process basis. */
-  void (*abortfunc) (void);
-
-  /* Debugging hook for free.
-
-     FIXME:  For mapped regions shared by more than one process, this
-     needs to be maintained on a per-process basis. */
-  void (*mfree_hook) (void *mdp, void *ptr);
-
-  /* Debugging hook for `malloc'.
-
-     FIXME:  For mapped regions shared by more than one process, this
-     needs to be maintained on a per-process basis. */
-  void *(*mmalloc_hook) (void *mdp, size_t size);
-
-  /* Debugging hook for realloc.
-
-     FIXME:  For mapped regions shared by more than one process, this
-     needs to be maintained on a per-process basis. */
-  void *(*mrealloc_hook) (void *mdp, void *ptr, size_t size);
-
   /* Number of info entries.  */
   size_t heapsize;
 
@@ -260,16 +231,11 @@ struct mdesc {
 
   int fd;
 
-  /* An array of keys to data within the mapped region, for use by the
-     application.  */
-
-  void *keys[MMALLOC_KEYS];
-
 };
 
-int mmalloc_compare_heap(void *h1, void *h2);
+int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr);
 
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2);
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr);
 
 void mmalloc_display_info(void *h);
 
@@ -278,7 +244,6 @@ void mmalloc_display_info(void *h);
 #define MMALLOC_DEVZERO		(1 << 0)        /* Have mapped to /dev/zero */
 #define MMALLOC_ANONYMOUS (1 << 1)      /* Use anonymous mapping */
 #define MMALLOC_INITIALIZED	(1 << 2)        /* Initialized mmalloc */
-#define MMALLOC_MMCHECK_USED	(1 << 3)        /* mmcheckf() called already */
 
 /* Internal version of `mfree' used in `morecore'. */