X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a0588c059ef10ae0f4470e21c6b226b959ea859..dd60a691bb83ef59ac7395b8e842712271774e18:/include/simgrid/s4u/Link.hpp diff --git a/include/simgrid/s4u/Link.hpp b/include/simgrid/s4u/Link.hpp index bd4a84bac9..c34383a283 100644 --- a/include/simgrid/s4u/Link.hpp +++ b/include/simgrid/s4u/Link.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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. */ @@ -60,17 +60,39 @@ public: bool is_used(); void turn_on(); + bool is_on() const; void turn_off(); + bool is_off() const; void* get_data(); /** Should be used only from the C interface. Prefer extensions in C++ */ void set_data(void* d); - void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain - boolean values. */ - void set_bandwidth_trace(tmgr_trace_t trace); /*< setup the trace file with bandwidth events (peak speed changes due to - external load). Trace must contain percentages (value between 0 and 1). */ - void set_latency_trace(tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to - external load). Trace must contain absolute values */ +#ifndef DOXYGEN + XBT_ATTRIB_DEPRECATED_v325("Please use Link::set_state_profile()") void set_state_trace( + kernel::profile::Profile* profile) + { + set_state_profile(profile); + } + XBT_ATTRIB_DEPRECATED_v325("Please use Link::set_bandwidth_profile()") void set_bandwidth_trace( + kernel::profile::Profile* profile) + { + set_bandwidth_profile(profile); + } + XBT_ATTRIB_DEPRECATED_v325("Please use Link::set_latency_profile()") void set_latency_trace( + kernel::profile::Profile* profile) + { + set_latency_profile(profile); + } +#endif + + /** Setup the profile with states events (ON or OFF). The profile must contain boolean values. */ + void set_state_profile(kernel::profile::Profile* profile); + /** Setup the profile with bandwidth events (peak speed changes due to external load). + * The profile must contain percentages (value between 0 and 1). */ + void set_bandwidth_profile(kernel::profile::Profile* profile); + /** Setup the profile file with latency events (peak latency changes due to external load). + * The profile must contain absolute values */ + void set_latency_profile(kernel::profile::Profile* profile); const char* get_property(std::string key); void set_property(std::string key, std::string value); @@ -95,6 +117,7 @@ public: static simgrid::xbt::signal on_communication_state_change; +#ifndef DOXYGEN // Deprecated methods /** @deprecated */ XBT_ATTRIB_DEPRECATED_v323("Please use Link::by_name()") static Link* byName(const char* name) { return by_name(name); } @@ -129,11 +152,15 @@ public: XBT_ATTRIB_DEPRECATED_v323("Please use Link::set_data()") void setData(void* d) {set_data(d);} /** @deprecated */ - XBT_ATTRIB_DEPRECATED_v323("Please use Link::get_state_trace()") void setStateTrace(tmgr_trace_t trace) {set_state_trace(trace);} + XBT_ATTRIB_DEPRECATED_v323("Please use Link::get_state_profile()") void setStateTrace( + simgrid::kernel::profile::Profile* profile) {set_state_profile(profile); } /** @deprecated */ - XBT_ATTRIB_DEPRECATED_v323("Please use Link::get_bandwidth_trace()") void setBandwidthTrace(tmgr_trace_t trace) {set_bandwidth_trace(trace);} + XBT_ATTRIB_DEPRECATED_v323("Please use Link::get_bandwidth_profile()") void setBandwidthTrace( + simgrid::kernel::profile::Profile* profile) { set_bandwidth_profile(profile); } /** @deprecated */ - XBT_ATTRIB_DEPRECATED_v323("Please use Link::get_latency_trace()") void setLatencyTrace(tmgr_trace_t trace) {set_latency_trace(trace);} + XBT_ATTRIB_DEPRECATED_v323("Please use Link::get_latency_profile()") void setLatencyTrace( + simgrid::kernel::profile::Profile* profile) { set_latency_profile(profile); } +#endif }; } }