X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37847073d272353f40d07e8d110b963488362efb..52245cf79e746200dbdc45f37330c1a54852e51b:/src/surf/network_gtnets.c

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 3766095919..798320bab7 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -22,25 +22,13 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
 {
   static int link_count = -1;
   network_link_GTNETS_t gtnets_link;
-  network_link_GTNETS_t gtnets_link_friend;
-  int tmp_idsrc = -1;
-  int tmp_iddst = -1;
-  char *name_friend;
 
-  if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) {
+  if (xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL)) {
     return;
   }
 
-  DEBUG1("Scanning link name %s", name);
-  sscanf(name, "%d_%d", &tmp_idsrc, &tmp_iddst);
-  DEBUG2("Link name split into %d and %d", tmp_idsrc, tmp_iddst);
+  XBT_DEBUG("Scanning link name %s", name);
 
-  xbt_assert0((tmp_idsrc != -1)
-              && (tmp_idsrc != -1),
-              "You need to respect fullduplex convention x_y for xml link id.");
-
-  name_friend = (char *) calloc(strlen(name), sizeof(char));
-  sprintf(name_friend, "%d_%d", tmp_iddst, tmp_idsrc);
 
   gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
   gtnets_link->generic_resource.name = name;
@@ -48,25 +36,17 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   gtnets_link->bw_current = bw;
   gtnets_link->lat_current = lat;
 
