-/* 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 "simgrid/s4u/Link.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
#include "simgrid/simix.hpp"
+#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/log.h"
* C API *
*********/
-extern "C" {
-
const char* sg_link_name(sg_link_t link)
{
- return link->getCname();
+ return link->get_cname();
}
sg_link_t sg_link_by_name(const char* name)
{
- return simgrid::s4u::Link::byName(name);
+ return simgrid::s4u::Link::by_name(name);
}
int sg_link_is_shared(sg_link_t link)
}
int sg_link_count()
{
- return simgrid::surf::LinkImpl::linksCount();
+ return simgrid::kernel::resource::LinkImpl::linksCount();
}
sg_link_t* sg_link_list()
{
- simgrid::surf::LinkImpl** list = simgrid::surf::LinkImpl::linksList();
+ simgrid::kernel::resource::LinkImpl** list = simgrid::kernel::resource::LinkImpl::linksList();
sg_link_t* res = (sg_link_t*)list; // Use the same memory area
int size = sg_link_count();
}
void sg_link_exit()
{
- simgrid::surf::LinkImpl::linksExit();
-}
+ simgrid::kernel::resource::LinkImpl::linksExit();
}
/***********
namespace simgrid {
namespace s4u {
-Link* Link::byName(const char* name)
+Link* Link::by_name(const char* name)
{
- surf::LinkImpl* res = surf::LinkImpl::byName(name);
+ kernel::resource::LinkImpl* res = kernel::resource::LinkImpl::byName(name);
if (res == nullptr)
return nullptr;
return &res->piface_;
}
-const std::string& Link::getName() const
+const std::string& Link::get_name() const
+{
+ return this->pimpl_->get_name();
+}
+const char* Link::get_cname() const
{
- return this->pimpl_->getName();
+ return this->pimpl_->get_cname();
}
-const char* Link::getCname() const
+const char* Link::name()
{
- return this->pimpl_->getCname();
+ return get_cname();
}
bool Link::isUsed()
{
- return this->pimpl_->isUsed();
+ return this->pimpl_->is_used();
}
double Link::latency()
return this->pimpl_->sharingPolicy();
}
+double Link::getUsage()
+{
+ return this->pimpl_->get_constraint()->get_usage();
+}
+
void Link::turnOn()
{
- simgrid::simix::kernelImmediate([this]() {
- this->pimpl_->turnOn();
- });
+ simgrid::simix::kernelImmediate([this]() { this->pimpl_->turn_on(); });
}
void Link::turnOff()
{
- simgrid::simix::kernelImmediate([this]() {
- this->pimpl_->turnOff();
- });
+ simgrid::simix::kernelImmediate([this]() { this->pimpl_->turn_off(); });
}
void* Link::getData()
});
}
+const char* Link::getProperty(const char* key)
+{
+ return this->pimpl_->getProperty(key);
+}
+void Link::setProperty(std::string key, std::string value)
+{
+ simgrid::simix::kernelImmediate([this, key, value] { this->pimpl_->setProperty(key, value); });
+}
+
/*************
* Callbacks *
*************/
simgrid::xbt::signal<void(s4u::Link&)> Link::onCreation;
simgrid::xbt::signal<void(s4u::Link&)> Link::onDestruction;
simgrid::xbt::signal<void(s4u::Link&)> Link::onStateChange;
-simgrid::xbt::signal<void(surf::NetworkAction*, s4u::Host* src, s4u::Host* dst)> Link::onCommunicate;
-simgrid::xbt::signal<void(surf::NetworkAction*)> Link::onCommunicationStateChange;
+simgrid::xbt::signal<void(kernel::resource::NetworkAction*, s4u::Host* src, s4u::Host* dst)> Link::onCommunicate;
+simgrid::xbt::signal<void(kernel::resource::NetworkAction*)> Link::onCommunicationStateChange;
}
}