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
vm->destroy is not at kernel level ...
[simgrid.git]
/
src
/
surf
/
network_interface.hpp
diff --git
a/src/surf/network_interface.hpp
b/src/surf/network_interface.hpp
index
01a2372
..
d4ab529
100644
(file)
--- a/
src/surf/network_interface.hpp
+++ b/
src/surf/network_interface.hpp
@@
-7,6
+7,7
@@
#define SURF_NETWORK_INTERFACE_HPP_
#include "simgrid/s4u/Link.hpp"
#define SURF_NETWORK_INTERFACE_HPP_
#include "simgrid/s4u/Link.hpp"
+#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/PropertyHolder.hpp"
#include "src/surf/surf_interface.hpp"
#include "xbt/base.h"
#include "src/surf/PropertyHolder.hpp"
#include "src/surf/surf_interface.hpp"
#include "xbt/base.h"
@@
-43,7
+44,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* createLink(const
char*
name, double bandwidth, double latency,
+ virtual LinkImpl* createLink(const
std::string&
name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy) = 0;
/**
e_surf_link_sharing_policy_t policy) = 0;
/**
@@
-64,7
+65,7
@@
public:
*
* @param system The lmm_system_t to solve
*/
*
* @param system The lmm_system_t to solve
*/
- void (*f_networkSolve)(lmm_system_t) = lmm_solve;
+ void (*f_networkSolve)(lmm_system_t) =
simgrid::kernel::lmm::
lmm_solve;
/**
* @brief Get the right multiplicative factor for the latency.
/**
* @brief Get the right multiplicative factor for the latency.
@@
-114,7
+115,7
@@
public:
*/
class LinkImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
protected:
*/
class LinkImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
protected:
- LinkImpl(simgrid::surf::NetworkModel* model, const
char*
name, lmm_constraint_t constraint);
+ LinkImpl(simgrid::surf::NetworkModel* model, const
std::string&
name, lmm_constraint_t constraint);
~LinkImpl() override;
public:
~LinkImpl() override;
public:
@@
-171,9
+172,10
@@
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 int linksCount();
static LinkImpl** linksList();
+ static void linksList(std::vector<s4u::Link*>* linkList);
static void linksExit();
};
static void linksExit();
};
@@
-206,12
+208,12
@@
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 weight_;
- double rate_;
+ double latency_
= {}
;
+ double latCurrent_
= {}
;
+ double weight_
= {}
;
+ double rate_
= {}
;
};
}
}
};
}
}