X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/75206281a5a59ea2acdfd376a38433a79d692370..b0bd0896ce802ba842f77b362f2fbbabb88747ff:/src/msg/private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index bc4a6db2a2..8d60aa7399 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -15,20 +15,15 @@
 #include "xbt/swag.h"
 #include "xbt/dict.h"
 #include "xbt/context.h"
+#include "xbt/config.h"
 
 /**************** datatypes **********************************/
 
-typedef enum {
-  HOST_DOWN = 0,
-  HOST_ALIVE = 1
-} m_host_state_t;
-
 typedef struct simdata_host {
   void *host;			/* SURF modeling */
   xbt_fifo_t *mbox;		/* array of FIFOs used as a mailboxes  */
   m_process_t *sleeping;	/* array of process used to know whether a local process is
 				   waiting for a communication on a channel */
-  m_host_state_t state;
   xbt_fifo_t process_list;
 } s_simdata_host_t;
 
@@ -40,6 +35,16 @@ typedef struct simdata_task {
   double message_size;		/* Data size  */
   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 *************************************/
@@ -49,39 +54,158 @@ typedef struct simdata_process {
   xbt_context_t context;	        /* the context that executes the scheduler fonction */
   int PID;			/* used for debugging purposes */
   int PPID;			/* The parent PID */
-  m_task_t waiting_task;        /* used for debugging purposes */
-  m_host_t put_host;            /* used for debugging purposes */
-  int put_channel;              /* used for debugging purposes */
+  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;
+  xbt_fifo_t process_list;
   int max_channel;
   m_process_t current_process;
   xbt_dict_t registered_functions;
-} s_MSG_global_t, *MSG_Global_t;
+  FILE *paje_output;
+  int paje_maxPID;
+  int PID;
+  int session;
+} 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) */
+extern xbt_cfg_t _msg_cfg_set;
 
 /*************************************************************/
 
-#define PROCESS_SET_ERRNO(val) (((simdata_process_t)(MSG_process_self()->simdata))->last_errno=val)
-#define PROCESS_GET_ERRNO() (((simdata_process_t)(MSG_process_self()->simdata))->last_errno)
+#define PROCESS_SET_ERRNO(val) (MSG_process_self()->simdata->last_errno=val)
+#define PROCESS_GET_ERRNO() (MSG_process_self()->simdata->last_errno)
 #define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
 /* #define CHECK_ERRNO()  ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
 
-#define CHECK_HOST()  ASSERT((((simdata_host_t) MSG_host_self()->simdata)->state==HOST_ALIVE),"Host failed, you cannot call this function.")
+#define CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
+				  get_state(MSG_host_self()->simdata->host)==SURF_CPU_ON,\
+                                  "Host failed, you cannot call this function.")
 
 m_host_t __MSG_host_create(const char *name, void *workstation,
 			   void *data);
 void __MSG_host_destroy(m_host_t host);
+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);
+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 %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)
+
+#else
+
+#define PAJE_PROCESS_STATE(process,state)\
+  if(msg_global->paje_output) \
+    fprintf(msg_global->paje_output,"10 %f 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 %f 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 %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 %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 %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	%f	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	%f	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 %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);
+
+#endif /* Alvin_Special_Loging */
 #endif