X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/710e7c0ce3fce936637636f544019e89e8ef023d..1007ad7dc0a98deb8f975017050a451316a06e4d:/src/msg/private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 6e485d4424..666487864e 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -35,6 +35,7 @@ typedef struct simdata_task {
   double computation_amount;	/* Computation size  */
   xbt_dynar_t sleeping;		/* process to wake-up */
   m_process_t sender;
+  double rate;
   int using;
 } s_simdata_task_t;
 
@@ -46,23 +47,42 @@ typedef struct simdata_process {
   int PID;			/* used for debugging purposes */
   int PPID;			/* The parent PID */
   m_task_t waiting_task;        
+  int blocked;
+  int suspended;
+  m_host_t put_host;		/* used for debugging purposes */
+  m_channel_t put_channel;	/* used for debugging purposes */
   int argc;                     /* arguments number if any */
   char **argv;                  /* arguments table if any */
   MSG_error_t last_errno;       /* the last value returned by a MSG_function */
+  int paje_state;               /* the number of states stacked with Paje */
 } s_simdata_process_t;
 
+typedef struct process_arg {
+  const char *name;
+  m_process_code_t code;
+  void *data;
+  m_host_t host;
+  int argc;
+  char **argv;
+  double kill_time;
+} s_process_arg_t, *process_arg_t;
+
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
   xbt_fifo_t host;
-  xbt_fifo_t link;
   xbt_fifo_t process_to_run;
   xbt_fifo_t process_list;
   int max_channel;
   m_process_t current_process;
   xbt_dict_t registered_functions;
+  FILE *paje_output;
+  int paje_maxPID;
+  int PID;
+  int session;
 } s_MSG_Global_t, *MSG_Global_t;
 
 extern MSG_Global_t msg_global;
+      
 
 /*************************************************************/
 
@@ -82,4 +102,95 @@ 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);
 
+MSG_error_t __MSG_process_block(void);
+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)
+
+#else
+
+#define PAJE_PROCESS_STATE(process,state)\
+  if(msg_global->paje_output) \
+    fprintf(msg_global->paje_output,"10 %lg S_t %p %s\n",\
+            surf_get_clock(), (process),(state))
+#define PAJE_PROCESS_PUSH_STATE(process,state)\
+  if(msg_global->paje_output) \
+    fprintf(msg_global->paje_output,"11 %lg S_t %p %s\n",\
+            surf_get_clock(), (process),(state))
+#define PAJE_PROCESS_POP_STATE(process)\
+  if(msg_global->paje_output) \
+    fprintf(msg_global->paje_output,"12 %lg 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", \
+	    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", \
+            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)
+#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)
+#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);
+
+#endif /* Alvin_Special_Loging */
 #endif