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
Fix misspelling of "occurring".
[simgrid.git]
/
src
/
surf
/
network_interface.hpp
diff --git
a/src/surf/network_interface.hpp
b/src/surf/network_interface.hpp
index
a83d5e5
..
8d38ef6
100644
(file)
--- a/
src/surf/network_interface.hpp
+++ b/
src/surf/network_interface.hpp
@@
-10,7
+10,6
@@
#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Link.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Link.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "src/kernel/resource/profile/trace_mgr.hpp"
#include "src/surf/PropertyHolder.hpp"
#include <list>
#include "src/surf/PropertyHolder.hpp"
#include <list>
@@
-49,7
+48,7
@@
public:
* @param latency The initial latency of the Link in seconds
* @param policy The sharing policy of the Link
*/
* @param latency The initial latency of the Link in seconds
* @param policy The sharing policy of the Link
*/
- virtual LinkImpl* create_link(const std::string& name,
double bandwidth
, double latency,
+ virtual LinkImpl* create_link(const std::string& name,
const std::vector<double>& bandwidths
, double latency,
s4u::Link::SharingPolicy policy) = 0;
/**
s4u::Link::SharingPolicy policy) = 0;
/**
@@
-96,7
+95,7
@@
public:
* @return The new bandwidth.
*/
virtual double get_bandwidth_constraint(double rate, double bound, double size);
* @return The new bandwidth.
*/
virtual double get_bandwidth_constraint(double rate, double bound, double size);
- double next_occuring_event_full(double now) override;
+ double next_occur
r
ing_event_full(double now) override;
LinkImpl* loopback_ = nullptr;
};
LinkImpl* loopback_ = nullptr;
};
@@
-110,7
+109,6
@@
public:
*/
class LinkImpl : public Resource, public surf::PropertyHolder {
bool currently_destroying_ = false;
*/
class LinkImpl : public Resource, public surf::PropertyHolder {
bool currently_destroying_ = false;
- void* userdata_ = nullptr;
protected:
LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint);
protected:
LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint);
@@
-120,8
+118,6
@@
protected:
public:
void destroy(); // Must be called instead of the destructor
public:
void destroy(); // Must be called instead of the destructor
- void* get_data() { return userdata_; }
- void set_data(void* d) { userdata_ = d; }
/** @brief Public interface */
s4u::Link piface_;
/** @brief Public interface */
s4u::Link piface_;
@@
-195,7
+191,7
@@
public:
double latency_ = {};
double lat_current_ = {};
double latency_ = {};
double lat_current_ = {};
- double
weight_
= {};
+ double
sharing_penalty_
= {};
double rate_ = {};
};
} // namespace resource
double rate_ = {};
};
} // namespace resource