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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 6934835d78..1f17a2c0f3 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -1,3 +1,9 @@
+/* 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_constant.hpp"
 #include "surf/random_mgr.h"
 
@@ -18,25 +24,21 @@ void surf_network_model_init_Constant()
 
   sg_platf_host_add_cb(netcste_count_hosts);
 
-  ModelPtr model = static_cast<ModelPtr>(surf_network_model);
+  ModelPtr model = surf_network_model;
   xbt_dynar_push(model_list, &model);
 }
 
 double NetworkConstantModel::shareResources(double /*now*/)
 {
-  NetworkConstantActionLmmPtr action = NULL;
+  NetworkConstantActionPtr action = NULL;
   double min = -1.0;
 
   ActionListPtr 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<NetworkConstantActionPtr>(&*it);
+        if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
+            min = action->m_latency;
   }
 
   return min;
@@ -44,15 +46,15 @@ double NetworkConstantModel::shareResources(double /*now*/)
 
 void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 {
-  NetworkConstantActionLmmPtr action = NULL;
+  NetworkConstantActionPtr action = NULL;
   ActionListPtr 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<NetworkConstantActionPtr>(&*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 +63,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)
@@ -75,43 +77,44 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr 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);
+  NetworkConstantActionPtr action = new NetworkConstantAction(this, size, sg_latency_factor);
   XBT_OUT();
 
+  surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate);
   return action;
 }
 
 /************
  * Resource *
  ************/
-bool NetworkConstantLinkLmm::isUsed()
+bool NetworkConstantLink::isUsed()
 {
   return 0;
 }
 
-void NetworkConstantLinkLmm::updateState(tmgr_trace_event_t /*event_type*/,
+void NetworkConstantLink::updateState(tmgr_trace_event_t /*event_type*/,
                                          double /*value*/, double /*time*/)
 {
   DIE_IMPOSSIBLE;
 }
 
-double NetworkConstantLinkLmm::getBandwidth()
+double NetworkConstantLink::getBandwidth()
 {
   DIE_IMPOSSIBLE;
   return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
 }
 
-double NetworkConstantLinkLmm::getLatency()
+double NetworkConstantLink::getLatency()
 {
   DIE_IMPOSSIBLE;
   return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
 }
 
-bool NetworkConstantLinkLmm::isShared()
+bool NetworkConstantLink::isShared()
 {
   DIE_IMPOSSIBLE;
   return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
@@ -121,7 +124,7 @@ bool NetworkConstantLinkLmm::isShared()
  * Action *
  **********/
 
-int NetworkConstantActionLmm::unref()
+int NetworkConstantAction::unref()
 {
   m_refcount--;
   if (!m_refcount) {
@@ -133,35 +136,35 @@ 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()
+void NetworkConstantAction::recycle()
 {
   return;
 }
 
-bool NetworkConstantActionLmm::isSuspended()
+bool NetworkConstantAction::isSuspended()
 {
   return m_suspended;
 }