-  if ((gtnets_link_friend =
-       xbt_dict_get_or_null(surf_network_model->resource_set,
-                            name_friend))) {
-    gtnets_link->id = gtnets_link_friend->id;
-  } else {
-    link_count++;
+  link_count++;
 
-    DEBUG4("Adding new link, linkid %d, name %s, latency %g, bandwidth %g",
+  XBT_DEBUG("Adding new link, linkid %d, name %s, latency %g, bandwidth %g",
            link_count, name, lat, bw);
-    if (gtnets_add_link(link_count, bw, lat)) {
-      xbt_assert0(0, "Cannot create GTNetS link");
-    }
-    gtnets_link->id = link_count;
+
+  if (gtnets_add_link(link_count, bw, lat)) {
+	  xbt_die("Cannot create GTNetS link");
   }
-  xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
-               surf_resource_free);
-#ifdef HAVE_TRACING
-  TRACE_surf_link_declaration(gtnets_link, name, bw, lat);
-#endif
+  gtnets_link->id = link_count;
+
+  xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, gtnets_link);
 }
 
 static void route_new(int src_id, int dst_id, xbt_dynar_t links,
@@ -77,7 +57,7 @@ static void route_new(int src_id, int dst_id, xbt_dynar_t links,
   int i = 0;
   int *gtnets_links;
 
-  XBT_IN4("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)",
+  XBT_IN("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)",
           src_id, dst_id, links, nb_link);
 
   /* Build the list of gtnets link IDs */
@@ -88,16 +68,16 @@ static void route_new(int src_id, int dst_id, xbt_dynar_t links,
   }
 
   if (gtnets_add_route(src_id, dst_id, gtnets_links, nb_link)) {
-    xbt_assert0(0, "Cannot create GTNetS route");
+    xbt_die("Cannot create GTNetS route");
   }
-  XBT_OUT;
+  XBT_OUT();
 }
 
 static void route_onehop_new(int src_id, int dst_id,
                              network_link_GTNETS_t link)
 {
   if (gtnets_add_onehop_route(src_id, dst_id, link->id)) {
-    xbt_assert0(0, "Cannot create GTNetS route");
+    xbt_die("Cannot create GTNetS route");
   }
 }
 
@@ -112,7 +92,7 @@ static void parse_link_init(void)
   surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
   surf_parse_get_double(&lat, A_surfxml_link_latency);
   state = SURF_RESOURCE_ON;
-  DEBUG0("link_gtnets");
+  XBT_DEBUG("link_gtnets");
   tmgr_trace_t bw_trace;
   tmgr_trace_t state_trace;
   tmgr_trace_t lat_trace;
@@ -122,14 +102,13 @@ static void parse_link_init(void)
   state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
   if (bw_trace)
-    INFO0
+    XBT_INFO
         ("The GTNetS network model doesn't support bandwidth state traces");
   if (lat_trace)
-    INFO0("The GTNetS network model doesn't support latency state traces");
+    XBT_INFO("The GTNetS network model doesn't support latency state traces");
   if (state_trace)
-    INFO0("The GTNetS network model doesn't support link state traces");
+    XBT_INFO("The GTNetS network model doesn't support link state traces");
 
-  current_property_set = xbt_dict_new();
   if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
   {
 	  link_new(bprintf("%s_UP",name), bw, lat, current_property_set);
@@ -137,54 +116,64 @@ static void parse_link_init(void)
 
   }
   else  link_new(name, bw, lat, current_property_set);
+  current_property_set = NULL;
 }
 
 /* Create the gtnets topology based on routing strategy */
 static void create_gtnets_topology()
 {
-//  xbt_dict_cursor_t cursor = NULL;
-//  char *key, *data;
-//   xbt_dict_t onelink_routes = global_routing->get_onelink_routes();
-//   xbt_assert0(onelink_routes, "Error onelink_routes was not initialized");
-//
-//   DEBUG0("Starting topology generation");
+  int src_id,dst_id;
+
+   XBT_DEBUG("Starting topology generation");
 // À refaire plus tard. Il faut prendre la liste des hôtes/routeurs (dans routing)
 // À partir de cette liste, on les numérote.
 // Ensuite, on peut utiliser les id pour refaire les appels GTNets qui suivent.
 
-//   xbt_dict_foreach(onelink_routes, cursor, key, data){
-//      s_onelink_t link = (s_onelink_t) data;
-//
-//      DEBUG3("Link (#%d), src (#%s), dst (#%s)", ((network_link_GTNETS_t)(link->link_ptr))->id , link->src, link->dst);
-//     DEBUG0("Calling one link route");
-//     if(global_routing->is_router(link->src)){
-//      gtnets_add_router(link->src_id);
-//     }
-//     if(global_routing->is_router(link->dst)){
-//      gtnets_add_router(link->dst_id);
-//     }
-//     route_onehop_new(link->src_id, link->dst_id, (network_link_GTNETS_t)(link->link_ptr));
-//   }
-//
-//   xbt_dict_free(&route_table);
-//   if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
-//        gtnets_print_topology();
-//   }
+   //get the onelinks from the parsed platform
+   xbt_dynar_t onelink_routes = global_routing->get_onelink_routes();
+   if (!onelink_routes)
+     return;
+
+   //save them in trace file
+   onelink_t onelink;
+   unsigned int iter;
+   xbt_dynar_foreach(onelink_routes, iter, onelink) {
+     char *src = onelink->src;
+     char *dst = onelink->dst;
+     void *link = onelink->link_ptr;
+     src_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src));
+     dst_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst));
+
+     if(src_id != dst_id){
+     XBT_DEBUG("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", link,src,dst, src_id, dst_id);
+     XBT_DEBUG("Calling one link route");
+        if(global_routing->get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
+        	gtnets_add_router(src_id);
+        }
+        if(global_routing->get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+         gtnets_add_router(dst_id);
+        }
+        route_onehop_new(src_id, dst_id, (network_link_GTNETS_t)(link));
+     }
+   }
+
+   if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
+        gtnets_print_topology();
+   }
 }
 
 /* Main XML parsing */
 static void define_callbacks(const char *file)
 {
   /* Figuring out the network links */
-  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
+  surfxml_add_callback(ETag_surfxml_link_cb_list, &parse_link_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list,
                        &create_gtnets_topology);
 }
 
 static int resource_used(void *resource_id)
 {
-  xbt_assert0(0,
-              "The resource_used feature is not implemented in GTNets model");
+  xbt_die("The resource_used feature is not implemented in GTNets model");
 }
 
 static int action_unref(surf_action_t action)
