X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45d00a93682182156762f2ca97b1f2746746c8b1..77af7e6ef6b089488af572b25e725beb3413e911:/include/simgrid/msg.h
diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 562f659456..ff1bcdf8c3 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_rvpoint *msg_mailbox_t;
+typedef smx_mailbox_t msg_mailbox_t;
/* ******************************** Environment ************************************ */
typedef simgrid_As *msg_as_t;
@@ -79,20 +79,17 @@ typedef struct msg_task *msg_task_t;
/* ******************************** VM ************************************* */
typedef msg_host_t msg_vm_t;
-/** ******************************** File ************************************ */
+/* ******************************** File ************************************ */
-/** @brief File datatype.
-* @ingroup msg_file_management
-*
-* You should consider this as an opaque object.
-*/
+/** @brief Opaque object describing a File in MSG.
+ * @ingroup msg_file */
typedef xbt_dictelm_t msg_file_t;
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;
@@ -102,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);
@@ -121,35 +120,17 @@ 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);
}
-/*************** Begin GPU ***************/
-typedef struct simdata_gpu_task *simdata_gpu_task_t;
-
-typedef struct msg_gpu_task {
- char *name; /**< @brief task name if any */
- simdata_gpu_task_t simdata; /**< @brief simulator data */
- long long int counter; /* task unique identifier for instrumentation */
- char *category; /* task category for instrumentation */
-} s_msg_gpu_task_t;
-
-/** @brief GPU task datatype.
- @ingroup m_task_management
-
- A task may then be defined by a computing
- amount, a dispatch latency and a collect latency.
- \see m_task_management
-*/
-typedef struct msg_gpu_task *msg_gpu_task_t;
-/*************** End GPU ***************/
-
/**
* \brief @brief Communication action.
* \ingroup msg_task_usage
@@ -175,7 +156,7 @@ typedef struct msg_comm *msg_comm_t;
structure, but always use the provided API to interact with
processes.
*/
-typedef struct s_smx_process *msg_process_t;
+typedef smx_process_t msg_process_t;
/** @brief Return code of most MSG functions
@ingroup msg_simulation
@@ -216,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,
@@ -382,10 +362,6 @@ XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process);
XBT_PUBLIC(msg_task_t) MSG_task_create(const char *name,
double flops_amount,
double bytes_amount, void *data);
-XBT_PUBLIC(msg_gpu_task_t) MSG_gpu_task_create(const char *name,
- double flops_amount,
- double dispatch_latency,
- double collect_latency);
XBT_PUBLIC(msg_task_t) MSG_parallel_task_create(const char *name,
int host_nb,
const msg_host_t * host_list,
@@ -464,7 +440,6 @@ XBT_PUBLIC(msg_task_t) MSG_comm_get_task(msg_comm_t comm);
XBT_PUBLIC(msg_error_t) MSG_comm_get_status(msg_comm_t comm);
XBT_PUBLIC(int) MSG_task_listen(const char *alias);
-XBT_PUBLIC(int) MSG_task_listen_from_host(const char *alias, msg_host_t host);
XBT_PUBLIC(msg_error_t) MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout);
XBT_PUBLIC(msg_error_t) MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alias, double timeout, double maxrate);
XBT_PUBLIC(msg_error_t) MSG_task_send(msg_task_t task, const char *alias);
@@ -509,22 +484,12 @@ XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias);
* @param mailbox The mailbox concerned by the operation.
* @return The task at the head of the mailbox.
*/
-XBT_PUBLIC(msg_task_t) MSG_mailbox_get_head(msg_mailbox_t mailbox);
-
-/* @brief MSG_mailbox_get_count_host_waiting_tasks
- * Return the number of tasks waiting to be received in a mailbox and sent by a host.
- * @param mailbox The mailbox concerned by the operation.
- * @param host The host containing the processes that sended the tasks.
- * @return The number of tasks in the mailbox specified by the parameter mailbox and sended by all the
- * processes located on the host specified by the parameter host.
- */
-XBT_PUBLIC(int) MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox, msg_host_t host);
+XBT_PUBLIC(msg_task_t) MSG_mailbox_front(msg_mailbox_t mailbox);
+
XBT_PUBLIC(msg_error_t) MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, msg_task_t * task, msg_host_t host,
double timeout);
XBT_PUBLIC(msg_error_t) MSG_mailbox_get_task_ext_bounded(msg_mailbox_t mailbox, msg_task_t *task, msg_host_t host,
double timeout, double rate);
-XBT_PUBLIC(msg_error_t) MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task, double timeout);
-
/************************** Action handling **********************************/
XBT_PUBLIC(msg_error_t) MSG_action_trace_run(char *path);
@@ -540,7 +505,7 @@ XBT_PUBLIC(msg_sem_t) MSG_sem_init(int initial_value);
XBT_PUBLIC(void) MSG_sem_acquire(msg_sem_t sem);
XBT_PUBLIC(msg_error_t) MSG_sem_acquire_timeout(msg_sem_t sem, double timeout);
XBT_PUBLIC(void) MSG_sem_release(msg_sem_t sem);
-XBT_PUBLIC(void) MSG_sem_get_capacity(msg_sem_t sem);
+XBT_PUBLIC(int) MSG_sem_get_capacity(msg_sem_t sem);
XBT_PUBLIC(void) MSG_sem_destroy(msg_sem_t sem);
XBT_PUBLIC(int) MSG_sem_would_block(msg_sem_t sem);
@@ -564,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);
@@ -583,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);
@@ -632,5 +597,10 @@ xbt_dynar_t MSG_vm_get_list_from_hosts(msg_dynar_t)
/* Used only by the bindings -- unclean pimple, please ignore if you're not writing a binding */
XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(msg_process_t process);
+
+/* Functions renamed in 3.14 */
+#define MSG_mailbox_get_head(m) MSG_mailbox_front(m)
+
+
SG_END_DECL()
#endif