XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
"Logging specific to the SURF network module");
+/*********
+ * C API *
+ *********/
+SG_BEGIN_DECL()
+int sg_link_is_shared(Link *link){
+ return link->isShared();
+}
+double sg_link_bandwidth(Link *link){
+ return link->getBandwidth();
+}
+double sg_link_latency(Link *link){
+ return link->getLatency();
+}
+const char* sg_link_name(Link *link) {
+ return link->getName();
+}
+void* sg_link_data(Link *link) {
+ return link->getData();
+}
+void sg_link_data_set(Link *link,void *data) {
+ link->setData(data);
+}
+
+SG_END_DECL()
+
/*************
* Callbacks *
*************/
-surf_callback(void, NetworkLinkPtr) networkLinkCreatedCallbacks;
-surf_callback(void, NetworkLinkPtr) networkLinkDestructedCallbacks;
-surf_callback(void, NetworkLinkPtr, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks;
+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, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks;
surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate) networkCommunicateCallbacks;
if (link->policy == SURF_LINK_FULLDUPLEX) {
char *link_id;
link_id = bprintf("%s_UP", link->id);
- surf_network_model->createNetworkLink(link_id,
+ surf_network_model->createLink(link_id,
link->bandwidth,
link->bandwidth_trace,
link->latency,
link->state_trace, link->policy, link->properties);
xbt_free(link_id);
link_id = bprintf("%s_DOWN", link->id);
- surf_network_model->createNetworkLink(link_id,
+ surf_network_model->createLink(link_id,
link->bandwidth,
link->bandwidth_trace,
link->latency,
link->state_trace, link->policy, link->properties);
xbt_free(link_id);
} else {
- surf_network_model->createNetworkLink(link->id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- link->state,
- link->state_trace, link->policy, link->properties);
+ surf_network_model->createLink(link->id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace, link->policy, link->properties);
}
}
return rate;
}
+double NetworkModel::shareResourcesFull(double now)
+{
+ NetworkActionPtr action = NULL;
+ ActionListPtr runningActions = surf_network_model->getRunningActionSet();
+ double minRes;
+
+ minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve);
+
+ for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
+ ; it != itend ; ++it) {
+ action = static_cast<NetworkActionPtr>(&*it);
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+ if (lmm_is_variable_limited_by_latency(action->getVariable())) {
+ action->m_latencyLimited = 1;
+ } else {
+ action->m_latencyLimited = 0;
+ }
+#endif
+ if (action->m_latency > 0) {
+ minRes = (minRes < 0) ? action->m_latency : min(minRes, action->m_latency);
+ }
+ }
+
+ XBT_DEBUG("Min of share resources %f", minRes);
+
+ return minRes;
+}
+
/************
* Resource *
************/
-NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props)
+Link::Link(NetworkModelPtr model, const char *name, xbt_dict_t props)
: Resource(model, name, props)
, p_latEvent(NULL)
{
surf_callback_emit(networkLinkCreatedCallbacks, this);
}
-NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props,
+Link::Link(NetworkModelPtr model, const char *name, xbt_dict_t props,
lmm_constraint_t constraint,
tmgr_history_t history,
tmgr_trace_t state_trace)
{
surf_callback_emit(networkLinkCreatedCallbacks, this);
if (state_trace)
- p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast<ResourcePtr>(this));
+ p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this);
}
-NetworkLink::~NetworkLink()
+Link::~Link()
{
surf_callback_emit(networkLinkDestructedCallbacks, this);
}
-bool NetworkLink::isUsed()
+bool Link::isUsed()
{
return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
}
-double NetworkLink::getLatency()
+double Link::getLatency()
{
return m_latCurrent;
}
-double NetworkLink::getBandwidth()
+double Link::getBandwidth()
{
return p_power.peak * p_power.scale;
}
-bool NetworkLink::isShared()
+bool Link::isShared()
{
return lmm_constraint_is_shared(getConstraint());
}
-void NetworkLink::setState(e_surf_resource_state_t state){
+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);