@@ -196,7 +185,7 @@ static int action_unref(surf_action_t action)
     if (action->category)
       xbt_free(action->category);
 #endif
-    free(action);
+    surf_action_free(&action);
     return 1;
   }
   return 0;
@@ -204,13 +193,13 @@ static int action_unref(surf_action_t action)
 
 static void action_cancel(surf_action_t action)
 {
-  xbt_assert0(0, "Cannot cancel GTNetS flow");
+  xbt_die("Cannot cancel GTNetS flow");
   return;
 }
 
 static void action_recycle(surf_action_t action)
 {
-  xbt_assert0(0, "Cannot recycle GTNetS flow");
+  xbt_die("Cannot recycle GTNetS flow");
   return;
 }
 
@@ -234,12 +223,12 @@ static double share_resources(double now)
   if (!xbt_swag_size(running_actions))
     return -1.0;
 
-  xbt_assert0(time_to_next_flow_completion,
+  xbt_assert(time_to_next_flow_completion,
               "Time to next flow completion not initialized!\n");
 
-  DEBUG0("Calling gtnets_get_time_to_next_flow_completion");
+  XBT_DEBUG("Calling gtnets_get_time_to_next_flow_completion");
   time_to_next_flow_completion = gtnets_get_time_to_next_flow_completion();
-  DEBUG1("gtnets_get_time_to_next_flow_completion received %lg",
+  XBT_DEBUG("gtnets_get_time_to_next_flow_completion received %lg",
          time_to_next_flow_completion);
 
   return time_to_next_flow_completion;
@@ -264,16 +253,14 @@ static void update_actions_state(double now, double delta)
     num_flows = 0;
 
     if (gtnets_run_until_next_flow_completion(&metadata, &num_flows)) {
-      xbt_assert0(0,
-                  "Cannot run GTNetS simulation until next flow completion");
+      xbt_die("Cannot run GTNetS simulation until next flow completion");
     }
     if (num_flows < 1) {
-      xbt_assert0(0,
-                  "GTNetS simulation couldn't find a flow that would complete");
+      xbt_die("GTNetS simulation couldn't find a flow that would complete");
     }
 
     xbt_swag_foreach(action, running_actions) {
-      DEBUG2("Action (%p) remains old value: %f", action,
+      XBT_DEBUG("Action (%p) remains old value: %f", action,
              action->generic_action.remains);
       double sent = gtnets_get_flow_rx(action);
 
@@ -284,21 +271,20 @@ static void update_actions_state(double now, double delta)
         trace_sent = action->generic_action.cost;
       }
       // tracing resource utilization
-// COMMENTED BY DAVID
-//       int src = TRACE_surf_gtnets_get_src (action);
-//       int dst = TRACE_surf_gtnets_get_dst (action);
-//       if (src != -1 && dst != -1){
-//         xbt_dynar_t route = used_routing->get_route(src, dst);
-//         network_link_GTNETS_t link;
-//         unsigned int i;
-//         xbt_dynar_foreach(route, i, link) {
-//              TRACE_surf_link_set_utilization (link->generic_resource.name,
-//             action->generic_action.data, trace_sent/delta, now-delta, delta);
-//         }
-//       }
+      xbt_dynar_t route = global_routing->get_route(action->src_name, action->dst_name);
+      network_link_GTNETS_t link;
+      unsigned int i;
+      xbt_dynar_foreach(route, i, link) {
+        TRACE_surf_link_set_utilization (link->generic_resource.name,
+            action->generic_action.data,
+            (surf_action_t) action,
+            trace_sent/delta,
+            now-delta,
+            delta);
+      }
 #endif
 
-      DEBUG1("Sent value returned by GTNetS : %f", sent);
+      XBT_DEBUG("Sent value returned by GTNetS : %f", sent);
       //need to trust this remain value
       if (sent == 0) {
         action->generic_action.remains = 0;
@@ -306,7 +292,7 @@ static void update_actions_state(double now, double delta)
         action->generic_action.remains =
             action->generic_action.cost - sent;
       }
-      DEBUG2("Action (%p) remains new value: %f", action,
+      XBT_DEBUG("Action (%p) remains new value: %f", action,
              action->generic_action.remains);
     }
 
@@ -318,13 +304,13 @@ static void update_actions_state(double now, double delta)
       TRACE_surf_gtnets_destroy(action);
 #endif
       action_state_set((surf_action_t) action, SURF_ACTION_DONE);
-      DEBUG1("----> Action (%p) just terminated", action);
+      XBT_DEBUG("----> Action (%p) just terminated", action);
     }
 
 
   } else {                      /* run for a given number of seconds */
     if (gtnets_run(delta)) {
-      xbt_assert0(0, "Cannot run GTNetS simulation");
+      xbt_die("Cannot run GTNetS simulation");
     }
   }
 
@@ -335,7 +321,7 @@ static void update_resource_state(void *id,
                                   tmgr_trace_event_t event_type,
                                   double value, double date)
 {
-  xbt_assert0(0, "Cannot update model state for GTNetS simulation");
+  xbt_die("Cannot update model state for GTNetS simulation");
 }
 
 /* Max durations are not supported */
@@ -349,10 +335,12 @@ static surf_action_t communicate(const char *src_name,
   src = dst = -1;
   surf_action_network_GTNETS_t action = NULL;
 
-  xbt_assert0((src >= 0
+  src = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src_name));
+  dst = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst_name));
+  xbt_assert((src >= 0
                && dst >= 0), "Either src or dst have invalid id (id<0)");
 
