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
Make cmd-line option "network/TCP-gamma" neat and clean
[simgrid.git]
/
src
/
surf
/
network_interface.hpp
diff --git
a/src/surf/network_interface.hpp
b/src/surf/network_interface.hpp
index
36f2801
..
822602a
100644
(file)
--- a/
src/surf/network_interface.hpp
+++ b/
src/surf/network_interface.hpp
@@
-33,10
+33,9
@@
namespace surf {
*/
class NetworkModel : public kernel::resource::Model {
public:
*/
class NetworkModel : public kernel::resource::Model {
public:
- /** @brief Constructor */
- NetworkModel() : Model() {}
+ static simgrid::config::Flag<double> cfg_tcp_gamma;
- /** @brief Destructor */
+ explicit NetworkModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {}
~NetworkModel() override;
/**
~NetworkModel() override;
/**
@@
-64,12
+63,6
@@
public:
*/
virtual kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) = 0;
*/
virtual kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) = 0;
- /** @brief Function pointer to the function to use to solve the lmm_system_t
- *
- * @param system The lmm_system_t to solve
- */
- void (*f_networkSolve)(kernel::lmm::System*) = kernel::lmm::lmm_solve;
-
/**
* @brief Get the right multiplicative factor for the latency.
* @details Depending on the model, the effective latency when sending
/**
* @brief Get the right multiplicative factor for the latency.
* @details Depending on the model, the effective latency when sending
@@
-104,7
+97,7
@@
public:
* @return The new bandwidth.
*/
virtual double bandwidthConstraint(double rate, double bound, double size);
* @return The new bandwidth.
*/
virtual double bandwidthConstraint(double rate, double bound, double size);
- double next
OccuringEventF
ull(double now) override;
+ double next
_occuring_event_f
ull(double now) override;
LinkImpl* loopback_ = nullptr;
};
LinkImpl* loopback_ = nullptr;
};
@@
-147,10
+140,10
@@
public:
virtual int sharingPolicy();
/** @brief Check if the Link is used */
virtual int sharingPolicy();
/** @brief Check if the Link is used */
- bool is
U
sed() override;
+ bool is
_u
sed() override;
- void turn
O
n() override;
- void turn
O
ff() override;
+ void turn
_o
n() override;
+ void turn
_o
ff() override;
virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF).
Trace must contain boolean values. */
virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF).
Trace must contain boolean values. */
@@
-217,7
+210,7
@@
public:
virtual std::list<LinkImpl*> links();
double latency_ = {};
virtual std::list<LinkImpl*> links();
double latency_ = {};
- double lat
C
urrent_ = {};
+ double lat
_c
urrent_ = {};
double weight_ = {};
double rate_ = {};
};
double weight_ = {};
double rate_ = {};
};