X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aeb67d26a90a4fbc05a2ee596c8f627bb7aa615b..d1476ed63c5c33d5a1395b70ac17374e07f7b80d:/src/msg/private.h diff --git a/src/msg/private.h b/src/msg/private.h index 29f7a41c4a..f7c617b212 100644 --- a/src/msg/private.h +++ b/src/msg/private.h @@ -26,9 +26,7 @@ SG_BEGIN_DECL() /* this structure represents a mailbox */ typedef struct s_msg_mailbox { char *alias; /* the key of the mailbox in the global dictionary */ - xbt_fifo_t tasks; /* the list of the tasks in the mailbox */ smx_cond_t cond; /* the condition on the mailbox */ - char *hostname; /* the name of the host containing the mailbox */ smx_rdv_t rdv; /* SIMIX rendez-vous point */ } s_msg_mailbox_t; @@ -42,7 +40,7 @@ SG_BEGIN_DECL() typedef struct simdata_task { smx_action_t compute; /* SURF modeling of computation */ - smx_action_t comm; /* SURF modeling of communication */ + smx_comm_t comm; /* SIMIX communication */ double message_size; /* Data size */ double computation_amount; /* Computation size */ smx_cond_t cond; @@ -70,6 +68,7 @@ SG_BEGIN_DECL() m_host_t put_host; /* used for debugging purposes */ m_channel_t put_channel; /* used for debugging purposes */ smx_action_t waiting_action; + m_task_t waiting_task; 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 */