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

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index fd566b1a92..f351b59082 100644
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -16,6 +16,7 @@
 #include "portable.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt/mmalloc.h"
+#include <semaphore.h>
 
 #ifdef HAVE_LIMITS_H
 #  include <limits.h>
@@ -25,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
@@ -78,9 +74,6 @@
 
 #define ADDRESS(B) ((void*) (((ADDR2UINT(B)) - 1) * BLOCKSIZE + (char*) mdp -> heapbase))
 
-/* Thread-safety (if the mutex is already created)*/
-#define LOCK(mdp) if (mdp->mutex) xbt_os_mutex_acquire(mdp->mutex)
-#define UNLOCK(mdp) if (mdp->mutex) xbt_os_mutex_release(mdp->mutex)
 const char *xbt_thread_self_name(void);
 
 /* Data structure giving per-block information.  */
@@ -95,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
@@ -143,7 +138,16 @@ struct mstats {
    if such a file exists. */
 
 struct mdesc {
-  xbt_os_mutex_t mutex;
+
+  /* Semaphore locking the access to the heap */
+  sem_t sem;
+
+  /* Number of processes that attached the heap */
+  unsigned int refcount;
+
+  /* Chained lists of mdescs */
+  struct mdesc *next_mdesc;
+  
   /* The "magic number" for an mmalloc file. */
   char magic[MMALLOC_MAGIC_SIZE];
 
@@ -172,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;
 
@@ -253,19 +231,19 @@ struct mdesc {
 
   int fd;
 
-  /* An array of keys to data within the mapped region, for use by the
-     application.  */
+};
+
+int mmalloc_compare_heap(void *h1, void *h2, void *std_heap_addr);
 
-  void *keys[MMALLOC_KEYS];
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr);
 
-};
+void mmalloc_display_info(void *h);
 
 /* Bits to look at in the malloc descriptor flags word */
 
 #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'. */
 
@@ -301,4 +279,17 @@ extern void *__mmalloc_remap_core(struct mdesc *mdp);
    ? __mmalloc_default_mdp  \
    : (struct mdesc *) (md))
 
+/* Thread-safety (if the sem is already created)*/
+#define LOCK(md)                                        \
+  do {\
+    struct mdesc *lock_local_mdp = MD_TO_MDP(md);       \
+    sem_wait(&lock_local_mdp->sem);     \
+  } while (0)
+
+#define UNLOCK(md)                                        \
+  do {                                                  \
+    struct mdesc *unlock_local_mdp = MD_TO_MDP(md);       \
+    sem_post(&unlock_local_mdp->sem);     \
+  } while (0)
+
 #endif                          /* __MMPRIVATE_H */