Fixed the function that returns if a flows is limited by latency.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9256 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/simix/private.h b/src/simix/private.h
index d69a163..0630a01 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -124,6 +124,10 @@ typedef struct s_smx_action {
 
   };
 
 
   };
 

+#ifdef HAVE_LATENCY_BOUND_TRACKING
+  int latency_limited;
+#endif
+

 #ifdef HAVE_TRACING
   char *category;                     /* simix action category for instrumentation */
 #endif
 #ifdef HAVE_TRACING
   char *category;                     /* simix action category for instrumentation */
 #endif

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index fb39f8f..d1c1b42 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -171,6 +171,11 @@ smx_action_t SIMIX_comm_new(e_smx_comm_type_t type)
   act->comm.type = type;
   act->comm.refcount = 1;
 
   act->comm.type = type;
   act->comm.refcount = 1;
 

+#ifdef HAVE_LATENCY_BOUND_TRACKING
+  //initialize with unknown value
+  act->latency_limited = -1;
+#endif
+

 #ifdef HAVE_TRACING
   act->category = NULL;
 #endif
 #ifdef HAVE_TRACING
   act->category = NULL;
 #endif


@@ -191,22 +196,16 @@ void SIMIX_comm_destroy(smx_action_t action)
   if (action->comm.refcount <= 0)
     xbt_die(bprintf("the refcount of comm %p is already 0 before decreasing it. That's a bug!",action));
 
   if (action->comm.refcount <= 0)
     xbt_die(bprintf("the refcount of comm %p is already 0 before decreasing it. That's a bug!",action));
 

-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  //save is latency limited flag to use afterwards
-  if (action->comm.surf_comm) {
-    DEBUG2("adding key %p with latency limited value %d to the dict", action,
-           SIMIX_comm_is_latency_bounded(action));
-    xbt_dicti_set(simix_global->latency_limited_dict, (uintptr_t) action,
-                  SIMIX_comm_is_latency_bounded(action));
-  }
-#endif
-

   action->comm.refcount--;
   if (action->comm.refcount > 0)
     return;
   DEBUG2("Really free communication %p; refcount is now %d", action,
         action->comm.refcount);
 
   action->comm.refcount--;
   if (action->comm.refcount > 0)
     return;
   DEBUG2("Really free communication %p; refcount is now %d", action,
         action->comm.refcount);
 

+#ifdef HAVE_LATENCY_BOUND_TRACKING
+    action->latency_limited = SIMIX_comm_is_latency_bounded( action ) ;
+#endif
+

 #ifdef HAVE_TRACING
   TRACE_smx_action_destroy(action);
 #endif
 #ifdef HAVE_TRACING
   TRACE_smx_action_destroy(action);
 #endif


@@ -224,6 +223,9 @@ void SIMIX_comm_destroy(smx_action_t action)
 void SIMIX_comm_destroy_internal_actions(smx_action_t action)
 {
   if (action->comm.surf_comm){
 void SIMIX_comm_destroy_internal_actions(smx_action_t action)
 {
   if (action->comm.surf_comm){

+#ifdef HAVE_LATENCY_BOUND_TRACKING
+    action->latency_limited = SIMIX_comm_is_latency_bounded(action);
+#endif

     action->comm.surf_comm->model_type->action_unref(action->comm.surf_comm);
     action->comm.surf_comm = NULL;
   }
     action->comm.surf_comm->model_type->action_unref(action->comm.surf_comm);
     action->comm.surf_comm = NULL;
   }


@@ -683,21 +685,12 @@ smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action)
  */
 XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action)
 {
  */
 XBT_INLINE int SIMIX_comm_is_latency_bounded(smx_action_t action)
 {

-  //try to find comm on the list of finished flows
-  uintptr_t key = 0;
-  uintptr_t data = 0;
-  xbt_dict_cursor_t cursor;
-  xbt_dict_foreach(simix_global->latency_limited_dict, cursor, key, data) {
-    DEBUG2("comparing key=%p with comm=%p", (void *) key, (void *) action);
-    if ((void *) action == (void *) key) {
-      DEBUG2("key %p found, return value latency limited value %d",
-             (void *) key, (int) data);
-      xbt_dict_cursor_free(&cursor);
-      return (int) data;
-    }
+  if (action->comm.surf_comm){
+      DEBUG1("Getting latency limited for surf_action (%p)", action->comm.surf_comm);
+      action->latency_limited = surf_workstation_model->get_latency_limited(action->comm.surf_comm);
+      DEBUG1("Action limited is %d", action->latency_limited);

   }
   }

-
-  return surf_workstation_model->get_latency_limited(action->comm.surf_comm);
+  return action->latency_limited;

 }
 #endif
 
 }
 #endif
 

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 1d154ba..457cfe3 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -196,9 +196,8 @@ static int ws_get_latency_limited(surf_action_t action)
 {
   if (action->model_type == surf_network_model)
     return surf_network_model->get_latency_limited(action);
 {
   if (action->model_type == surf_network_model)
     return surf_network_model->get_latency_limited(action);

-  INFO0
-      ("You tried to ask if a non network action is limited by latency, aborting...");
-  DIE_IMPOSSIBLE;
+  else
+    return 0;

 }
 #endif
 
 }
 #endif