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
Wifi model interface:
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
19e985e
..
dc1ec58
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-4,6
+4,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "ptask_L07.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "ptask_L07.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
@@
-56,7
+57,8
@@
NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys)
: NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
{
set_maxmin_system(sys);
: NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel)
{
set_maxmin_system(sys);
- loopback_ = NetworkL07Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
+ loopback_ = NetworkL07Model::create_link("__loopback__", std::vector<double>(1, 498000000), 0.000015,
+ s4u::Link::SharingPolicy::FATPIPE);
}
NetworkL07Model::~NetworkL07Model()
}
NetworkL07Model::~NetworkL07Model()
@@
-92,7
+94,7
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
}
if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) {
action.updateBound();
}
if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) {
action.updateBound();
- get_maxmin_system()->update_variable_
weight
(action.get_variable(), 1.0);
+ get_maxmin_system()->update_variable_
penalty
(action.get_variable(), 1.0);
action.set_last_update();
}
}
action.set_last_update();
}
}
@@
-109,7
+111,7
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
* If it's not done, it may have failed.
*/
* If it's not done, it may have failed.
*/
- if (((action.get_remains() <= 0) && (action.get_variable()->get_
weight
() > 0)) ||
+ if (((action.get_remains() <= 0) && (action.get_variable()->get_
penalty
() > 0)) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(kernel::resource::Action::State::FINISHED);
continue;
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(kernel::resource::Action::State::FINISHED);
continue;
@@
-120,8
+122,8
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
while (cnst != nullptr) {
i++;
kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
while (cnst != nullptr) {
i++;
-
void
* constraint_id = cnst->get_id();
- if (not
static_cast<simgrid::kernel::resource::Resource*>(constraint_id)
->is_on()) {
+
kernel::resource::Resource
* constraint_id = cnst->get_id();
+ if (not
constraint_id
->is_on()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::FAILED);
break;
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::FAILED);
break;
@@
-131,9
+133,9
@@
void HostL07Model::update_actions_state(double /*now*/, double delta)
}
}
}
}
-kernel::resource::Action* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list,
- const double* flops_amount, const double* bytes_amount,
- double rate)
+kernel::resource::
Cpu
Action* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& host_list,
+
const double* flops_amount, const double* bytes_amount,
+
double rate)
{
return new L07Action(this, host_list, flops_amount, bytes_amount, rate);
}
{
return new L07Action(this, host_list, flops_amount, bytes_amount, rate);
}
@@
-179,7
+181,7
@@
L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host
model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_list.size() + link_nb));
if (latency_ > 0)
model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_list.size() + link_nb));
if (latency_ > 0)
- model->get_maxmin_system()->update_variable_
weight
(get_variable(), 0.0);
+ model->get_maxmin_system()->update_variable_
penalty
(get_variable(), 0.0);
/* Expand it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no
* communication either */
/* Expand it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no
* communication either */
@@
-223,10
+225,11
@@
kernel::resource::Cpu* CpuL07Model::create_cpu(s4u::Host* host, const std::vecto
return new CpuL07(this, host, speed_per_pstate, core);
}
return new CpuL07(this, host, speed_per_pstate, core);
}
-kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name,
double bandwidth, double latency
,
- s4u::Link::SharingPolicy policy)
+kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name,
std::vector<double> bandwidths
,
+
double latency,
s4u::Link::SharingPolicy policy)
{
{
- return new LinkL07(this, name, bandwidth, latency, policy);
+ xbt_assert(bandwidths.size() == 1, "Non WIFI link must have only 1 bandwidth.");
+ return new LinkL07(this, name, bandwidths[0], latency, policy);
}
/************
}
/************
@@
-254,25
+257,25
@@
LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid
s4u::Link::on_creation(this->piface_);
}
s4u::Link::on_creation(this->piface_);
}
-kernel::resource::Action* CpuL07::execution_start(double size)
+kernel::resource::
Cpu
Action* CpuL07::execution_start(double size)
{
std::vector<s4u::Host*> host_list = {get_host()};
double* flops_amount = new double[host_list.size()]();
flops_amount[0] = size;
{
std::vector<s4u::Host*> host_list = {get_host()};
double* flops_amount = new double[host_list.size()]();
flops_amount[0] = size;
- kernel::resource::Action* res =
+ kernel::resource::
Cpu
Action* res =
static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
-kernel::resource::Action* CpuL07::sleep(double duration)
+kernel::resource::
Cpu
Action* CpuL07::sleep(double duration)
{
L07Action *action = static_cast<L07Action*>(execution_start(1.0));
action->set_max_duration(duration);
action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
{
L07Action *action = static_cast<L07Action*>(execution_start(1.0));
action->set_max_duration(duration);
action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
- get_model()->get_maxmin_system()->update_variable_
weight
(action->get_variable(), 0.0);
+ get_model()->get_maxmin_system()->update_variable_
penalty
(action->get_variable(), 0.0);
return action;
}
return action;
}