X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0afad4b7e2215154531cd6b2933af898ec6b781d..ce41a4a77b69238e56f8acb971f74c587a0d87d4:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index eadc8626d8..2cfefb73dd 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -1,22 +1,23 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#ifndef MSG_H -#define MSG_H +#ifndef SIMGRID_MSG_H +#define SIMGRID_MSG_H -#include "simgrid/datatypes.h" -#include "simgrid/forward.h" -#include "simgrid/host.h" - -#include "xbt/base.h" -#include "xbt/dict.h" -#include "xbt/dynar.h" +#include +#include +#include +#include +#include +#include +#include +#include #ifdef __cplusplus -#include "simgrid/simix.h" #include +#include namespace simgrid { namespace msg { class Comm; @@ -31,24 +32,40 @@ SG_BEGIN_DECL() /* *************************** Network Zones ******************************** */ #define msg_as_t msg_netzone_t /* portability macro */ -typedef s4u_NetZone* msg_netzone_t; +typedef sg_netzone_t msg_netzone_t; /* ******************************** Host ************************************ */ -/** @brief Host datatype. - @ingroup m_host_management - - A location (or host) is any possible place where - a process may run. Thus it is represented as a physical - resource with computing capabilities, some mailboxes - to enable running process to communicate with remote ones, and - some private data that can be only accessed by local - process. - */ typedef sg_host_t msg_host_t; +#define MSG_get_host_number() sg_host_count() +#define MSG_get_host_by_name(n) sg_host_by_name(n) /* Rewrite the old name into the new one transparently */ -XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors; +#define MSG_hosts_as_dynar() sg_hosts_as_dynar() + +#define MSG_host_by_name(name) sg_host_by_name(name) +#define MSG_host_get_name(host) sg_host_get_name(host) +#define MSG_host_get_data(host) sg_host_user(host) +#define MSG_host_set_data(host, data) sg_host_user_set(host, data) +#define MSG_host_get_mounted_storage_list(host) sg_host_get_mounted_storage_list(host) +#define MSG_host_get_attached_storage_list(host) host_get_attached_storage_list(host) +#define MSG_host_get_speed(host) sg_host_speed(host) +#define MSG_host_get_power_peak_at(host, pstate_index) sg_host_get_pstate_speed(host, pstate_index) +#define MSG_host_get_core_number(host) sg_host_core_count(host) +#define MSG_host_self() sg_host_self() +#define MSG_host_get_nb_pstates(host) sg_host_get_nb_pstates(host) +#define MSG_host_get_pstate(h) sg_host_get_pstate(h) +#define MSG_host_set_pstate(h, pstate) sg_host_set_pstate(h, pstate) +#define MSG_host_on(h) sg_host_turn_on(h) +#define MSG_host_off(h) sg_host_turn_off(h) +#define MSG_host_is_on(h) sg_host_is_on(h) +#define MSG_host_is_off(h) sg_host_is_off(h) +#define MSG_host_get_properties(host) sg_host_get_properties(host) +#define MSG_host_get_property_value(host, name) sg_host_get_property_value(host, name) +#define MSG_host_set_property_value(host, name, value) sg_host_set_property_value(host, name, value) +#define MSG_host_get_process_list(host, whereto) sg_host_get_actor_list(host, whereto) + +XBT_PUBLIC_DATA int sg_storage_max_file_descriptors; /* ******************************** Task ************************************ */ typedef struct s_simdata_task_t* simdata_task_t; @@ -73,6 +90,28 @@ typedef struct msg_task *msg_task_t; /* ******************************** VM ************************************* */ typedef sg_vm_t msg_vm_t; +#define MSG_vm_create_core(vm, name) sg_vm_create_core(vm, name) +#define MSG_vm_create_multicore(vm, name, coreAmount) sg_vm_create_multicore(vm, name, coreAmount) +XBT_ATTRIB_DEPRECATED_v322("Use sg_vm_create_migratable() from the live migration plugin: " + "v3.22 will drop MSG_vm_create() completely.") XBT_PUBLIC sg_vm_t + MSG_vm_create(sg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity); + +#define MSG_vm_is_created(vm) sg_vm_is_created(vm) +#define MSG_vm_is_running(vm) sg_vm_is_running(vm) +#define MSG_vm_is_suspended(vm) sg_vm_is_suspended(vm) + +#define MSG_vm_get_name(vm) sg_vm_get_name(vm) +#define MSG_vm_set_ramsize(vm, size) sg_vm_set_ramsize(vm, size) +#define MSG_vm_get_ramsize(vm) sg_vm_get_ramsize(vm) +#define MSG_vm_set_bound(vm, bound) sg_vm_set_bound(vm, bound) +#define MSG_vm_get_pm(vm) sg_vm_get_pm(vm) + +#define MSG_vm_start(vm) sg_vm_start(vm) +#define MSG_vm_suspend(vm) sg_vm_suspend(vm) +#define MSG_vm_resume(vm) sg_vm_resume(vm) +#define MSG_vm_shutdown(vm) sg_vm_shutdown(vm) +#define MSG_vm_destroy(vm) sg_vm_destroy(vm) + /* ******************************** File ************************************ */ typedef sg_file_t msg_file_t; @@ -130,7 +169,7 @@ typedef enum { /** @} */ /************************** Global ******************************************/ -XBT_PUBLIC(void) MSG_config(const char *key, const char *value); +XBT_PUBLIC void MSG_config(const char* key, const char* value); /** \ingroup msg_simulation * \brief Initialize the MSG internal data. * \hideinitializer @@ -146,267 +185,189 @@ XBT_PUBLIC(void) MSG_config(const char *key, const char *value); MSG_init_nocheck(argc,argv); \ } while (0) -XBT_PUBLIC(void) MSG_init_nocheck(int *argc, char **argv); -XBT_PUBLIC(msg_error_t) MSG_main();; -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(void) MSG_launch_application(const char *file); +XBT_PUBLIC void MSG_init_nocheck(int* argc, char** argv); +XBT_PUBLIC msg_error_t MSG_main(); +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 void MSG_launch_application(const char* file); /*Bypass the parser */ -XBT_PUBLIC(void) MSG_set_function(const char *host_id, - const char *function_name, - xbt_dynar_t arguments); +XBT_PUBLIC void MSG_set_function(const char* host_id, const char* function_name, xbt_dynar_t arguments); -XBT_PUBLIC(double) MSG_get_clock(); -XBT_PUBLIC(unsigned long int) MSG_get_sent_msg(); +XBT_PUBLIC double MSG_get_clock(); +XBT_PUBLIC unsigned long int MSG_get_sent_msg(); /************************** Net Zones ***********************************/ -XBT_PUBLIC(msg_netzone_t) MSG_zone_get_root(); -XBT_PUBLIC(const char*) MSG_zone_get_name(msg_netzone_t zone); -XBT_PUBLIC(msg_netzone_t) MSG_zone_get_by_name(const char* name); -XBT_PUBLIC(void) MSG_zone_get_sons(msg_netzone_t zone, xbt_dict_t whereto); -XBT_PUBLIC(const char*) MSG_zone_get_property_value(msg_netzone_t as, const char* name); -XBT_PUBLIC(void) MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value); -XBT_PUBLIC(void) MSG_zone_get_hosts(msg_netzone_t zone, xbt_dynar_t whereto); - -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_root() instead: v3.19 will turn this warning into an error.") static inline msg_netzone_t - MSG_environment_get_routing_root() -{ - return MSG_zone_get_root(); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_name() instead: v3.19 will turn this warning into an error.") static inline const - char* MSG_environment_as_get_name(msg_netzone_t zone) -{ - return MSG_zone_get_name(zone); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_by_name() instead: v3.19 will turn this warning into an error.") static inline msg_netzone_t - MSG_environment_as_get_by_name(const char* name) -{ - return MSG_zone_get_by_name(name); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_sons() instead: v3.19 will turn this warning into an error.") static inline xbt_dict_t - MSG_environment_as_get_routing_sons(msg_netzone_t zone) -{ - xbt_dict_t res = xbt_dict_new_homogeneous(NULL); - MSG_zone_get_sons(zone, res); - return res; -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_property_value() instead: v3.19 will turn this warning into an error.") static inline const - char* MSG_environment_as_get_property_value(msg_netzone_t zone, const char* name) -{ - return MSG_zone_get_property_value(zone, name); -} -XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_set_property_value() instead: v3.19 will remove MSG_environment_as_set_property_value() " - "completely.") static inline void MSG_environment_as_set_property_value(msg_netzone_t zone, const char* name, - char* value) -{ - MSG_zone_set_property_value(zone, name, value); -} -XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_hosts() instead: v3.19 will remove MSG_environment_as_get_hosts() " - "completely.") static inline xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t zone) -{ - xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), NULL); - MSG_zone_get_hosts(zone, res); - return res; -} +XBT_PUBLIC sg_netzone_t sg_zone_get_root(); +#define MSG_zone_get_root() sg_zone_get_root() +XBT_PUBLIC const char* sg_zone_get_name(sg_netzone_t zone); +#define MSG_zone_get_name(zone) sg_zone_get_name(zone) +XBT_PUBLIC sg_netzone_t sg_zone_get_by_name(const char* name); +#define MSG_zone_get_by_name(name) sg_zone_get_by_name(name) +XBT_PUBLIC void sg_zone_get_sons(sg_netzone_t zone, xbt_dict_t whereto); +#define MSG_zone_get_sons(zone, whereto) sg_zone_get_sons(zone, whereto) +XBT_PUBLIC const char* sg_zone_get_property_value(sg_netzone_t as, const char* name); +#define MSG_zone_get_property_value(zone, name) sg_zone_get_property_value(zone, name) +XBT_PUBLIC void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, char* value); +#define MSG_zone_set_property_value(zone, name, value) sg_zone_set_property_value(zone, name, value) +XBT_PUBLIC void sg_zone_get_hosts(sg_netzone_t zone, xbt_dynar_t whereto); +#define MSG_zone_get_hosts(zone, whereto) sg_zone_get_hosts(zone, whereto) /************************** Storage handling ***********************************/ -XBT_PUBLIC(const char *) MSG_storage_get_name(msg_storage_t storage); -XBT_PUBLIC(msg_storage_t) MSG_storage_get_by_name(const char *name); -XBT_PUBLIC(xbt_dict_t) MSG_storage_get_properties(msg_storage_t storage); -XBT_PUBLIC(void) MSG_storage_set_property_value(msg_storage_t storage, const char* name, char* value); -XBT_PUBLIC(const char *)MSG_storage_get_property_value(msg_storage_t storage, const char *name); -XBT_PUBLIC(xbt_dynar_t) MSG_storages_as_dynar(); -XBT_PUBLIC(msg_error_t) MSG_storage_set_data(msg_storage_t host, void *data); -XBT_PUBLIC(void *) MSG_storage_get_data(msg_storage_t storage); -XBT_PUBLIC(const char *) MSG_storage_get_host(msg_storage_t storage); -XBT_PUBLIC(sg_size_t) MSG_storage_read(msg_storage_t storage, sg_size_t size); -XBT_PUBLIC(sg_size_t) MSG_storage_write(msg_storage_t storage, sg_size_t size); +XBT_PUBLIC const char* sg_storage_get_name(sg_storage_t storage); +#define MSG_storage_get_name(storage) sg_storage_get_name(storage) +XBT_PUBLIC sg_storage_t sg_storage_get_by_name(const char* name); +#define MSG_storage_get_by_name(name) sg_storage_get_by_name(name) +XBT_PUBLIC xbt_dict_t sg_storage_get_properties(sg_storage_t storage); +#define MSG_storage_get_properties(storage) sg_storage_get_properties(storage) +XBT_PUBLIC void sg_storage_set_property_value(sg_storage_t storage, const char* name, char* value); +#define MSG_storage_set_property_value(storage, name, value) sg_storage_set_property_value(storage, name, value) +XBT_PUBLIC const char* sg_storage_get_property_value(sg_storage_t storage, const char* name); +#define MSG_storage_get_property_value(storage, name) sg_storage_get_property_value(storage, name) +XBT_PUBLIC xbt_dynar_t sg_storages_as_dynar(); +#define MSG_storages_as_dynar() sg_storages_as_dynar() +XBT_PUBLIC void sg_storage_set_data(sg_storage_t host, void* data); +#define MSG_storage_set_data(storage, data) sg_storage_set_data(storage, data) +XBT_PUBLIC void* sg_storage_get_data(sg_storage_t storage); +#define MSG_storage_get_data(storage) sg_storage_get_data(storage) +XBT_PUBLIC const char* sg_storage_get_host(sg_storage_t storage); +#define MSG_storage_get_host(storage) sg_storage_get_host(storage) +XBT_PUBLIC sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size); +#define MSG_storage_read(storage, size) sg_storage_read(storage, size) +XBT_PUBLIC sg_size_t sg_storage_write(sg_storage_t storage, sg_size_t size); +#define MSG_storage_write(storage, size) sg_storage_write(storage, size) /************************** Host handling ***********************************/ -XBT_PUBLIC(msg_host_t) MSG_host_by_name(const char *name); -#define MSG_get_host_by_name(n) MSG_host_by_name(n) /* Rewrite the old name into the new one transparently */ -XBT_PUBLIC(msg_error_t) MSG_host_set_data(msg_host_t host, void *data); -XBT_PUBLIC(void *) MSG_host_get_data(msg_host_t host); -/** \ingroup m_host_management - * - * \brief Return the name of the #msg_host_t. */ -#define MSG_host_get_name(host) sg_host_get_name(host) -XBT_PUBLIC(void) MSG_host_on(msg_host_t host); -XBT_PUBLIC(void) MSG_host_off(msg_host_t host); -XBT_PUBLIC(msg_host_t) MSG_host_self(); -XBT_PUBLIC(double) MSG_host_get_speed(msg_host_t h); -XBT_PUBLIC(int) MSG_host_get_core_number(msg_host_t h); -XBT_PUBLIC(void) MSG_host_get_process_list(msg_host_t h, xbt_dynar_t whereto); -XBT_PUBLIC(int) MSG_host_is_on(msg_host_t h); -XBT_PUBLIC(int) MSG_host_is_off(msg_host_t h); - -XBT_ATTRIB_DEPRECATED_v319("Use MSG_host_get_speed(): v3.19 will drop MSG_get_host_speed() " - "completely.") static inline double MSG_get_host_speed(msg_host_t host) -{ - return MSG_host_get_speed(host); -} XBT_ATTRIB_DEPRECATED_v320("Use MSG_host_get_speed(): v3.20 will drop MSG_host_get_current_power_peak() " "completely.") static inline double MSG_host_get_current_power_peak(msg_host_t host) { return MSG_host_get_speed(host); } -XBT_PUBLIC(double) MSG_host_get_power_peak_at(msg_host_t h, int pstate); -XBT_PUBLIC(int) MSG_host_get_nb_pstates(msg_host_t h); -#define MSG_host_get_pstate(h) sg_host_get_pstate(h) /* users don't know that MSG is the C version of SimGrid */ -#define MSG_host_set_pstate(h, pstate) sg_host_set_pstate(h, pstate) /* (same here) */ -XBT_PUBLIC(xbt_dynar_t) MSG_hosts_as_dynar(); -XBT_PUBLIC(int) MSG_get_host_number(); -XBT_PUBLIC(xbt_dict_t) MSG_host_get_mounted_storage_list(msg_host_t host); -XBT_PUBLIC(xbt_dynar_t) MSG_host_get_attached_storage_list(msg_host_t host); - -/*property handlers*/ -XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(msg_host_t host); -XBT_PUBLIC(const char*) MSG_host_get_property_value(msg_host_t host, const char* name); -XBT_PUBLIC(void) MSG_host_set_property_value(msg_host_t host, const char* name, char* value); - -XBT_PUBLIC(void) MSG_create_environment(const char *file); +XBT_PUBLIC void MSG_create_environment(const char* file); /************************** Process handling *********************************/ -XBT_PUBLIC(msg_process_t) MSG_process_create(const char *name, - xbt_main_func_t code, - void *data, msg_host_t host); -XBT_PUBLIC(msg_process_t) -MSG_process_create_with_arguments(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc, - char** argv); -XBT_PUBLIC(msg_process_t) -MSG_process_create_with_environment(const char* name, xbt_main_func_t code, void* data, msg_host_t host, int argc, - char** argv, xbt_dict_t properties); - -XBT_PUBLIC(msg_process_t) MSG_process_attach(const char* name, void* data, msg_host_t host, xbt_dict_t properties); -XBT_PUBLIC(void) MSG_process_detach(); - -XBT_PUBLIC(void) MSG_process_kill(msg_process_t process); -XBT_PUBLIC(int) MSG_process_killall(int reset_PIDs); -XBT_PUBLIC(msg_error_t) MSG_process_migrate(msg_process_t process, msg_host_t host); -XBT_PUBLIC(void) MSG_process_yield(); - -XBT_PUBLIC(void *) MSG_process_get_data(msg_process_t process); -XBT_PUBLIC(msg_error_t) MSG_process_set_data(msg_process_t process, - void *data); -XBT_PUBLIC(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup); -XBT_PUBLIC(msg_host_t) MSG_process_get_host(msg_process_t process); -XBT_PUBLIC(msg_process_t) MSG_process_from_PID(int PID); -XBT_PUBLIC(int) MSG_process_get_PID(msg_process_t process); -XBT_PUBLIC(int) MSG_process_get_PPID(msg_process_t process); -XBT_PUBLIC(const char *) MSG_process_get_name(msg_process_t process); -XBT_PUBLIC(int) MSG_process_self_PID(); -XBT_PUBLIC(int) MSG_process_self_PPID(); -XBT_PUBLIC(const char*) MSG_process_self_name(); -XBT_PUBLIC(msg_process_t) MSG_process_self(); -XBT_PUBLIC(xbt_dynar_t) MSG_processes_as_dynar(); -XBT_PUBLIC(int) MSG_process_get_number(); - -XBT_PUBLIC(msg_error_t) MSG_process_set_kill_time(msg_process_t process, double kill_time); +XBT_PUBLIC msg_process_t MSG_process_create(const char* name, xbt_main_func_t code, void* data, msg_host_t host); +XBT_PUBLIC msg_process_t MSG_process_create_with_arguments(const char* name, xbt_main_func_t code, void* data, + msg_host_t host, int argc, char** argv); +XBT_PUBLIC msg_process_t MSG_process_create_with_environment(const char* name, xbt_main_func_t code, void* data, + msg_host_t host, int argc, char** argv, + xbt_dict_t properties); + +XBT_PUBLIC msg_process_t MSG_process_attach(const char* name, void* data, msg_host_t host, xbt_dict_t properties); +XBT_PUBLIC void MSG_process_detach(); + +XBT_PUBLIC void MSG_process_kill(msg_process_t process); +XBT_PUBLIC int MSG_process_killall(); +XBT_PUBLIC msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host); +XBT_PUBLIC void MSG_process_yield(); + +XBT_PUBLIC void* MSG_process_get_data(msg_process_t process); +XBT_PUBLIC msg_error_t MSG_process_set_data(msg_process_t process, void* data); +XBT_PUBLIC void MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup); +XBT_PUBLIC msg_host_t MSG_process_get_host(msg_process_t process); +XBT_PUBLIC msg_process_t MSG_process_from_PID(int PID); +XBT_PUBLIC int MSG_process_get_PID(msg_process_t process); +XBT_PUBLIC int MSG_process_get_PPID(msg_process_t process); +XBT_PUBLIC const char* MSG_process_get_name(msg_process_t process); +XBT_PUBLIC int MSG_process_self_PID(); +XBT_PUBLIC int MSG_process_self_PPID(); +XBT_PUBLIC const char* MSG_process_self_name(); +XBT_PUBLIC msg_process_t MSG_process_self(); +XBT_PUBLIC xbt_dynar_t MSG_processes_as_dynar(); +XBT_PUBLIC int MSG_process_get_number(); + +XBT_PUBLIC msg_error_t MSG_process_set_kill_time(msg_process_t process, double kill_time); /*property handlers*/ -XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(msg_process_t process); -XBT_PUBLIC(const char*) MSG_process_get_property_value(msg_process_t process, const char* name); +XBT_PUBLIC xbt_dict_t MSG_process_get_properties(msg_process_t process); +XBT_PUBLIC const char* MSG_process_get_property_value(msg_process_t process, const char* name); -XBT_PUBLIC(msg_error_t) MSG_process_suspend(msg_process_t process); -XBT_PUBLIC(msg_error_t) MSG_process_resume(msg_process_t process); -XBT_PUBLIC(int) MSG_process_is_suspended(msg_process_t process); -XBT_PUBLIC(void) MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data); -XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart); +XBT_PUBLIC msg_error_t MSG_process_suspend(msg_process_t process); +XBT_PUBLIC msg_error_t MSG_process_resume(msg_process_t process); +XBT_PUBLIC int MSG_process_is_suspended(msg_process_t process); +XBT_PUBLIC void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void* data); +XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_restart); -XBT_PUBLIC(void) MSG_process_daemonize(msg_process_t process); -XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process); -XBT_PUBLIC(void) MSG_process_ref(msg_process_t process); -XBT_PUBLIC(void) MSG_process_unref(msg_process_t process); +XBT_PUBLIC void MSG_process_daemonize(msg_process_t process); +XBT_PUBLIC msg_process_t MSG_process_restart(msg_process_t process); +XBT_PUBLIC void MSG_process_ref(msg_process_t process); +XBT_PUBLIC void MSG_process_unref(msg_process_t process); /************************** Task handling ************************************/ -XBT_PUBLIC(msg_task_t) MSG_task_create(const char* name, double flops_amount, double bytes_amount, void* data); -XBT_PUBLIC(msg_task_t) MSG_parallel_task_create(const char *name, - int host_nb, - const msg_host_t * host_list, - double *flops_amount, - double *bytes_amount, - void *data); -XBT_PUBLIC(void *) MSG_task_get_data(msg_task_t task); -XBT_PUBLIC(void) MSG_task_set_data(msg_task_t task, void *data); -XBT_PUBLIC(void) MSG_task_set_copy_callback(void (*callback) ( - msg_task_t task, msg_process_t src, msg_process_t dst)); -XBT_PUBLIC(msg_process_t) MSG_task_get_sender(msg_task_t task); -XBT_PUBLIC(msg_host_t) MSG_task_get_source(msg_task_t task); -XBT_PUBLIC(const char *) MSG_task_get_name(msg_task_t task); -XBT_PUBLIC(void) MSG_task_set_name(msg_task_t task, const char *name); -XBT_PUBLIC(msg_error_t) MSG_task_cancel(msg_task_t task); -XBT_PUBLIC(msg_error_t) MSG_task_destroy(msg_task_t task); - -XBT_PUBLIC(msg_error_t) MSG_task_execute(msg_task_t task); -XBT_PUBLIC(msg_error_t) MSG_parallel_task_execute(msg_task_t task); -XBT_PUBLIC(msg_error_t) MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeout); -XBT_PUBLIC(void) MSG_task_set_priority(msg_task_t task, double priority); -XBT_PUBLIC(void) MSG_task_set_bound(msg_task_t task, double bound); - -XBT_PUBLIC(msg_error_t) MSG_process_join(msg_process_t process, double timeout); -XBT_PUBLIC(msg_error_t) MSG_process_sleep(double nb_sec); - -XBT_PUBLIC(void) MSG_task_set_flops_amount(msg_task_t task, double flops_amount); -XBT_PUBLIC(double) MSG_task_get_flops_amount(msg_task_t task); -XBT_PUBLIC(double) MSG_task_get_remaining_work_ratio(msg_task_t task); -XBT_PUBLIC(void) MSG_task_set_bytes_amount(msg_task_t task, double bytes_amount); - - -XBT_PUBLIC(double) MSG_task_get_remaining_communication(msg_task_t task); -XBT_PUBLIC(int) MSG_task_is_latency_bounded(msg_task_t task); -XBT_PUBLIC(double) MSG_task_get_bytes_amount(msg_task_t task); - -XBT_PUBLIC(msg_error_t) MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host); - -XBT_PUBLIC(msg_error_t) MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, double timeout); - -XBT_PUBLIC(msg_error_t) MSG_task_receive(msg_task_t* task, const char* alias); +XBT_PUBLIC msg_task_t MSG_task_create(const char* name, double flops_amount, double bytes_amount, void* data); +XBT_PUBLIC msg_task_t MSG_parallel_task_create(const char* name, int host_nb, const msg_host_t* host_list, + double* flops_amount, double* bytes_amount, void* data); +XBT_PUBLIC void* MSG_task_get_data(msg_task_t task); +XBT_PUBLIC void MSG_task_set_data(msg_task_t task, void* data); +XBT_PUBLIC void MSG_task_set_copy_callback(void (*callback)(msg_task_t task, msg_process_t src, msg_process_t dst)); +XBT_PUBLIC msg_process_t MSG_task_get_sender(msg_task_t task); +XBT_PUBLIC msg_host_t MSG_task_get_source(msg_task_t task); +XBT_PUBLIC const char* MSG_task_get_name(msg_task_t task); +XBT_PUBLIC void MSG_task_set_name(msg_task_t task, const char* name); +XBT_PUBLIC msg_error_t MSG_task_cancel(msg_task_t task); +XBT_PUBLIC msg_error_t MSG_task_destroy(msg_task_t task); + +XBT_PUBLIC msg_error_t MSG_task_execute(msg_task_t task); +XBT_PUBLIC msg_error_t MSG_parallel_task_execute(msg_task_t task); +XBT_PUBLIC msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeout); +XBT_PUBLIC void MSG_task_set_priority(msg_task_t task, double priority); +XBT_PUBLIC void MSG_task_set_bound(msg_task_t task, double bound); + +XBT_PUBLIC msg_error_t MSG_process_join(msg_process_t process, double timeout); +XBT_PUBLIC msg_error_t MSG_process_sleep(double nb_sec); + +XBT_PUBLIC void MSG_task_set_flops_amount(msg_task_t task, double flops_amount); +XBT_PUBLIC double MSG_task_get_flops_amount(msg_task_t task); +XBT_PUBLIC double MSG_task_get_remaining_work_ratio(msg_task_t task); +XBT_PUBLIC void MSG_task_set_bytes_amount(msg_task_t task, double bytes_amount); + +XBT_PUBLIC double MSG_task_get_remaining_communication(msg_task_t task); +XBT_PUBLIC double MSG_task_get_bytes_amount(msg_task_t task); + +XBT_PUBLIC msg_error_t MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host); + +XBT_PUBLIC msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, double timeout); + +XBT_PUBLIC msg_error_t MSG_task_receive(msg_task_t* task, const char* alias); #define MSG_task_recv(t,a) MSG_task_receive(t,a) -XBT_PUBLIC(msg_error_t) -MSG_task_receive_ext_bounded(msg_task_t* task, const char* alias, double timeout, msg_host_t host, double rate); +XBT_PUBLIC msg_error_t MSG_task_receive_ext_bounded(msg_task_t* task, const char* alias, double timeout, + msg_host_t host, double rate); -XBT_PUBLIC(msg_error_t) -MSG_task_receive_with_timeout_bounded(msg_task_t* task, const char* alias, double timeout, double rate); -XBT_PUBLIC(msg_error_t) MSG_task_receive_bounded(msg_task_t * task, const char *alias,double rate); +XBT_PUBLIC msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t* task, const char* alias, double timeout, + double rate); +XBT_PUBLIC msg_error_t MSG_task_receive_bounded(msg_task_t* task, const char* alias, double rate); #define MSG_task_recv_bounded(t,a,r) MSG_task_receive_bounded(t,a,r) -XBT_PUBLIC(msg_comm_t) MSG_task_isend(msg_task_t task, const char *alias); -XBT_PUBLIC(msg_comm_t) MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate); +XBT_PUBLIC msg_comm_t MSG_task_isend(msg_task_t task, const char* alias); +XBT_PUBLIC msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char* alias, double maxrate); XBT_ATTRIB_DEPRECATED_v320( "This function will be removed from SimGrid v3.20. If you really need this function, please speak up quickly.") - XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(msg_task_t task, const char* alias, - int (*match_fun)(void*, void*, void*), void* match_data); - -XBT_PUBLIC(void) MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup); -XBT_PUBLIC(void) MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t cleanup, double maxrate); -XBT_PUBLIC(msg_comm_t) MSG_task_irecv(msg_task_t * task, const char *alias); -XBT_PUBLIC(msg_comm_t) MSG_task_irecv_bounded(msg_task_t * task, const char *alias, double rate); -XBT_PUBLIC(int) MSG_comm_test(msg_comm_t comm); -XBT_PUBLIC(int) MSG_comm_testany(xbt_dynar_t comms); -XBT_PUBLIC(void) MSG_comm_destroy(msg_comm_t comm); -XBT_PUBLIC(msg_error_t) MSG_comm_wait(msg_comm_t comm, double timeout); -XBT_PUBLIC(void) MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout); -XBT_PUBLIC(int) MSG_comm_waitany(xbt_dynar_t comms); -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(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); -XBT_PUBLIC(msg_error_t) MSG_task_send_bounded(msg_task_t task, const char *alias, double rate); -XBT_PUBLIC(int) MSG_task_listen_from(const char *alias); -XBT_PUBLIC(void) MSG_task_set_category (msg_task_t task, const char *category); -XBT_PUBLIC(const char *) MSG_task_get_category (msg_task_t task); + XBT_PUBLIC msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char* alias, + int (*match_fun)(void*, void*, void*), void* match_data); + +XBT_PUBLIC void MSG_task_dsend(msg_task_t task, const char* alias, void_f_pvoid_t cleanup); +XBT_PUBLIC void MSG_task_dsend_bounded(msg_task_t task, const char* alias, void_f_pvoid_t cleanup, double maxrate); +XBT_PUBLIC msg_comm_t MSG_task_irecv(msg_task_t* task, const char* alias); +XBT_PUBLIC msg_comm_t MSG_task_irecv_bounded(msg_task_t* task, const char* alias, double rate); +XBT_PUBLIC int MSG_comm_test(msg_comm_t comm); +XBT_PUBLIC int MSG_comm_testany(xbt_dynar_t comms); +XBT_PUBLIC void MSG_comm_destroy(msg_comm_t comm); +XBT_PUBLIC msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout); +XBT_PUBLIC void MSG_comm_waitall(msg_comm_t* comm, int nb_elem, double timeout); +XBT_PUBLIC int MSG_comm_waitany(xbt_dynar_t comms); +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 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); +XBT_PUBLIC msg_error_t MSG_task_send_bounded(msg_task_t task, const char* alias, double rate); +XBT_PUBLIC int MSG_task_listen_from(const char* alias); +XBT_PUBLIC void MSG_task_set_category(msg_task_t task, const char* category); +XBT_PUBLIC const char* MSG_task_get_category(msg_task_t task); /************************** Mailbox handling ************************************/ @@ -416,12 +377,12 @@ XBT_PUBLIC(const char *) MSG_task_get_category (msg_task_t task); * This call should be done before issuing any receive, and on the receiver's side only * @param alias The alias of the mailbox to modify. */ -XBT_PUBLIC(void) MSG_mailbox_set_async(const char *alias); +XBT_PUBLIC void MSG_mailbox_set_async(const char* alias); /************************** Action handling **********************************/ -XBT_PUBLIC(msg_error_t) MSG_action_trace_run(char *path); -XBT_PUBLIC(void) MSG_action_init(); -XBT_PUBLIC(void) MSG_action_exit(); +XBT_PUBLIC msg_error_t MSG_action_trace_run(char* path); +XBT_PUBLIC void MSG_action_init(); +XBT_PUBLIC void MSG_action_exit(); /** @brief Opaque type representing a semaphore * @ingroup msg_synchro @@ -429,13 +390,13 @@ XBT_PUBLIC(void) MSG_action_exit(); */ typedef struct s_smx_sem_t* msg_sem_t; // Yeah that's a rename of the smx_sem_t which doesnt require smx_sem_t to be // declared here -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(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); +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 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); /** @brief Opaque type representing a barrier identifier * @ingroup msg_synchro @@ -444,60 +405,20 @@ XBT_PUBLIC(int) MSG_sem_would_block(msg_sem_t sem); #define MSG_BARRIER_SERIAL_PROCESS -1 typedef struct s_msg_bar_t* msg_bar_t; -XBT_PUBLIC(msg_bar_t) MSG_barrier_init( unsigned int count); -XBT_PUBLIC(void) MSG_barrier_destroy(msg_bar_t bar); -XBT_PUBLIC(int) MSG_barrier_wait(msg_bar_t bar); - -/** @brief Opaque type describing a Virtual Machine. - * @ingroup msg_VMs - * - * All this is highly experimental and the interface will probably change in the future. - * Please don't depend on this yet (although testing is welcomed if you feel so). - * Usual lack of guaranty of any kind applies here, and is even increased. - * - */ - -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 vm); - -XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t vm); -XBT_PUBLIC(void) MSG_vm_set_ramsize(msg_vm_t vm, size_t size); -XBT_PUBLIC(size_t) MSG_vm_get_ramsize(msg_vm_t vm); - -// TODO add VDI later -XBT_PUBLIC(msg_vm_t) MSG_vm_create_core(msg_host_t location, const char *name); -XBT_PUBLIC(msg_vm_t) MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount); -XBT_PUBLIC(msg_vm_t) -MSG_vm_create(msg_host_t ind_pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity); - -XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm); - -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); - -/* Suspend the execution of the VM, but keep its state on memory. */ -XBT_PUBLIC(void) MSG_vm_suspend(msg_vm_t vm); -XBT_PUBLIC(void) MSG_vm_resume(msg_vm_t vm); - -XBT_PUBLIC(msg_host_t) MSG_vm_get_pm(msg_vm_t vm); -XBT_PUBLIC(void) MSG_vm_set_bound(msg_vm_t vm, double bound); - -#include "simgrid/instr.h" +XBT_PUBLIC msg_bar_t MSG_barrier_init(unsigned int count); +XBT_PUBLIC void MSG_barrier_destroy(msg_bar_t bar); +XBT_PUBLIC int MSG_barrier_wait(msg_bar_t bar); /* ****************************************************************************************** */ /* 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); +XBT_PUBLIC smx_context_t MSG_process_get_smx_ctx(msg_process_t process); SG_END_DECL() #ifdef __cplusplus -XBT_PUBLIC(msg_process_t) -MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, - std::map* properties); +XBT_PUBLIC msg_process_t MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, + msg_host_t host, + std::map* properties); #endif #endif