[NS3] new NS3 surf network action data structure

details:
- used only to keep tracing things and the generic surf_action type

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 8ebfdf0..5de0d55 100644 (file)
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -428,7 +428,7 @@ static void ns3_update_actions_state(double now, double delta)
          char *key;
          void *data;
 
          char *key;
          void *data;
 

-         surf_action_t action = NULL;
+         surf_action_network_ns3_t action = NULL;

          xbt_swag_t running_actions =
              surf_network_model->states.running_action_set;
 
          xbt_swag_t running_actions =
              surf_network_model->states.running_action_set;
 


@@ -437,12 +437,12 @@ static void ns3_update_actions_state(double now, double delta)
                return;
 
          xbt_dict_foreach(dict_socket,cursor,key,data){
                return;
 
          xbt_dict_foreach(dict_socket,cursor,key,data){

-           action = (surf_action_t)ns3_get_socket_action(data);
-           action->remains = action->cost - ns3_get_socket_sent(data);
+           action = (surf_action_network_ns3_t)ns3_get_socket_action(data);
+           action->generic_action.remains = action->generic_action.cost - ns3_get_socket_sent(data);

 
            if(ns3_get_socket_is_finished(data) == 1){
 
            if(ns3_get_socket_is_finished(data) == 1){

-             action->finish = now;
-             surf_action_state_set(action, SURF_ACTION_DONE);
+             action->generic_action.finish = now;
+             surf_action_state_set(&(action->generic_action), SURF_ACTION_DONE);

            }
          }
          return;
            }
          }
          return;


@@ -452,13 +452,19 @@ static void ns3_update_actions_state(double now, double delta)
 static surf_action_t ns3_communicate(const char *src_name,
                                  const char *dst_name, double size, double rate)
 {
 static surf_action_t ns3_communicate(const char *src_name,
                                  const char *dst_name, double size, double rate)
 {

-  surf_action_t action = NULL;
+  surf_action_network_ns3_t action = NULL;

 
   XBT_DEBUG("Communicate from %s to %s",src_name,dst_name);
 
   XBT_DEBUG("Communicate from %s to %s",src_name,dst_name);

-  action = surf_action_new(sizeof(s_surf_action_t), size, surf_network_model, 0);
+  action = surf_action_new(sizeof(s_surf_action_network_ns3_t), size, surf_network_model, 0);

 
   ns3_create_flow(src_name, dst_name, surf_get_clock(), size, action);
 
 
   ns3_create_flow(src_name, dst_name, surf_get_clock(), size, action);
 

+#ifdef HAVE_TRACING
+  action->last_sent = 0;
+  action->src_name = xbt_strdup (src_name);
+  action->dst_name = xbt_strdup (dst_name);
+#endif
+

   return (surf_action_t) action;
 }
 
   return (surf_action_t) action;
 }
 


@@ -485,6 +491,14 @@ static int action_unref(surf_action_t action)
   action->refcount--;
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);
   action->refcount--;
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);

+
+#ifdef HAVE_TRACING
+    xbt_free(((surf_action_network_ns3_t)action)->src_name);
+    xbt_free(((surf_action_network_ns3_t)action)->dst_name);
+    if (action->category)
+      xbt_free(action->category);
+#endif
+

     surf_action_free(&action);
     return 1;
   }
     surf_action_free(&action);
     return 1;
   }

diff --git a/src/surf/network_ns3_private.h b/src/surf/network_ns3_private.h
index 03a27ee..38af59b 100644 (file)
--- a/src/surf/network_ns3_private.h
+++ b/src/surf/network_ns3_private.h
@@ -22,4 +22,14 @@ typedef struct surf_ns3_link{
        int created;
 }s_surf_ns3_link_t, *surf_ns3_link_t;
 
        int created;
 }s_surf_ns3_link_t, *surf_ns3_link_t;
 

+typedef struct surf_action_network_ns3 {
+  s_surf_action_t generic_action;
+#ifdef HAVE_TRACING
+  int last_sent;
+  char *src_name;
+  char *dst_name;
+#endif //HAVE_TRACING
+} s_surf_action_network_ns3_t, *surf_action_network_ns3_t;
+
+

 #endif                          /* _SURF_NETWORK_NS3_PRIVATE_H */
 #endif                          /* _SURF_NETWORK_NS3_PRIVATE_H */