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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 00d100a4f6..d9f36dddcf 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"
 
@@ -24,12 +30,13 @@ void surf_network_model_init_Constant()
 
 double NetworkConstantModel::shareResources(double /*now*/)
 {
-  void *_action = NULL;
-  NetworkConstantActionLmmPtr action = NULL;
+  NetworkConstantActionPtr action = NULL;
   double min = -1.0;
 
-  xbt_swag_foreach(_action, p_runningActionSet) {
-	action = dynamic_cast<NetworkConstantActionLmmPtr>(static_cast<ActionPtr>(_action));
+  ActionListPtr actionSet = getRunningActionSet();
+  for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
+	 ; it != itend ; ++it) {
+	action = static_cast<NetworkConstantActionPtr>(&*it);
     if (action->m_latency > 0) {
       if (min < 0)
         min = action->m_latency;
@@ -43,11 +50,12 @@ double NetworkConstantModel::shareResources(double /*now*/)
 
 void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 {
-  void *_action, *_next_action;
-  NetworkConstantActionLmmPtr action = NULL;
-
-  xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) {
-	action = dynamic_cast<NetworkConstantActionLmmPtr>(static_cast<ActionPtr>(_action));
+  NetworkConstantActionPtr action = NULL;
+  ActionListPtr actionSet = getRunningActionSet();
+  for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
+     ; it != itend ; it=itNext) {
+    ++itNext;
+	action = static_cast<NetworkConstantActionPtr>(&*it);
     if (action->m_latency > 0) {
       if (action->m_latency > delta) {
         double_update(&(action->m_latency), delta);
@@ -55,17 +63,16 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
         action->m_latency = 0.0;
       }
     }
-    double_update(&(action->m_remains),
-                  action->m_cost * delta / action->m_latInit);
-    if (action->m_maxDuration != NO_MAX_DURATION)
-      double_update(&(action->m_maxDuration), delta);
+    action->updateRemains(action->getCost() * delta / action->m_latInit);
+    if (action->getMaxDuration() != NO_MAX_DURATION)
+      action->updateMaxDuration(delta);
 
-    if (action->m_remains <= 0) {
-      action->m_finish = surf_get_clock();
+    if (action->getRemainsNoUpdate() <= 0) {
+      action->finish();
       action->setState(SURF_ACTION_DONE);
-    } else if ((action->m_maxDuration != NO_MAX_DURATION)
-               && (action->m_maxDuration <= 0)) {
-      action->m_finish = surf_get_clock();
+    } else if ((action->getMaxDuration() != NO_MAX_DURATION)
+               && (action->getMaxDuration() <= 0)) {
+      action->finish();
       action->setState(SURF_ACTION_DONE);
     }
   }
@@ -74,11 +81,11 @@ 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();
 
   return action;
@@ -87,30 +94,30 @@ ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr d
 /************
  * 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 */
@@ -120,46 +127,47 @@ bool NetworkConstantLinkLmm::isShared()
  * Action *
  **********/
 
-int NetworkConstantActionLmm::unref()
+int NetworkConstantAction::unref()
 {
   m_refcount--;
   if (!m_refcount) {
-    xbt_swag_remove(static_cast<ActionPtr>(this), p_stateSet);
+	if (actionHook::is_linked())
+	  p_stateSet->erase(p_stateSet->iterator_to(*this));
     delete this;
   return 1;
   }
   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;
 }