-  DEBUG4("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst,
+  XBT_DEBUG("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst,
          dst_name);
 
   xbt_dynar_t links = global_routing->get_route(src_name, dst_name);
@@ -364,11 +352,10 @@ static surf_action_t communicate(const char *src_name,
 
   /* Add a flow to the GTNets Simulation, associated to this action */
   if (gtnets_create_flow(src, dst, size, (void *) action) < 0) {
-    xbt_assert2(0, "Not route between host %s and host %s", src_name,
-                dst_name);
+    xbt_die("Not route between host %s and host %s", src_name, dst_name);
   }
 #ifdef HAVE_TRACING
-  TRACE_surf_gtnets_communicate(action, src, dst);
+  TRACE_surf_gtnets_communicate(action, src_name, dst_name);
 #endif
 
   return (surf_action_t) action;
@@ -392,6 +379,13 @@ static int action_is_suspended(surf_action_t action)
   return 0;
 }
 
+#ifdef HAVE_TRACING
+static void gtnets_action_set_category(surf_action_t action, const char *category)
+{
+  action->category = xbt_strdup (category);
+}
+#endif
+
 static void finalize(void)
 {
   gtnets_finalize();
@@ -419,15 +413,18 @@ static void surf_network_model_init_internal(void)
   surf_network_model->suspend = action_suspend;
   surf_network_model->resume = action_resume;
   surf_network_model->is_suspended = action_is_suspended;
+#ifdef HAVE_TRACING
+  surf_network_model->set_category = gtnets_action_set_category;
+#endif
 
   surf_network_model->extension.network.communicate = communicate;
 
   /* Added the initialization for GTNetS interface */
   if (gtnets_initialize(sg_tcp_gamma)) {
-    xbt_assert0(0, "Impossible to initialize GTNetS interface");
+    xbt_die("Impossible to initialize GTNetS interface");
   }
 
-  routing_model_create(sizeof(network_link_GTNETS_t), NULL);
+  routing_model_create(sizeof(network_link_GTNETS_t), NULL, NULL);
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING