X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad2e588c6af6cf84b18ba7c1c96f4f9785d93c28..3ab2d168b83c76035668c9ab051ceca8eaf27f3b:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index bb53714d07..ff1a603401 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -1,9 +1,9 @@
-/*
- * network_interface.cpp
- *
- *  Created on: Nov 29, 2013
- *      Author: bedaride
- */
+/* Copyright (c) 2013-2014. 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 "network_interface.hpp"
 #include "simgrid/sg_config.h"
 
@@ -13,15 +13,83 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
                                 "Logging specific to the SURF network module");
 
-NetworkModelPtr surf_network_model = NULL;
+/*********
+ * 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);
+}
 
-xbt_dynar_t NetworkModel::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst)
-{
-  xbt_dynar_t route = NULL;
-  routing_platf->getRouteAndLatency(src, dst, &route, NULL);
-  return route;
+SG_END_DECL()
+
+/*************
+ * 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, 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;
+
+void netlink_parse_init(sg_platf_link_cbarg_t link){
+  if (link->policy == SURF_LINK_FULLDUPLEX) {
+    char *link_id;
+    link_id = bprintf("%s_UP", link->id);
+    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);
+    xbt_free(link_id);
+    link_id = bprintf("%s_DOWN", link->id);
+    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);
+    xbt_free(link_id);
+  } else {
+	  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);
+  }
 }
 
+void net_add_traces(){
+  surf_network_model->addTraces();
+}
+
+/*********
+ * Model *
+ *********/
+
+NetworkModelPtr surf_network_model = NULL;
+
 double NetworkModel::latencyFactor(double /*size*/) {
   return sg_latency_factor;
 }
@@ -34,40 +102,96 @@ double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /
   return rate;
 }
 
-NetworkLink::NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props)
+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 *
+ ************/
+
+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)
 : Resource(model, name, props, constraint),
   p_latEvent(NULL)
 {
+  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);
 }
 
-bool NetworkLink::isUsed()
+Link::~Link()
+{
+  surf_callback_emit(networkLinkDestructedCallbacks, this);
+}
+
+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 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);
+}
+
+/**********
+ * 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);
+}
+
 #endif /* NETWORK_INTERFACE_CPP_ */