Biggest commit ever (SIMIX2): the user processes can now run in parallel

[simgrid.git] / src / xbt / mmalloc / mmprivate.h

diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index fd566b1..a84d175 100644 (file)
--- 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>
@@ -78,9 +79,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.  */
@@ -143,7 +141,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];
 
@@ -301,4 +308,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 */