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
snake case another plugin
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
22b73e9
..
bea3d7c
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-43,7
+43,7
@@
HostL07Model::~HostL07Model()
}
CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
}
CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
- : CpuModel(Model::UpdateAlgo::F
ull
), hostModel_(hmodel)
+ : CpuModel(Model::UpdateAlgo::F
ULL
), hostModel_(hmodel)
{
set_maxmin_system(sys);
}
{
set_maxmin_system(sys);
}
@@
-54,7
+54,7
@@
CpuL07Model::~CpuL07Model()
}
NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
}
NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
- : NetworkModel(Model::UpdateAlgo::F
ull
), hostModel_(hmodel)
+ : NetworkModel(Model::UpdateAlgo::F
ULL
), hostModel_(hmodel)
{
set_maxmin_system(sys);
loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
{
set_maxmin_system(sys);
loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
@@
-165,7
+165,7
@@
L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos
double lat=0.0;
std::vector<kernel::resource::LinkImpl*> route;
double lat=0.0;
std::vector<kernel::resource::LinkImpl*> route;
- hostList_->at(i)->route
T
o(hostList_->at(j), route, &lat);
+ hostList_->at(i)->route
_t
o(hostList_->at(j), route, &lat);
latency = std::max(latency, lat);
for (auto const& link : route)
latency = std::max(latency, lat);
for (auto const& link : route)
@@
-193,7
+193,7
@@
L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos
for (int j = 0; j < host_nb; j++) {
if (bytes_amount[i * host_nb + j] > 0.0) {
std::vector<kernel::resource::LinkImpl*> route;
for (int j = 0; j < host_nb; j++) {
if (bytes_amount[i * host_nb + j] > 0.0) {
std::vector<kernel::resource::LinkImpl*> route;
- hostList_->at(i)->route
T
o(hostList_->at(j), route, nullptr);
+ hostList_->at(i)->route
_t
o(hostList_->at(j), route, nullptr);
for (auto const& link : route)
model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(),
for (auto const& link : route)
model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(),
@@
-330,26
+330,26
@@
void LinkL07::apply_event(tmgr_trace_event_t triggered, double value)
{
XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value);
if (triggered == bandwidth_.event) {
{
XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value);
if (triggered == bandwidth_.event) {
- set
B
andwidth(value);
+ set
_b
andwidth(value);
tmgr_trace_event_unref(&bandwidth_.event);
} else if (triggered == latency_.event) {
tmgr_trace_event_unref(&bandwidth_.event);
} else if (triggered == latency_.event) {
- set
L
atency(value);
+ set
_l
atency(value);
tmgr_trace_event_unref(&latency_.event);
tmgr_trace_event_unref(&latency_.event);
- } else if (triggered == state
E
vent_) {
+ } else if (triggered == state
_e
vent_) {
if (value > 0)
turn_on();
else
turn_off();
if (value > 0)
turn_on();
else
turn_off();
- tmgr_trace_event_unref(&state
E
vent_);
+ tmgr_trace_event_unref(&state
_e
vent_);
} else {
xbt_die("Unknown event ! \n");
}
}
} else {
xbt_die("Unknown event ! \n");
}
}
-void LinkL07::set
B
andwidth(double value)
+void LinkL07::set
_b
andwidth(double value)
{
bandwidth_.peak = value;
LinkImpl::on_bandwidth_change();
{
bandwidth_.peak = value;
LinkImpl::on_bandwidth_change();
@@
-357,7
+357,7
@@
void LinkL07::setBandwidth(double value)
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale);
}
get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale);
}
-void LinkL07::set
L
atency(double value)
+void LinkL07::set
_l
atency(double value)
{
kernel::lmm::Variable* var = nullptr;
L07Action *action;
{
kernel::lmm::Variable* var = nullptr;
L07Action *action;
@@
-394,7
+394,7
@@
void L07Action::updateBound()
if (communicationAmount_[i * hostNb + j] > 0) {
double lat = 0.0;
std::vector<kernel::resource::LinkImpl*> route;
if (communicationAmount_[i * hostNb + j] > 0) {
double lat = 0.0;
std::vector<kernel::resource::LinkImpl*> route;
- hostList_->at(i)->route
T
o(hostList_->at(j), route, &lat);
+ hostList_->at(i)->route
_t
o(hostList_->at(j), route, &lat);
lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]);
}
lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]);
}