-/* Copyright (c) 2013-2017. 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 <algorithm>
#include "network_interface.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
#ifndef NETWORK_INTERFACE_CPP_
#define NETWORK_INTERFACE_CPP_
namespace simgrid {
namespace surf {
- NetworkModel::~NetworkModel()
- {
- delete maxminSystem_;
- delete modifiedSet_;
- }
+ NetworkModel::~NetworkModel() = default;
double NetworkModel::latencyFactor(double /*size*/) {
return sg_latency_factor;
return rate;
}
- double NetworkModel::nextOccuringEventFull(double now)
+ double NetworkModel::next_occuring_event_full(double now)
{
- double minRes = Model::nextOccuringEventFull(now);
+ double minRes = Model::next_occuring_event_full(now);
- for (Action const& action : *getRunningActionSet()) {
+ for (kernel::resource::Action const& action : *get_running_action_set()) {
const NetworkAction& net_action = static_cast<const NetworkAction&>(action);
if (net_action.latency_ > 0)
minRes = (minRes < 0) ? net_action.latency_ : std::min(minRes, net_action.latency_);
* Resource *
************/
- LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, lmm_constraint_t constraint)
+ LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint)
: Resource(model, name, constraint), piface_(this)
{
}
}
- bool LinkImpl::isUsed()
+ bool LinkImpl::is_used()
{
- return model()->getMaxminSystem()->constraint_used(constraint());
+ return model()->get_maxmin_system()->constraint_used(constraint());
}
double LinkImpl::latency()
* Action *
**********/
- void NetworkAction::setState(Action::State state)
+ void NetworkAction::set_state(Action::State state)
{
- Action::setState(state);
+ Action::set_state(state);
s4u::Link::onCommunicationStateChange(this);
}
std::list<LinkImpl*> NetworkAction::links()
{
std::list<LinkImpl*> retlist;
- int llen = getVariable()->get_number_of_constraint();
+ int llen = get_variable()->get_number_of_constraint();
for (int i = 0; i < llen; i++) {
/* Beware of composite actions: ptasks put links and cpus together */
// extra pb: we cannot dynamic_cast from void*...
- Resource* resource = static_cast<Resource*>(getVariable()->get_constraint(i)->get_id());
+ kernel::resource::Resource* resource =
+ static_cast<kernel::resource::Resource*>(get_variable()->get_constraint(i)->get_id());
LinkImpl* link = dynamic_cast<LinkImpl*>(resource);
if (link != nullptr)
retlist.push_back(link);