X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93c8beeb914dc3624c3818b21f17567345b4d36c..e3f5ca3fd3726e67046afbd03e48e9cd7294b835:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index a7767aaf60..63f13561a8 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,58 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
                                 "Logging specific to the SURF network module");
 
-NetworkModelPtr surf_network_model = NULL;
+/*************
+ * Callbacks *
+ *************/
 
-xbt_dynar_t NetworkModel::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst)
-{
-  xbt_dynar_t route = NULL;
-  routing_platf->getRouteAndLatency(src, dst, &route, NULL);
-  return route;
+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, 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->createNetworkLink(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->createNetworkLink(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->createNetworkLink(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,9 +77,65 @@ double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /
   return rate;
 }
 
-bool NetworkLinkLmm::isUsed()
+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)
+: Resource(model, name, props)
+, p_latEvent(NULL)
+{
+  surf_callback_emit(networkLinkCreatedCallbacks, this);
+}
+
+NetworkLink::NetworkLink(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, this);
+}
+
+NetworkLink::~NetworkLink()
 {
-  return lmm_constraint_used(p_model->p_maxminSystem, p_constraint);
+  surf_callback_emit(networkLinkDestructedCallbacks, this);
+}
+
+bool NetworkLink::isUsed()
+{
+  return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
 }
 
 double NetworkLink::getLatency()
@@ -44,14 +143,30 @@ double NetworkLink::getLatency()
   return m_latCurrent;
 }
 
-double NetworkLinkLmm::getBandwidth()
+double NetworkLink::getBandwidth()
 {
   return p_power.peak * p_power.scale;
 }
 
-bool NetworkLinkLmm::isShared()
+bool NetworkLink::isShared()
 {
-  return lmm_constraint_is_shared(p_constraint);
+  return lmm_constraint_is_shared(getConstraint());
+}
+
+void NetworkLink::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_ */