-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module");
-/*********
- * C API *
- *********/
-
-extern "C" {
+namespace simgrid {
+ namespace surf {
- const char* sg_link_name(Link *link) {
- return link->getName();
- }
- Link * sg_link_by_name(const char* name) {
- return Link::byName(name);
- }
+ /* List of links */
+ std::unordered_map<std::string, LinkImpl*>* LinkImpl::links = new std::unordered_map<std::string, LinkImpl*>();
- int sg_link_is_shared(Link *link){
- return link->sharingPolicy();
- }
- double sg_link_bandwidth(Link *link){
- return link->getBandwidth();
- }
- double sg_link_latency(Link *link){
- return link->getLatency();
- }
- void* sg_link_data(Link *link) {
- return link->getData();
- }
- void sg_link_data_set(Link *link,void *data) {
- link->setData(data);
- }
- int sg_link_count(void) {
- return Link::linksCount();
+ LinkImpl* LinkImpl::byName(std::string name)
+ {
+ auto link = links->find(name);
+ return link == links->end() ? nullptr : link->second;
}
- Link** sg_link_list(void) {
- return Link::linksList();
+ /** @brief Returns the amount of links in the platform */
+ int LinkImpl::linksCount()
+ {
+ return links->size();
}
- void sg_link_exit(void) {
- Link::linksExit();
+ void LinkImpl::linksList(std::vector<s4u::Link*>* linkList)
+ {
+ for (auto const& kv : *links) {
+ linkList->push_back(&kv.second->piface_);
+ }
}
-}
-
-/*****************
- * List of links *
- *****************/
-
-namespace simgrid {
- namespace surf {
-
- boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
- Link *Link::byName(const char* name) {
- if (links->find(name) == links->end())
- return NULL;
- return links->at(name);
- }
- /** @brief Returns the amount of links in the platform */
- int Link::linksCount() {
- return links->size();
- }
- /** @brief Returns a list of all existing links */
- Link **Link::linksList() {
- Link **res = xbt_new(Link*, (int)links->size());
- int i=0;
- for (auto kv : *links) {
- res[i++] = kv.second;
- }
- return res;
- }
- /** @brief destructor of the static data */
- void Link::linksExit() {
- for (auto kv : *links)
- (kv.second)->destroy();
- delete links;
+ /** @brief Returns a list of all existing links */
+ LinkImpl** LinkImpl::linksList()
+ {
+ LinkImpl** res = xbt_new(LinkImpl*, (int)links->size());
+ int i = 0;
+ for (auto const& kv : *links) {
+ res[i] = kv.second;
+ i++;
}
-
- /*************
- * Callbacks *
- *************/
-
- simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onCreation;
- simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onDestruction;
- simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onStateChange;
-
- simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
- simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;
-
+ return res;
}
-}
-
-void netlink_parse_init(sg_platf_link_cbarg_t link){
- std::vector<char*> names;
-
- if (link->policy == SURF_LINK_FULLDUPLEX) {
- names.push_back(bprintf("%s_UP", link->id));
- names.push_back(bprintf("%s_DOWN", link->id));
- } else {
- names.push_back(xbt_strdup(link->id));
+ /** @brief destructor of the static data */
+ void LinkImpl::linksExit()
+ {
+ for (auto const& kv : *links)
+ (kv.second)->destroy();
+ delete links;
}
- for (auto link_name : names) {
- Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties);
-
- if (link->latency_trace)
- l->setLatencyTrace(link->latency_trace);
- if (link->bandwidth_trace)
- l->setBandwidthTrace(link->bandwidth_trace);
- if (link->state_trace)
- l->setStateTrace(link->state_trace);
-
- xbt_free(link_name);
}
}
* Model *
*********/
-simgrid::surf::NetworkModel *surf_network_model = NULL;
+simgrid::surf::NetworkModel *surf_network_model = nullptr;
namespace simgrid {
namespace surf {
+ NetworkModel::~NetworkModel() = default;
+
double NetworkModel::latencyFactor(double /*size*/) {
return sg_latency_factor;
}
return rate;
}
- double NetworkModel::next_occuring_event_full(double now)
+ double NetworkModel::nextOccuringEventFull(double now)
{
- NetworkAction *action = NULL;
- ActionList *runningActions = surf_network_model->getRunningActionSet();
- double minRes;
-
- minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve);
-
- for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
- ; it != itend ; ++it) {
- action = static_cast<NetworkAction*>(&*it);
- if (action->m_latency > 0) {
- minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency);
- }
+ double minRes = Model::nextOccuringEventFull(now);
+
+ for (Action const& action : *getRunningActionSet()) {
+ 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_);
}
XBT_DEBUG("Min of share resources %f", minRes);
* Resource *
************/
- Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props)
- : Resource(model, name),
- PropertyHolder(props)
+ LinkImpl::LinkImpl(simgrid::surf::NetworkModel* model, const std::string& name, kernel::lmm::Constraint* constraint)
+ : Resource(model, name, constraint), piface_(this)
{
- links->insert({name, this});
- m_latency.scale = 1;
- m_bandwidth.scale = 1;
- XBT_DEBUG("Create link '%s'",name);
- }
+ if (name != "__loopback__")
+ xbt_assert(not LinkImpl::byName(name), "Link '%s' declared several times in the platform.", name.c_str());
- Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint)
- : Resource(model, name, constraint),
- PropertyHolder(props)
- {
- m_latency.scale = 1;
- m_bandwidth.scale = 1;
+ latency_.scale = 1;
+ bandwidth_.scale = 1;
links->insert({name, this});
- XBT_DEBUG("Create link '%s'",name);
-
+ XBT_DEBUG("Create link '%s'", name.c_str());
}
/** @brief use destroy() instead of this destructor */
- Link::~Link() {
+ LinkImpl::~LinkImpl()
+ {
xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead.");
}
- /** @brief Fire the require callbacks and destroy the object
+ /** @brief Fire the required callbacks and destroy the object
*
- * Don't delete directly an Link, call l->destroy() instead.
+ * Don't delete directly a Link, call l->destroy() instead.
*/
- void Link::destroy()
+ void LinkImpl::destroy()
{
- if (!currentlyDestroying_) {
+ if (not currentlyDestroying_) {
currentlyDestroying_ = true;
- onDestruction(this);
+ s4u::Link::onDestruction(this->piface_);
delete this;
}
}
- bool Link::isUsed()
+ bool LinkImpl::isUsed()
{
- return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
+ return model()->getMaxminSystem()->constraint_used(constraint());
}
- double Link::getLatency()
+ double LinkImpl::latency()
{
- return m_latency.peak * m_latency.scale;
+ return latency_.peak * latency_.scale;
}
- double Link::getBandwidth()
+ double LinkImpl::bandwidth()
{
- return m_bandwidth.peak * m_bandwidth.scale;
+ return bandwidth_.peak * bandwidth_.scale;
}
- int Link::sharingPolicy()
+ int LinkImpl::sharingPolicy()
{
- return lmm_constraint_sharing_policy(getConstraint());
+ return constraint()->get_sharing_policy();
}
- void Link::turnOn(){
+ void LinkImpl::turnOn()
+ {
if (isOff()) {
Resource::turnOn();
- onStateChange(this);
+ s4u::Link::onStateChange(this->piface_);
}
}
- void Link::turnOff(){
+ void LinkImpl::turnOff()
+ {
if (isOn()) {
Resource::turnOff();
- onStateChange(this);
+ s4u::Link::onStateChange(this->piface_);
}
}
- void Link::setStateTrace(tmgr_trace_t trace) {
- xbt_assert(m_stateEvent==NULL,"Cannot set a second state trace to Link %s", getName());
- m_stateEvent = future_evt_set->add_trace(trace, 0.0, this);
+ void LinkImpl::setStateTrace(tmgr_trace_t trace)
+ {
+ xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Link %s", getCname());
+ stateEvent_ = future_evt_set->add_trace(trace, this);
}
- void Link::setBandwidthTrace(tmgr_trace_t trace)
+ void LinkImpl::setBandwidthTrace(tmgr_trace_t trace)
{
- xbt_assert(m_bandwidth.event==NULL,"Cannot set a second bandwidth trace to Link %s", getName());
- m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, this);
+ xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", getCname());
+ bandwidth_.event = future_evt_set->add_trace(trace, this);
}
- void Link::setLatencyTrace(tmgr_trace_t trace)
+ void LinkImpl::setLatencyTrace(tmgr_trace_t trace)
{
- xbt_assert(m_latency.event==NULL,"Cannot set a second latency trace to Link %s", getName());
- m_latency.event = future_evt_set->add_trace(trace, 0.0, this);
+ xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", getCname());
+ latency_.event = future_evt_set->add_trace(trace, this);
}
* Action *
**********/
- void NetworkAction::setState(e_surf_action_state_t state){
- e_surf_action_state_t old = getState();
+ void NetworkAction::setState(Action::State state)
+ {
Action::setState(state);
- networkActionStateChangedCallbacks(this, old, state);
+ s4u::Link::onCommunicationStateChange(this);
}
+ /** @brief returns a list of all Links that this action is using */
+ std::list<LinkImpl*> NetworkAction::links()
+ {
+ std::list<LinkImpl*> retlist;
+ int llen = getVariable()->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*...
+ kernel::model::Resource* resource =
+ static_cast<kernel::model::Resource*>(getVariable()->get_constraint(i)->get_id());
+ LinkImpl* link = dynamic_cast<LinkImpl*>(resource);
+ if (link != nullptr)
+ retlist.push_back(link);
+ }
+
+ return retlist;
+ }
}
}
