X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/601a98cadb45cfbd1ec9973e79ef3babd84eacc3..df5bbbbb3a482da1b371a0b7382687988a0e2a6d:/include/simgrid/msg.h diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 5c4a1be6ad..e73feada76 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -1,5 +1,4 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. 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. */ @@ -17,6 +16,7 @@ #ifdef __cplusplus #include "simgrid/simix.h" +#include namespace simgrid { namespace msg { class Comm; @@ -169,36 +169,32 @@ XBT_PUBLIC(const char*) MSG_zone_get_property_value(msg_netzone_t as, const char 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); -/* Deprecated forms of the previous functions */ -static inline XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_root() instead: v3.19 will remove MSG_environment_get_routing_root() completely.") msg_netzone_t - MSG_environment_get_routing_root() +static inline XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_root() instead: v3.19 will turn this warning into an error.") + msg_netzone_t MSG_environment_get_routing_root() { return MSG_zone_get_root(); } -static inline XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_name() instead: v3.19 will remove MSG_environment_as_get_name() completely.") const - char* MSG_environment_as_get_name(msg_netzone_t zone) +static inline XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_name() instead: v3.19 will turn this warning into an error.") + const char* MSG_environment_as_get_name(msg_netzone_t zone) { return MSG_zone_get_name(zone); } static inline XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_by_name() instead: v3.19 will remove MSG_environment_as_get_by_name() completely.") msg_netzone_t + "Use MSG_zone_get_by_name() instead: v3.19 will turn this warning into an error.") msg_netzone_t MSG_environment_as_get_by_name(const char* name) { return MSG_zone_get_by_name(name); } -static inline XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_sons() instead: v3.19 will remove MSG_environment_as_get_routing_sons() completely.") xbt_dict_t - MSG_environment_as_get_routing_sons(msg_netzone_t zone) +static inline XBT_ATTRIB_DEPRECATED_v319("Use MSG_zone_get_sons() instead: v3.19 will turn this warning into an error.") + 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; } static inline XBT_ATTRIB_DEPRECATED_v319( - "Use MSG_zone_get_property_value() instead: v3.19 will remove MSG_environment_as_get_property_value() completely.") - const char* MSG_environment_as_get_property_value(msg_netzone_t zone, const char* name) + "Use MSG_zone_get_property_value() instead: v3.19 will turn this warning into an error.") const + char* MSG_environment_as_get_property_value(msg_netzone_t zone, const char* name) { return MSG_zone_get_property_value(zone, name); } @@ -272,12 +268,17 @@ static inline double { return MSG_host_get_speed(host); } +static inline double XBT_ATTRIB_DEPRECATED_v320( + "Use MSG_host_get_speed(): v3.20 will drop MSG_host_get_current_power_peak() completely.") + 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); -#define MSG_host_get_current_power_peak(h) MSG_host_get_speed(h) /* deprecated */ XBT_PUBLIC(int) MSG_host_get_nb_pstates(msg_host_t h); -#define MSG_host_get_pstate(h) sg_host_get_pstate(h) /* deprecated */ -#define MSG_host_set_pstate(h, pstate) sg_host_set_pstate(h, pstate) /* deprecated */ +#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); @@ -376,36 +377,26 @@ 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(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(void) MSG_task_set_bytes_amount(msg_task_t task, - double bytes_amount); +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_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_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_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); +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_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) @@ -516,24 +507,18 @@ 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" /* ****************************************************************************************** */ /* 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() #ifdef __cplusplus XBT_PUBLIC(msg_process_t) MSG_process_create_from_stdfunc(const char* name, std::function code, void* data, msg_host_t host, - xbt_dict_t properties); + std::map* properties); #endif #endif