#include <algorithm>
-#include "network_cm02.hpp"
#include "maxmin_private.hpp"
+#include "network_cm02.hpp"
+#include "simgrid/s4u/host.hpp"
#include "simgrid/sg_config.h"
#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
:NetworkModel()
{
char *optim = xbt_cfg_get_string("network/optim");
- int select = xbt_cfg_get_boolean("network/maxmin-selective-update");
+ bool select = xbt_cfg_get_boolean("network/maxmin-selective-update");
if (!strcmp(optim, "Full")) {
updateMechanism_ = UM_FULL;
selectiveUpdate_ = select;
} else if (!strcmp(optim, "Lazy")) {
updateMechanism_ = UM_LAZY;
- selectiveUpdate_ = 1;
- xbt_assert((select == 1) || (xbt_cfg_is_default_value("network/maxmin-selective-update")),
- "You cannot disable selective update while using the lazy update mechanism!");
+ selectiveUpdate_ = true;
+ xbt_assert(select || (xbt_cfg_is_default_value("network/maxmin-selective-update")),
+ "You cannot disable selective update when using the lazy update mechanism");
} else {
xbt_die("Unsupported optimization (%s) for this model. Accepted: Full, Lazy.", optim);
}
- if (!maxminSystem_)
- maxminSystem_ = lmm_system_new(selectiveUpdate_);
+ maxminSystem_ = lmm_system_new(selectiveUpdate_);
routing_model_create(createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, nullptr));
}
}
-Action *NetworkCm02Model::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst,
- double size, double rate)
+Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
int failed = 0;
double bandwidth_bound;
std::vector<Link*> *route = new std::vector<Link*>();
- XBT_IN("(%s,%s,%g,%g)", src->name(), dst->name(), size, rate);
+ XBT_IN("(%s,%s,%g,%g)", src->name().c_str(), dst->name().c_str(), size, rate);
- routing_platf->getRouteAndLatency(src, dst, route, &latency);
- xbt_assert(! route->empty() || latency,
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, &latency);
+ xbt_assert(!route->empty() || latency,
"You're trying to send data from %s to %s but there is no connecting path between these two hosts.",
- src->name(), dst->name());
+ src->name().c_str(), dst->name().c_str());
for (auto link: *route)
if (link->isOff())
if (sg_network_crosstraffic == 1) {
back_route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency(dst, src, back_route, nullptr);
+ routing_platf->getRouteAndLatency(dst->pimpl_netcard, src->pimpl_netcard, back_route, nullptr);
for (auto link: *back_route)
if (link->isOff())
failed = 1;
"Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!");
gapAppend(size, route->at(0), action);
- XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->name(), dst->name(), action->senderGap_, action->latency_);
+ XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->name().c_str(), dst->name().c_str(), action->senderGap_,
+ action->latency_);
}
constraints_per_variable = route->size();
return action;
}
-bool NetworkCm02Model::next_occuring_event_isIdempotent()
-{
- return true;
-}
-
void NetworkCm02Model::gapAppend(double size, const Link* link, NetworkAction* action)
{
// Nothing