X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f694bd4f38492add20baa019eb60ed4079d684e..c9bee92e0541ed3ccbd101e900b912720b9996b0:/src/xbt/mmalloc/mmprivate.h

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 62024e909b..c122547ce6 100644
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -26,10 +26,6 @@
 #  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 */
@@ -92,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
@@ -163,47 +161,6 @@ struct mdesc {
   /* Some flag bits to keep track of various internal things. */
   unsigned int flags;
 
-  /* If a system call made by the mmalloc package fails, the errno is
-     preserved for future examination. */
-  int saved_errno;
-
-  /* Pointer to the function that is used to get more core, or return core
-     to the system, for requests using this malloc descriptor.  For memory
-     mapped regions, this is the mmap() based routine.  There may also be
-     a single malloc descriptor that points to an sbrk() based routine
-     for systems without mmap() or for applications that call the mmalloc()
-     package with a NULL malloc descriptor.
-
-     FIXME:  For mapped regions shared by more than one process, this
-     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;
 
@@ -272,7 +229,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'. */
 
@@ -297,6 +253,11 @@ extern void *__mmalloc_mmap_morecore(struct mdesc *mdp, int size);
 
 extern void *__mmalloc_remap_core(struct mdesc *mdp);
 
+/*  Get core for the memory region specified by MDP, using SIZE as the
+    amount to either add to or subtract from the existing region.  Works
+    like sbrk(), but using mmap(). */
+extern void *mmorecore(struct mdesc *mdp, int size);
+
 /* Macro to convert from a user supplied malloc descriptor to pointer to the
    internal malloc descriptor.  If the user supplied descriptor is NULL, then
    use the default internal version, initializing it if necessary.  Otherwise