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 github.com:simgrid/simgrid into s_type_cleanup
[simgrid.git]
/
src
/
surf
/
network_interface.hpp
diff --git
a/src/surf/network_interface.hpp
b/src/surf/network_interface.hpp
index 2e6d67b55b28b3786c289490763db79f612c9f77..be484919a7da9d4f68eb29fff761f1943c06adab 100644
(file)
--- a/
src/surf/network_interface.hpp
+++ b/
src/surf/network_interface.hpp
@@
-157,7
+157,7
@@
public:
tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load).
Trace must contain absolute values */
tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load).
Trace must contain absolute values */
- tmgr_trace_
iterator_t stateEvent_
= nullptr;
+ tmgr_trace_
event_t stateEvent_
= nullptr;
s_surf_metric_t latency_ = {1.0, 0, nullptr};
s_surf_metric_t bandwidth_ = {1.0, 0, nullptr};
s_surf_metric_t latency_ = {1.0, 0, nullptr};
s_surf_metric_t bandwidth_ = {1.0, 0, nullptr};
@@
-171,7
+171,7
@@
private:
static std::unordered_map<std::string, LinkImpl*>* links;
public:
static std::unordered_map<std::string, LinkImpl*>* links;
public:
- static LinkImpl* byName(
const char*
name);
+ static LinkImpl* byName(
std::string
name);
static int linksCount();
static LinkImpl** linksList();
static void linksExit();
static int linksCount();
static LinkImpl** linksList();
static void linksExit();
@@
-206,7
+206,7
@@
public:
: simgrid::surf::Action(model, cost, failed, var){};
void setState(simgrid::surf::Action::State state) override;
: simgrid::surf::Action(model, cost, failed, var){};
void setState(simgrid::surf::Action::State state) override;
- std::list<LinkImpl*> links();
+
virtual
std::list<LinkImpl*> links();
double latency_;
double latCurrent_;
double latency_;
double latCurrent_;