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
[sonar] Declare functions "const" in src/kernel/.
[simgrid.git]
/
src
/
surf
/
network_cm02.hpp
diff --git
a/src/surf/network_cm02.hpp
b/src/surf/network_cm02.hpp
index
f011036
..
4f90b1d
100644
(file)
--- a/
src/surf/network_cm02.hpp
+++ b/
src/surf/network_cm02.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
20
. 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. */
/* 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. */
@@
-10,7
+10,7
@@
#include "network_interface.hpp"
#include "xbt/graph.h"
#include "network_interface.hpp"
#include "xbt/graph.h"
-
+#include "xbt/string.hpp"
/***********
* Classes *
/***********
* Classes *
@@
-32,7
+32,7
@@
class NetworkCm02Model : public NetworkModel {
public:
explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
virtual ~NetworkCm02Model() = default;
public:
explicit NetworkCm02Model(lmm::System* (*make_new_sys)(bool) = &lmm::make_new_maxmin_system);
virtual ~NetworkCm02Model() = default;
- LinkImpl* create_link(const std::string& name,
double bandwidth
, double latency,
+ LinkImpl* create_link(const std::string& name,
const std::vector<double>& bandwidths
, double latency,
s4u::Link::SharingPolicy policy) override;
void update_actions_state_lazy(double now, double delta) override;
void update_actions_state_full(double now, double delta) override;
s4u::Link::SharingPolicy policy) override;
void update_actions_state_lazy(double now, double delta) override;
void update_actions_state_full(double now, double delta) override;
@@
-47,8
+47,8
@@
class NetworkCm02Link : public LinkImpl {
public:
NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
s4u::Link::SharingPolicy policy, lmm::System* system);
public:
NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
s4u::Link::SharingPolicy policy, lmm::System* system);
-
virtual ~NetworkCm02Link()
= default;
- void apply_event(
tmgr_trace_event_t
event, double value) override;
+
~NetworkCm02Link() override
= default;
+ void apply_event(
kernel::profile::Event*
event, double value) override;
void set_bandwidth(double value) override;
void set_latency(double value) override;
};
void set_bandwidth(double value) override;
void set_latency(double value) override;
};
@@
-60,7
+60,8
@@
class NetworkCm02Action : public NetworkAction {
friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
public:
friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate);
public:
- NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){};
+ NetworkCm02Action(Model* model, s4u::Host& src, s4u::Host& dst, double cost, bool failed)
+ : NetworkAction(model, src, dst, cost, failed){};
virtual ~NetworkCm02Action() = default;
void update_remains_lazy(double now) override;
};
virtual ~NetworkCm02Action() = default;
void update_remains_lazy(double now) override;
};