X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a21681e5aca1a37efb2e9001e5055dec94c5de41..ec4e2d87d99b8ad76c9096033eb858e9052b09fa:/src/surf/network_constant.cpp

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 6934835d78..0d90ff7148 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,11 +1,20 @@
+/* Copyright (c) 2013-2015. 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_constant.hpp"
 #include "surf/random_mgr.h"
 
+#include "host_interface.hpp"
+
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 static int host_number_int = 0;
 
-static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) {
-  host_number_int++;
+static void netcste_parse_nolink(sg_platf_link_cbarg_t link){
+	xbt_die("There is no link in the Constant network model. "
+			"Please remove any link from your platform (and switch to routing='None')");
 }
 
 /*********
@@ -14,29 +23,33 @@ static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) {
 void surf_network_model_init_Constant()
 {
   xbt_assert(surf_network_model == NULL);
-  surf_network_model = new NetworkConstantModel();
+  surf_network_model = new simgrid::surf::NetworkConstantModel();
+
+  routing_model_create(NULL);
 
-  sg_platf_host_add_cb(netcste_count_hosts);
+  simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host*) {
+    host_number_int++;
+  });
+  sg_platf_link_add_cb(netcste_parse_nolink);
 
-  ModelPtr model = static_cast<ModelPtr>(surf_network_model);
-  xbt_dynar_push(model_list, &model);
+  simgrid::surf::Model *model = surf_network_model;
+  xbt_dynar_push(all_existing_models, &model);
 }
 
+namespace simgrid {
+namespace surf {
+
 double NetworkConstantModel::shareResources(double /*now*/)
 {
-  NetworkConstantActionLmmPtr action = NULL;
+  NetworkConstantAction *action = NULL;
   double min = -1.0;
 
-  ActionListPtr actionSet = getRunningActionSet();
+  ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
 	 ; it != itend ; ++it) {
-	action = dynamic_cast<NetworkConstantActionLmmPtr>(&*it);
-    if (action->m_latency > 0) {
-      if (min < 0)
-        min = action->m_latency;
-      else if (action->m_latency < min)
-        min = action->m_latency;
-    }
+	action = static_cast<NetworkConstantAction*>(&*it);
+        if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
+            min = action->m_latency;
   }
 
   return min;
@@ -44,15 +57,15 @@ double NetworkConstantModel::shareResources(double /*now*/)
 
 void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 {
-  NetworkConstantActionLmmPtr action = NULL;
-  ActionListPtr actionSet = getRunningActionSet();
+  NetworkConstantAction *action = NULL;
+  ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
      ; it != itend ; it=itNext) {
     ++itNext;
-	action = dynamic_cast<NetworkConstantActionLmmPtr>(&*it);
+	action = static_cast<NetworkConstantAction*>(&*it);
     if (action->m_latency > 0) {
       if (action->m_latency > delta) {
-        double_update(&(action->m_latency), delta);
+        double_update(&(action->m_latency), delta, sg_surf_precision);
       } else {
         action->m_latency = 0.0;
       }
@@ -61,7 +74,7 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
     if (action->getMaxDuration() != NO_MAX_DURATION)
       action->updateMaxDuration(delta);
 
-    if (action->getRemains() <= 0) {
+    if (action->getRemainsNoUpdate() <= 0) {
       action->finish();
       action->setState(SURF_ACTION_DONE);
     } else if ((action->getMaxDuration() != NO_MAX_DURATION)
@@ -72,60 +85,29 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
   }
 }
 
-ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
 		                         double size, double rate)
 {
-  char *src_name = src->p_name;
-  char *dst_name = dst->p_name;
+  char *src_name = src->getName();
+  char *dst_name = dst->getName();
 
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
-  NetworkConstantActionLmmPtr action = new NetworkConstantActionLmm(this, size, sg_latency_factor);
+  NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
   XBT_OUT();
 
+  networkCommunicateCallbacks(action, src, dst, size, rate);
   return action;
 }
 
-/************
- * Resource *
- ************/
-bool NetworkConstantLinkLmm::isUsed()
-{
-  return 0;
-}
-
-void NetworkConstantLinkLmm::updateState(tmgr_trace_event_t /*event_type*/,
-                                         double /*value*/, double /*time*/)
-{
-  DIE_IMPOSSIBLE;
-}
-
-double NetworkConstantLinkLmm::getBandwidth()
-{
-  DIE_IMPOSSIBLE;
-  return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
-}
-
-double NetworkConstantLinkLmm::getLatency()
-{
-  DIE_IMPOSSIBLE;
-  return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
-}
-
-bool NetworkConstantLinkLmm::isShared()
-{
-  DIE_IMPOSSIBLE;
-  return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
-}
-
 /**********
  * Action *
  **********/
 
-int NetworkConstantActionLmm::unref()
+int NetworkConstantAction::unref()
 {
   m_refcount--;
   if (!m_refcount) {
-	if (actionHook::is_linked())
+	if (action_hook.is_linked())
 	  p_stateSet->erase(p_stateSet->iterator_to(*this));
     delete this;
   return 1;
@@ -133,36 +115,31 @@ int NetworkConstantActionLmm::unref()
   return 0;
 }
 
-void NetworkConstantActionLmm::cancel()
+void NetworkConstantAction::cancel()
 {
   return;
 }
 
-#ifdef HAVE_TRACING
-void NetworkConstantActionLmm::setCategory(const char */*category*/)
+void NetworkConstantAction::setCategory(const char * /*category*/)
 {
   //ignore completely the categories in constant model, they are not traced
 }
-#endif
 
-void NetworkConstantActionLmm::suspend()
+void NetworkConstantAction::suspend()
 {
   m_suspended = true;
 }
 
-void NetworkConstantActionLmm::resume()
+void NetworkConstantAction::resume()
 {
   if (m_suspended)
 	m_suspended = false;
 }
 
-void NetworkConstantActionLmm::recycle()
-{
-  return;
-}
-
-bool NetworkConstantActionLmm::isSuspended()
+bool NetworkConstantAction::isSuspended()
 {
   return m_suspended;
 }
 
+}
+}