-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2018. 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. */
#include "network_constant.hpp"
-#include "surf/random_mgr.h"
-
-#include "host_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static int host_number_int = 0;
-
-static void netcste_parse_nolink(sg_platf_link_cbarg_t link){
- xbt_die("There is no link in the Constant network model. "
- "Please remove any link from your platform (and switch to routing='None')");
-}
/*********
* Model *
*********/
void surf_network_model_init_Constant()
{
- xbt_assert(surf_network_model == NULL);
+ xbt_assert(surf_network_model == nullptr);
surf_network_model = new simgrid::surf::NetworkConstantModel();
-
- routing_model_create(NULL);
-
- simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host*) {
- host_number_int++;
- });
- sg_platf_link_add_cb(netcste_parse_nolink);
-
- simgrid::surf::Model *model = surf_network_model;
- xbt_dynar_push(all_existing_models, &model);
+ all_existing_models->push_back(surf_network_model);
}
namespace simgrid {
namespace surf {
+LinkImpl* NetworkConstantModel::createLink(const std::string& name, double bw, double lat,
+ e_surf_link_sharing_policy_t policy)
+{
+
+ xbt_die("Refusing to create the link %s: there is no link in the Constant network model. "
+ "Please remove any link from your platform (and switch to routing='None')",
+ name.c_str());
+ return nullptr;
+}
-double NetworkConstantModel::shareResources(double /*now*/)
+double NetworkConstantModel::next_occuring_event(double /*now*/)
{
- NetworkConstantAction *action = NULL;
double min = -1.0;
-
- ActionList *actionSet = getRunningActionSet();
- for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
- ; it != itend ; ++it) {
- action = static_cast<NetworkConstantAction*>(&*it);
- if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
- min = action->m_latency;
+ for (kernel::resource::Action const& action : *get_running_action_set()) {
+ const NetworkConstantAction& net_action = static_cast<const NetworkConstantAction&>(action);
+ if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min))
+ min = net_action.latency_;
}
-
return min;
}
-void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
+void NetworkConstantModel::update_actions_state(double /*now*/, double delta)
{
- NetworkConstantAction *action = NULL;
- ActionList *actionSet = getRunningActionSet();
- for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
- ; it != itend ; it=itNext) {
- ++itNext;
- action = static_cast<NetworkConstantAction*>(&*it);
- if (action->m_latency > 0) {
- if (action->m_latency > delta) {
- double_update(&(action->m_latency), delta, sg_surf_precision);
+ for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) {
+ NetworkConstantAction& action = static_cast<NetworkConstantAction&>(*it);
+ ++it; // increment iterator here since the following calls to action.finish() may invalidate it
+ if (action.latency_ > 0) {
+ if (action.latency_ > delta) {
+ double_update(&action.latency_, delta, sg_surf_precision);
} else {
- action->m_latency = 0.0;
+ action.latency_ = 0.0;
}
}
- action->updateRemains(action->getCost() * delta / action->m_latInit);
- if (action->getMaxDuration() != NO_MAX_DURATION)
- action->updateMaxDuration(delta);
+ action.update_remains(action.get_cost() * delta / action.initialLatency_);
+ if (action.get_max_duration() != NO_MAX_DURATION)
+ action.update_max_duration(delta);
- if (action->getRemainsNoUpdate() <= 0) {
- action->finish();
- action->setState(SURF_ACTION_DONE);
- } else if ((action->getMaxDuration() != NO_MAX_DURATION)
- && (action->getMaxDuration() <= 0)) {
- action->finish();
- action->setState(SURF_ACTION_DONE);
+ if ((action.get_remains_no_update() <= 0) ||
+ ((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
+ action.finish(kernel::resource::Action::State::done);
}
}
}
-Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
- double size, double rate)
+kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
- char *src_name = src->getName();
- char *dst_name = dst->getName();
+ NetworkConstantAction* action = new NetworkConstantAction(this, size, sg_latency_factor);
- XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
- NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
- XBT_OUT();
-
- networkCommunicateCallbacks(action, src, dst, size, rate);
+ simgrid::s4u::Link::onCommunicate(action, src, dst);
return action;
}
/**********
* Action *
**********/
-
-int NetworkConstantAction::unref()
+NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency)
+ : NetworkAction(model_, size, false), initialLatency_(latency)
{
- m_refcount--;
- if (!m_refcount) {
- if (action_hook.is_linked())
- p_stateSet->erase(p_stateSet->iterator_to(*this));
- delete this;
- return 1;
- }
- return 0;
-}
+ latency_ = latency;
+ if (latency_ <= 0.0)
+ set_state(Action::State::done);
+};
-void NetworkConstantAction::cancel()
+NetworkConstantAction::~NetworkConstantAction() = default;
+
+void NetworkConstantAction::update_remains_lazy(double /*now*/)
{
- return;
+ THROW_IMPOSSIBLE;
}
-
}
}
