X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c94898122fc054483e0e4b0313cd52f385582d2a..c74383252db029e98396c3b6ad842c16e68484bf:/src/surf/network_constant.c

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index f04861b0a6..c75fb23d50 100644
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -12,18 +12,11 @@
 #include "xbt/str.h"
 #include "xbt/log.h"
 
-typedef struct network_card_Constant {
-  s_surf_resource_t generic_resource;
-  int id;
-} s_network_card_Constant_t, *network_card_Constant_t;
-
 typedef struct surf_action_network_Constant {
   s_surf_action_t generic_action;
   double latency;
   double lat_init;
   int suspended;
-  network_card_Constant_t src;
-  network_card_Constant_t dst;
 } s_surf_action_network_Constant_t, *surf_action_network_Constant_t;
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
@@ -31,41 +24,6 @@ static random_data_t random_latency = NULL;
 static int card_number = 0;
 static int host_number = 0;
 
-static int network_card_new(const char *card_name)
-{
-  network_card_Constant_t card =
-    surf_model_resource_by_name(surf_network_model, card_name);
-
-  if (!card) {
-    card = xbt_new0(s_network_card_Constant_t, 1);
-    card->generic_resource.name = xbt_strdup(card_name);
-    card->id = card_number++;
-    xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card,
-                 surf_resource_free);
-  }
-  return card->id;
-}
-
-static int src_id = -1;
-static int dst_id = -1;
-
-static void parse_route_set_endpoints(void)
-{
-  src_id = network_card_new(A_surfxml_route_src);
-  dst_id = network_card_new(A_surfxml_route_dst);
-  route_action = A_surfxml_route_action;
-}
-
-static void parse_route_set_route(void)
-{
-  char *name;
-  if (src_id != -1 && dst_id != -1) {
-    name = bprintf("%x#%x", src_id, dst_id);
-    manage_route(route_table, name, route_action, 0);
-    free(name);
-  }
-}
-
 static void count_hosts(void)
 {
   host_number++;
@@ -75,9 +33,6 @@ static void define_callbacks(const char *file)
 {
   /* Figuring out the network links */
   surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
-  surfxml_add_callback(STag_surfxml_route_cb_list,
-                       &parse_route_set_endpoints);
-  surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
 }
 
 static int resource_used(void *resource_id)
@@ -85,7 +40,7 @@ static int resource_used(void *resource_id)
   return 0;
 }
 
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
 {
   action->refcount--;
   if (!action->refcount) {
@@ -96,11 +51,6 @@ static int action_free(surf_action_t action)
   return 0;
 }
 
-static void action_use(surf_action_t action)
-{
-  action->refcount++;
-}
-
 static void action_cancel(surf_action_t action)
 {
   return;
@@ -111,13 +61,6 @@ static void action_recycle(surf_action_t action)
   return;
 }
 
-static void action_change_state(surf_action_t action,
-                                e_surf_action_state_t state)
-{
-  surf_action_change_state(action, state);
-  return;
-}
-
 static double share_resources(double now)
 {
   surf_action_network_Constant_t action = NULL;
@@ -157,11 +100,11 @@ static void update_actions_state(double now, double delta)
 
     if (action->generic_action.remains <= 0) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     } else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
                (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
-      action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+      surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
 
@@ -175,14 +118,12 @@ static void update_resource_state(void *id,
   DIE_IMPOSSIBLE;
 }
 
-static surf_action_t communicate(void *src, void *dst, double size,
-                                 double rate)
+static surf_action_t communicate(const char *src_name,const char *dst_name,int src, int dst, double size,
+    double rate)
 {
   surf_action_network_Constant_t action = NULL;
-  network_card_Constant_t card_src = src;
-  network_card_Constant_t card_dst = dst;
 
-  XBT_IN4("(%s,%s,%g,%g)", card_src->generic_resource.name, card_dst->generic_resource.name, size, rate);
+  XBT_IN4("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
 
   action = xbt_new0(s_surf_action_network_Constant_t, 1);
 
@@ -214,16 +155,9 @@ static surf_action_t communicate(void *src, void *dst, double size,
 }
 
 /* returns an array of link_Constant_t */
-static const void **get_route(void *src, void *dst)
-{
-  xbt_assert0(0, "Calling this function does not make any sense");
-  return (const void **) NULL;
-}
-
-static int get_route_size(void *src, void *dst)
+static xbt_dynar_t get_route(void *src, void *dst)
 {
-  xbt_assert0(0, "Calling this function does not make any sense");
-  return 0;
+  xbt_die("Calling this function does not make any sense");
 }
 
 static double get_link_bandwidth(const void *link)
@@ -279,16 +213,10 @@ static void surf_network_model_init_internal(void)
 {
   surf_network_model = surf_model_init();
 
-  surf_network_model->action_get_state = surf_action_get_state;
-  surf_network_model->action_get_start_time = surf_action_get_start_time;
-  surf_network_model->action_get_finish_time = surf_action_get_finish_time;
-  surf_network_model->action_free = action_free;
-  surf_network_model->action_use = action_use;
+  surf_network_model->name = "network constant";
+  surf_network_model->action_unref = action_unref;
   surf_network_model->action_cancel = action_cancel;
   surf_network_model->action_recycle = action_recycle;
-  surf_network_model->action_change_state = action_change_state;
-  surf_network_model->action_set_data = surf_action_set_data;
-  surf_network_model->name = "network";
 
   surf_network_model->model_private->resource_used = resource_used;
   surf_network_model->model_private->share_resources = share_resources;
@@ -304,8 +232,6 @@ static void surf_network_model_init_internal(void)
   surf_cpu_model->set_max_duration = action_set_max_duration;
 
   surf_network_model->extension.network.communicate = communicate;
-  surf_network_model->extension.network.get_route = get_route;
-  surf_network_model->extension.network.get_route_size = get_route_size;
   surf_network_model->extension.network.get_link_bandwidth =
     get_link_bandwidth;
   surf_network_model->extension.network.get_link_latency = get_link_latency;