X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f9e1424e8bfd8214561ba0675276f91ebc308c2..4e7eb5ee8613f100bfefeb6475d93ce9c58c75ea:/src/msg/private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 45352e09a5..ea7e5190d2 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -8,6 +8,7 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
+#include <stdio.h>
 #include "msg/msg.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
@@ -16,6 +17,7 @@
 #include "xbt/dict.h"
 #include "xbt/context.h"
 #include "xbt/config.h"
+#include "xbt/mallocator.h"
 
 /**************** datatypes **********************************/
 
@@ -87,6 +89,8 @@ typedef struct MSG_Global {
   int paje_maxPID;
   int PID;
   int session;
+  xbt_mallocator_t task_mallocator;
+  xbt_mallocator_t task_simdata_mallocator;
 } s_MSG_Global_t, *MSG_Global_t;
 
 extern MSG_Global_t msg_global;
@@ -117,57 +121,17 @@ void __MSG_task_execute(m_process_t process, m_task_t task);
 MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task);
 MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task);
 
-int __MSG_process_block(double max_duration);
+int __MSG_process_block(double max_duration, const char *info);
 MSG_error_t __MSG_process_unblock(m_process_t process);
 int __MSG_process_isBlocked(m_process_t process);
 
 void __MSG_display_process_status(void);
 
-#ifdef ALVIN_SPECIAL_LOGING
-#define PAJE_PROCESS_STATE(process,state)\
-  if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,"10 %f S_t P%d %s\n",\
-            surf_get_clock(), (process)->simdata->PID,(state))
-#define PAJE_PROCESS_PUSH_STATE(process,state)\
-  if(msg_global->paje_output) { \
-    fprintf(msg_global->paje_output,"11 %f S_t P%d %s\n",\
-            surf_get_clock(), (process)->simdata->PID,(state));\
-    (process)->simdata->paje_state++; \
-  }
-#define PAJE_PROCESS_POP_STATE(process)\
-  if(msg_global->paje_output) { \
-    fprintf(msg_global->paje_output,"12 %f S_t P%d\n",\
-            surf_get_clock(), (process)->simdata->PID); \
-    (process)->simdata->paje_state--; \
-  }
-#define PAJE_PROCESS_FREE(process)
-#define PAJE_PROCESS_NEW(process)\
-  if((msg_global->paje_output)) {\
-    if((msg_global->session==0) || ((msg_global->session>0) && ((process)->simdata->PID > msg_global->paje_maxPID))) \
-    fprintf(msg_global->paje_output,"7 %f P%d P_t %p \"%s %d (%d)\"\n", \
-            surf_get_clock(), (process)->simdata->PID, (process)->simdata->host, \
-            (process)->name, (process)->simdata->PID, msg_global->session);\
-    if(msg_global->paje_maxPID<(process)->simdata->PID) msg_global->paje_maxPID=(process)->simdata->PID;\
-    }
-#define PAJE_COMM_START(process,task,channel)\
-  if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,\
-	    "16	%f	Comm	CUR	COMM_%d	P%d	%p\n", \
-            surf_get_clock(), channel, (process)->simdata->PID, task)
-#define PAJE_COMM_STOP(process,task,channel)\
-  if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,\
-	    "17	%f	Comm	CUR	COMM_%d	P%d	%p\n", \
-            surf_get_clock(), channel, (process)->simdata->PID, task)
-#define PAJE_HOST_NEW(host)\
-  if(msg_global->paje_output)\
-    fprintf(msg_global->paje_output,"7 %f %p H_t CUR \"%s\"\n",surf_get_clock(), \
-	    host, host->name)
-#define PAJE_HOST_FREE(host)\
-  if(msg_global->paje_output)\
-    fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host)
+m_task_t task_mallocator_new_f(void);
+void task_mallocator_free_f(m_task_t task);
+void task_mallocator_reset_f(m_task_t task);
+
 
-#else
 
 #define PAJE_PROCESS_STATE(process,state)\
   if(msg_global->paje_output) \
@@ -176,7 +140,7 @@ void __MSG_display_process_status(void);
 #define PAJE_PROCESS_PUSH_STATE(process,state,task)\
   if(msg_global->paje_output) \
     fprintf(msg_global->paje_output,"11 %f S_t %p %s \"%s\"\n",\
-            surf_get_clock(), (process),(state),(task)?((m_task_t)(task))->name:"")
+            surf_get_clock(), (process),(state),(task)?((m_task_t)(task))->name:" ")
 #define PAJE_PROCESS_POP_STATE(process)\
   if(msg_global->paje_output) \
     fprintf(msg_global->paje_output,"12 %f S_t %p\n",\
@@ -209,5 +173,5 @@ void __MSG_display_process_status(void);
   if(msg_global->paje_output)\
     fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host);
 
-#endif /* Alvin_Special_Loging */
+
 #endif