X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7db7b59e316e1b7e892fa60cca48bd6f857bb819..872e6c960cfd42bfbb748574c0cf88693d0730a5:/src/msg/private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 67fa10f91b..4e47231fee 100644
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -18,71 +18,76 @@
 
 /**************** datatypes **********************************/
 
-typedef enum {
-  HOST_DOWN = 0,
-  HOST_ALIVE = 1
-} m_host_state_t;
-
-typedef struct sim_data_host {
+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;
-  s_xbt_swag_t process_list;
-} s_sim_data_host_t;
+  xbt_fifo_t process_list;
+} s_simdata_host_t;
 
 /********************************* Task **************************************/
 
-typedef struct sim_data_task {
+typedef struct simdata_task {
   surf_action_t compute;	/* SURF modeling of computation  */
   surf_action_t comm;	        /* SURF modeling of communication  */
   double message_size;		/* Data size  */
   double computation_amount;	/* Computation size  */
   xbt_dynar_t sleeping;		/* process to wake-up */
-} s_sim_data_task_t;
+  m_process_t sender;
+  double rate;
+  int using;
+} s_simdata_task_t;
 
 /******************************* Process *************************************/
 
-typedef struct sim_data_process {
-  s_xbt_swag_hookup_t host_hookup; /* link to other process running on the same location */
+typedef struct simdata_process {
   m_host_t host;                /* the host on which the process is running */
   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 */
-} s_sim_data_process_t;
+} s_simdata_process_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;
+} s_MSG_Global_t, *MSG_Global_t;
 
 extern MSG_Global_t msg_global;
 
 /*************************************************************/
 
-#define PROCESS_SET_ERRNO(val) (((sim_data_process_t)(MSG_process_self()->simdata))->last_errno=val)
-#define PROCESS_GET_ERRNO() (((sim_data_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((((sim_data_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);
 
+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);
+
 #endif