The process list of MSG is now a swag instead of a fifo.

[simgrid.git] / src / msg / private.h

diff --git a/src/msg/private.h b/src/msg/private.h
index 17549a9..aec09a2 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -28,10 +28,10 @@ typedef struct simdata_host {
 /********************************* Task **************************************/
 
 typedef struct simdata_task {
-  smx_action_t compute;         /* SURF modeling of computation  */
-  smx_action_t comm;            /* SIMIX communication  */
-  double message_size;          /* Data size  */
-  double computation_amount;    /* Computation size  */
+  smx_action_t compute;         /* SIMIX modeling of computation */
+  smx_action_t comm;            /* SIMIX modeling of communication */
+  double message_size;          /* Data size */
+  double computation_amount;    /* Computation size */
   m_process_t sender;
   m_process_t receiver;
   m_host_t source;
@@ -71,10 +71,17 @@ typedef struct process_arg {
   double kill_time;
 } s_process_arg_t, *process_arg_t;
 
+typedef struct msg_comm {
+  smx_action_t s_comm;          /* SIMIX communication object encapsulated (the same for both processes) */
+  m_task_t task_sent;           /* task sent (NULL for the receiver) */
+  m_task_t *task_received;      /* where the task will be received (NULL for the sender) */
+  MSG_error_t status;           /* status of the communication once finished */
+} s_msg_comm_t;
+
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
   xbt_fifo_t host;
-  xbt_fifo_t process_list;
+  xbt_swag_t process_list;
   int max_channel;
   int PID;
   int session;
@@ -92,8 +99,10 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 #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()  xbt_assert1(SIMIX_req_host_get_state(SIMIX_host_self())==1,\
-                                  "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))
+/*#define CHECK_HOST()  xbt_assert1(SIMIX_req_host_get_state(SIMIX_host_self())==1,\
+                                  "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))*/
+#define CHECK_HOST()
+
 
 m_host_t __MSG_host_create(smx_host_t workstation, void *data);
 
@@ -102,10 +111,10 @@ void __MSG_host_destroy(m_host_t host);
 void __MSG_display_process_status(void);
 
 void __MSG_process_cleanup(smx_process_t smx_proc);
-void *_MSG_process_create_from_SIMIX(const char *name,
-                                     xbt_main_func_t code, void *data,
-                                     char *hostname, int argc,
-                                     char **argv, xbt_dict_t properties);
+void _MSG_process_create_from_SIMIX(void *process, const char *name,
+                                    xbt_main_func_t code, void *data,
+                                    char *hostname, int argc,
+                                    char **argv, xbt_dict_t properties);
 void _MSG_process_kill_from_SIMIX(void *p);
 
 void _MSG_action_init(void);