X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/78f2b1a0a46589cd083afd39fb84a90c4c043288..fd67e295641204d07b46527e4be0a0e8fe0c865e:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index f13dbce103..b3dce5f8de 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -26,7 +26,7 @@ SG_BEGIN_DECL() * #MSG_task_send and friends) hide this object behind a string * alias. That mean that you don't provide the mailbox on which you * want to send your task, but only the name of this mailbox. */ -typedef struct s_smx_mailbox *msg_mailbox_t; +typedef smx_mailbox_t msg_mailbox_t; /* ******************************** Environment ************************************ */ typedef simgrid_As *msg_as_t; @@ -89,7 +89,7 @@ typedef s_xbt_dictelm_t s_msg_file_t; extern int MSG_FILE_LEVEL; typedef struct simdata_file *simdata_file_t; -typedef struct msg_file_priv { +struct msg_file_priv { char *fullpath; sg_size_t size; char* mount_point; @@ -99,7 +99,9 @@ typedef struct msg_file_priv { int desc_id; void *data; simdata_file_t simdata; -} s_msg_file_priv_t, *msg_file_priv_t; +}; +typedef struct msg_file_priv s_msg_file_priv_t; +typedef struct msg_file_priv* msg_file_priv_t; static inline msg_file_priv_t MSG_file_priv(msg_file_t file){ return (msg_file_priv_t )xbt_lib_get_level(file, MSG_FILE_LEVEL); @@ -118,10 +120,12 @@ extern int MSG_STORAGE_LEVEL; typedef xbt_dictelm_t msg_storage_t; typedef s_xbt_dictelm_t s_msg_storage_t; -typedef struct msg_storage_priv { +struct msg_storage_priv { const char *hostname; void *data; -} s_msg_storage_priv_t, *msg_storage_priv_t; +}; +typedef struct msg_storage_priv s_msg_storage_priv_t; +typedef struct msg_storage_priv* msg_storage_priv_t; static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){ return (msg_storage_priv_t )xbt_lib_get_level(storage, MSG_STORAGE_LEVEL); @@ -193,7 +197,6 @@ XBT_PUBLIC(msg_error_t) MSG_main(void); XBT_PUBLIC(void) MSG_function_register(const char *name, xbt_main_func_t code); XBT_PUBLIC(void) MSG_function_register_default(xbt_main_func_t code); -XBT_PUBLIC(xbt_main_func_t) MSG_get_registered_function(const char *name); XBT_PUBLIC(void) MSG_launch_application(const char *file); /*Bypass the parser */ XBT_PUBLIC(void) MSG_set_function(const char *host_id, @@ -526,17 +529,17 @@ XBT_PUBLIC(int) MSG_barrier_wait(msg_bar_t bar); * */ -XBT_PUBLIC(int) MSG_vm_is_created(msg_vm_t); -XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t); -XBT_PUBLIC(int) MSG_vm_is_migrating(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_created(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_running(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_migrating(msg_vm_t vm); -XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t); -XBT_PUBLIC(int) MSG_vm_is_saving(msg_vm_t); -XBT_PUBLIC(int) MSG_vm_is_saved(msg_vm_t); -XBT_PUBLIC(int) MSG_vm_is_restoring(msg_vm_t); +XBT_PUBLIC(int) MSG_vm_is_suspended(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_saving(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_saved(msg_vm_t vm); +XBT_PUBLIC(int) MSG_vm_is_restoring(msg_vm_t vm); -XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t); +XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t vm); // TODO add VDI later XBT_PUBLIC(msg_vm_t) MSG_vm_create_core(msg_host_t location, const char *name); @@ -545,7 +548,7 @@ XBT_PUBLIC(msg_vm_t) MSG_vm_create(msg_host_t ind_pm, const char *name, XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); -XBT_PUBLIC(void) MSG_vm_start(msg_vm_t); +XBT_PUBLIC(void) MSG_vm_start(msg_vm_t vm); /* Shutdown the guest operating system. */ XBT_PUBLIC(void) MSG_vm_shutdown(msg_vm_t vm);