/* 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"
/*********
* C API *
*********/
-SG_BEGIN_DECL()
+
+extern "C" {
+
const char* sg_link_name(Link *link) {
return link->getName();
}
}
int sg_link_is_shared(Link *link){
- return link->isShared();
+ return link->sharingPolicy();
}
double sg_link_bandwidth(Link *link){
return link->getBandwidth();
void sg_link_exit(void) {
Link::linksExit();
}
-SG_END_DECL()
+
+}
+
/*****************
* 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) {
Link * res = NULL;
/** @brief destructor of the static data */
void Link::linksExit() {
for (auto kv : *links)
- delete (kv.second);
+ (kv.second)->destroy();
+ delete links;
}
+
/*************
* Callbacks *
*************/
-surf_callback(void, Link*) networkLinkCreatedCallbacks;
-surf_callback(void, Link*) networkLinkDestructedCallbacks;
-surf_callback(void, Link*, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks;
-surf_callback(void, NetworkAction*, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks;
-surf_callback(void, NetworkAction*, RoutingEdge *src, RoutingEdge *dst, double size, double rate) networkCommunicateCallbacks;
+simgrid::surf::signal<void(simgrid::surf::Link*)> Link::onCreation;
+simgrid::surf::signal<void(simgrid::surf::Link*)> Link::onDestruction;
+simgrid::surf::signal<void(simgrid::surf::Link*, int, int)> Link::onStateChange; // signature: wasOn, currentlyOn
+
+simgrid::surf::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;
+
+}
+}
void netlink_parse_init(sg_platf_link_cbarg_t link){
if (link->policy == SURF_LINK_FULLDUPLEX) {
link->bandwidth_trace,
link->latency,
link->latency_trace,
- link->state,
+ link->initiallyOn,
link->state_trace, link->policy, link->properties);
xbt_free(link_id);
link_id = bprintf("%s_DOWN", link->id);
link->bandwidth_trace,
link->latency,
link->latency_trace,
- link->state,
+ link->initiallyOn,
link->state_trace, link->policy, link->properties);
xbt_free(link_id);
} else {
link->bandwidth_trace,
link->latency,
link->latency_trace,
- link->state,
+ link->initiallyOn,
link->state_trace, link->policy, link->properties);
}
}
* Model *
*********/
-NetworkModel *surf_network_model = NULL;
+simgrid::surf::NetworkModel *surf_network_model = NULL;
+
+namespace simgrid {
+namespace surf {
double NetworkModel::latencyFactor(double /*size*/) {
return sg_latency_factor;
}
#endif
if (action->m_latency > 0) {
- minRes = (minRes < 0) ? action->m_latency : min(minRes, action->m_latency);
+ minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency);
}
}
* Resource *
************/
-Link::Link(NetworkModel *model, const char *name, xbt_dict_t props)
-: Resource(model, name, props)
-, p_latEvent(NULL)
+Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props)
+: Resource(model, name),
+ PropertyHolder(props)
{
- surf_callback_emit(networkLinkCreatedCallbacks, this);
links->insert({name, this});
XBT_DEBUG("Create link '%s'",name);
}
-Link::Link(NetworkModel *model, const char *name, xbt_dict_t props,
+Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props,
lmm_constraint_t constraint,
tmgr_history_t history,
tmgr_trace_t state_trace)
-: Resource(model, name, props, constraint),
- p_latEvent(NULL)
+: Resource(model, name, constraint),
+ PropertyHolder(props)
{
- surf_callback_emit(networkLinkCreatedCallbacks, this);
if (state_trace)
p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this);
}
-Link::~Link()
+/** @brief use destroy() instead of this destructor */
+Link::~Link() {
+ xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead.");
+}
+/** @brief Fire the require callbacks and destroy the object
+ *
+ * Don't delete directly an Link, call l->destroy() instead.
+ */
+void Link::destroy()
{
- surf_callback_emit(networkLinkDestructedCallbacks, this);
+ if (!currentlyDestroying_) {
+ currentlyDestroying_ = true;
+ onDestruction(this);
+ delete this;
+ }
}
bool Link::isUsed()
double Link::getBandwidth()
{
- return p_power.peak * p_power.scale;
+ return p_speed.peak * p_speed.scale;
}
-bool Link::isShared()
+int Link::sharingPolicy()
{
- return lmm_constraint_is_shared(getConstraint());
+ return lmm_constraint_sharing_policy(getConstraint());
}
-void Link::setState(e_surf_resource_state_t state){
- e_surf_resource_state_t old = Resource::getState();
- Resource::setState(state);
- surf_callback_emit(networkLinkStateChangedCallbacks, this, old, state);
+void Link::turnOn(){
+ if (isOff()) {
+ Resource::turnOn();
+ onStateChange(this, 0, 1);
+ }
+}
+void Link::turnOff(){
+ if (isOn()) {
+ Resource::turnOff();
+ onStateChange(this, 1, 0);
+ }
}
-
-
/**********
* Action *
void NetworkAction::setState(e_surf_action_state_t state){
e_surf_action_state_t old = getState();
Action::setState(state);
- surf_callback_emit(networkActionStateChangedCallbacks, this, old, state);
+ networkActionStateChangedCallbacks(this, old, state);
+}
+
+}
}
#endif /* NETWORK_INTERFACE_CPP_ */