X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6797e494ca445d5894ccb5098c2df4a25e2d3ea..5b9cf50be0a43c599b20b1ed28341971a571d70d:/src/msg/private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 29d30a0d6a..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 **********************************/
 
@@ -36,8 +38,15 @@ typedef struct simdata_task {
   double computation_amount;	/* Computation size  */
   xbt_dynar_t sleeping;		/* process to wake-up */
   m_process_t sender;
+  m_host_t source;
+  double priority;
   double rate;
   int using;
+  /*******  Parallel Tasks Only !!!! *******/
+  int host_nb;
+  void * *host_list;            /* SURF modeling */
+  double *comp_amount;
+  double *comm_amount;
 } s_simdata_task_t;
 
 /******************************* Process *************************************/
@@ -80,12 +89,15 @@ 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;
       
 /************************** Configuration support ********************************/
 void msg_config_init(void); /* create the config set, call this before use! */
+void msg_config_finalize(void); /* destroy the config set, call this at cleanup. */
 extern int _msg_init_status; /* 0: beginning of time; 
                                 1: pre-inited (cfg_set created); 
                                 2: inited (running) */
@@ -109,95 +121,57 @@ 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);
 
-#ifdef ALVIN_SPECIAL_LOGING
-#define PAJE_PROCESS_STATE(process,state)\
-  if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,"10 %lg 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 %lg 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 %lg 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 %lg 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	%lg	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	%lg	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 %lg %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 %lg %p H_t\n",surf_get_clock(), host)
+void __MSG_display_process_status(void);
+
+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) \
-    fprintf(msg_global->paje_output,"10 %lg S_t %p %s\n",\
+    fprintf(msg_global->paje_output,"10 %f S_t %p %s\n",\
             surf_get_clock(), (process),(state))
-#define PAJE_PROCESS_PUSH_STATE(process,state)\
+#define PAJE_PROCESS_PUSH_STATE(process,state,task)\
   if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,"11 %lg S_t %p %s\n",\
-            surf_get_clock(), (process),(state))
+    fprintf(msg_global->paje_output,"11 %f S_t %p %s \"%s\"\n",\
+            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 %lg S_t %p\n",\
+    fprintf(msg_global->paje_output,"12 %f S_t %p\n",\
             surf_get_clock(), (process))
 
 #define PAJE_PROCESS_FREE(process)\
   if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,"8 %lg %p P_t\n", \
+    fprintf(msg_global->paje_output,"8 %f %p P_t\n", \
 	    surf_get_clock(), (process))
 #define PAJE_PROCESS_NEW(process)\
   if(msg_global->paje_output) \
-    fprintf(msg_global->paje_output,"7 %lg %p P_t %p \"%s %d (%d)\"\n", \
+    fprintf(msg_global->paje_output,"7 %f %p P_t %p \"%s %d (%d)\"\n", \
             surf_get_clock(), (process), (process)->simdata->host, \
             (process)->name, (process)->simdata->PID, msg_global->session)
 #define PAJE_COMM_START(process,task,channel)\
   if(msg_global->paje_output) \
     fprintf(msg_global->paje_output,\
-	    "16	%lg	Comm	CUR	COMM_%d	%p	%p\n", \
-            surf_get_clock(), channel, (process), task)
+	    "16	%f	Comm	CUR	\"CHANNEL_%d %s\"	%p	%p\n", \
+            surf_get_clock(), channel, task->name, (process), task)
 #define PAJE_COMM_STOP(process,task,channel)\
   if(msg_global->paje_output) \
     fprintf(msg_global->paje_output,\
-	    "17	%lg	Comm	CUR	COMM_%d	%p	%p\n", \
-            surf_get_clock(), channel, (process), task)
+	    "17	%f	Comm	CUR	\"CHANNEL_%d %s\"	%p	%p\n", \
+            surf_get_clock(), channel, task->name, (process), task)
 #define PAJE_HOST_NEW(host)\
   if(msg_global->paje_output)\
-    fprintf(msg_global->paje_output,"7 %lg %p H_t CUR \"%s\"\n",surf_get_clock(), \
+    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 %lg %p H_t\n",surf_get_clock(), host);
+    fprintf(msg_global->paje_output,"8 %f %p H_t\n",surf_get_clock(), host);
+
 
-#endif /* Alvin_Special_Loging */
 #endif