Rename xbt/xbt_context.h to xbt/context.h, and add src/include/xbt/context.h to the...

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

diff --git a/src/msg/private.h b/src/msg/private.h
index d193688..bdaea3c 100644 (file)
--- a/src/msg/private.h
+++ b/src/msg/private.h
@@ -24,7 +24,7 @@
 /**************** datatypes **********************************/
 
 typedef struct simdata_host {
-  smx_host_t s_host;                   /* SURF modeling */
+  smx_host_t smx_host;                 /* SURF modeling */
   xbt_fifo_t *mbox;            /* array of FIFOs used as a mailboxes  */
   smx_cond_t *sleeping;        /* array of conditions on which the processes sleep if they are waiting for a communication on a channel */
        smx_mutex_t mutex; /* mutex to access the host */
@@ -47,7 +47,7 @@ typedef struct simdata_task {
   int using;
   /*******  Parallel Tasks Only !!!! *******/
   int host_nb;
-  void * *host_list;            /* SURF modeling */
+  smx_host_t *host_list;
   double *comp_amount;
   double *comm_amount;
 } s_simdata_task_t;
@@ -95,8 +95,8 @@ extern 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_assert0(SIMIX_host_get_state(SIMIX_host_self())==1,\
-                                  "Host failed, you cannot call this function.")
+#define CHECK_HOST()  xbt_assert1(SIMIX_host_get_state(SIMIX_host_self())==1,\
+                                  "Host failed, you cannot call this function. (state=%d)",SIMIX_host_get_state(SIMIX_host_self()))
 
 m_host_t __MSG_host_create(smx_host_t workstation, void *data);
 
@@ -107,7 +107,7 @@ void __MSG_display_process_status(void);
 void __MSG_process_cleanup(void *arg);
 void *_MSG_process_create_from_SIMIX(const char *name,
                                     xbt_main_func_t code, void *data,
-                                    char * hostname, int argc, char **argv);
+                                    char * hostname, int argc, char **argv, xbt_dict_t properties);
 void _MSG_process_kill_from_SIMIX(void *p);