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
add sg_comm_unref
[simgrid.git]
/
src
/
surf
/
network_interface.hpp
diff --git
a/src/surf/network_interface.hpp
b/src/surf/network_interface.hpp
index d86a5968fd1a2d269d3b84b1320b9979342368b7..3ecd3bbd5e9f4dcab746a6000ed72e6a882e83e8 100644
(file)
--- a/
src/surf/network_interface.hpp
+++ b/
src/surf/network_interface.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-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 "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/surf/PropertyHolder.hpp"
+#include
<xbt/PropertyHolder.hpp>
#include <list>
#include <unordered_map>
#include <list>
#include <unordered_map>
@@
-48,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,
std::vector<double>
bandwidths, 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;
/**
@@
-95,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;
};
@@
-107,9
+107,9
@@
public:
* @brief SURF network link interface class
* @details A Link represents the link between two [hosts](@ref simgrid::surf::HostImpl)
*/
* @brief SURF network link interface class
* @details A Link represents the link between two [hosts](@ref simgrid::surf::HostImpl)
*/
-class LinkImpl : public Resource, public
surf
::PropertyHolder {
+class LinkImpl : public Resource, public
xbt
::PropertyHolder {
bool currently_destroying_ = false;
bool currently_destroying_ = false;
-
void* userdata_ = nullptr
;
+
s4u::Link piface_
;
protected:
LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint);
protected:
LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint);
@@
-119,11
+119,9
@@
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 */
/** @brief Public interface */
- s4u::Link
piface_;
+ s4u::Link
* get_iface() { return &piface_; }
/** @brief Get the bandwidth in bytes per second of current Link */
virtual double get_bandwidth();
/** @brief Get the bandwidth in bytes per second of current Link */
virtual double get_bandwidth();
@@
-157,9
+155,8
@@
public:
latency changes due to external load). Trace must contain
absolute values */
latency changes due to external load). Trace must contain
absolute values */
- Metric latency_ = {
1
.0, 0, nullptr};
+ Metric latency_ = {
0
.0, 0, nullptr};
Metric bandwidth_ = {1.0, 0, nullptr};
Metric bandwidth_ = {1.0, 0, nullptr};
-
};
/**********
};
/**********