A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Link.hpp
diff --git
a/include/simgrid/s4u/Link.hpp
b/include/simgrid/s4u/Link.hpp
index
2255bc1
..
f554dfe
100644
(file)
--- a/
include/simgrid/s4u/Link.hpp
+++ b/
include/simgrid/s4u/Link.hpp
@@
-7,11
+7,11
@@
#define S4U_LINK_HPP_
#include <simgrid/link.h>
#define S4U_LINK_HPP_
#include <simgrid/link.h>
-#include <xbt/base.h>
-#include <xbt/signal.hpp>
-
#include <string>
#include <unordered_map>
#include <string>
#include <unordered_map>
+#include <xbt/Extendable.hpp>
+#include <xbt/base.h>
+#include <xbt/signal.hpp>
/***********
* Classes *
/***********
* Classes *
@@
-23,7
+23,7
@@
class NetworkAction;
};
namespace s4u {
/** @brief A Link represents the network facilities between [hosts](\ref simgrid::s4u::Host) */
};
namespace s4u {
/** @brief A Link represents the network facilities between [hosts](\ref simgrid::s4u::Host) */
-XBT_PUBLIC_CLASS Link
+XBT_PUBLIC_CLASS Link
: public simgrid::xbt::Extendable<Link>
{
friend simgrid::surf::LinkImpl;
{
friend simgrid::surf::LinkImpl;
@@
-52,6
+52,9
@@
public:
*/
int sharingPolicy();
*/
int sharingPolicy();
+ /** @brief Returns the current load (in flops per second) */
+ double getUsage();
+
/** @brief Check if the Link is used */
bool isUsed();
/** @brief Check if the Link is used */
bool isUsed();
@@
-68,6
+71,9
@@
public:
void setLatencyTrace(tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to
external load). Trace must contain absolute values */
void setLatencyTrace(tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to
external load). Trace must contain absolute values */
+ const char* getProperty(const char* key);
+ void setProperty(std::string key, std::string value);
+
/* The signals */
/** @brief Callback signal fired when a new Link is created */
static simgrid::xbt::signal<void(s4u::Link&)> onCreation;
/* The signals */
/** @brief Callback signal fired when a new Link is created */
static simgrid::xbt::signal<void(s4u::Link&)> onCreation;