X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/865f97c868ce92518b1cf4f23e23bd1b16b7917c..78fee3006db95dc64540374a81299f6c9f01ac4a:/src/surf/network_constant.c

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 0689106dde..4bc123c58b 100644
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -6,72 +6,22 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf_private.h"
-#include "network_common.h"
 #include "surf/random_mgr.h"
 #include "xbt/dict.h"
 #include "xbt/str.h"
 #include "xbt/log.h"
 
-typedef struct network_card_Constant {
-  char *name;
-  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);
 static random_data_t random_latency = NULL;
-static int card_number = 0;
 static int host_number = 0;
 
-static void network_card_free(void *nw_card)
-{
-  free(((network_card_Constant_t) nw_card)->name);
-  free(nw_card);
-}
-
-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->name = xbt_strdup(card_name);
-    card->id = card_number++;
-    xbt_dict_set(surf_model_resource_set(surf_network_model), card_name, card,
-                 network_card_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++;
@@ -81,14 +31,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 const char *get_resource_name(void *resource_id)
-{
-  return ((network_card_Constant_t) resource_id)->name;
 }
 
 static int resource_used(void *resource_id)
@@ -96,7 +38,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) {
@@ -107,11 +49,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;
@@ -122,18 +59,10 @@ 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;
-  xbt_swag_t running_actions =
-    surf_network_model->common_public.states.running_action_set;
+  xbt_swag_t running_actions = surf_network_model->states.running_action_set;
   double min = -1.0;
 
   xbt_swag_foreach(action, running_actions) {
@@ -152,8 +81,7 @@ static void update_actions_state(double now, double delta)
 {
   surf_action_network_Constant_t action = NULL;
   surf_action_network_Constant_t next_action = NULL;
-  xbt_swag_t running_actions =
-    surf_network_model->common_public.states.running_action_set;
+  xbt_swag_t running_actions = surf_network_model->states.running_action_set;
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     if (action->latency > 0) {
@@ -170,15 +98,13 @@ 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);
     }
   }
-
-  return;
 }
 
 static void update_resource_state(void *id,
@@ -188,38 +114,25 @@ 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->name, card_dst->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);
+  action = surf_action_new(sizeof(s_surf_action_network_Constant_t),size,surf_network_model,0);
 
-  action->generic_action.refcount = 1;
-  action->generic_action.cost = size;
-  action->generic_action.remains = size;
-  action->generic_action.max_duration = NO_MAX_DURATION;
-  action->generic_action.start = surf_get_clock();
-  action->generic_action.finish = -1.0;
-  action->generic_action.model_type = surf_network_model;
   action->suspended = 0;
 
   action->latency = random_generate(random_latency);
   action->lat_init = action->latency;
 
-  if (action->latency <= 0.0)
+  if (action->latency <= 0.0) {
     action->generic_action.state_set =
-      surf_network_model->common_public.states.done_action_set;
-  else
-    action->generic_action.state_set =
-      surf_network_model->common_public.states.running_action_set;
-
-  xbt_swag_insert(action, action->generic_action.state_set);
-
+      surf_network_model->states.done_action_set;
+    xbt_swag_insert(action, action->generic_action.state_set);
+  }
 
   XBT_OUT;
 
@@ -227,21 +140,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)
-{
-  xbt_assert0(0, "Calling this function does not make any sense");
-  return 0;
-}
-
-static const char *get_link_name(const void *link)
+static xbt_dynar_t get_route(void *src, void *dst)
 {
-  DIE_IMPOSSIBLE;
+  xbt_die("Calling this function does not make any sense");
 }
 
 static double get_link_bandwidth(const void *link)
@@ -259,11 +160,6 @@ static int link_shared(const void *link)
   DIE_IMPOSSIBLE;
 }
 
-static xbt_dict_t get_properties(void *link)
-{
-  DIE_IMPOSSIBLE;
-}
-
 static void action_suspend(surf_action_t action)
 {
   ((surf_action_network_Constant_t) action)->suspended = 1;
@@ -288,57 +184,37 @@ static void action_set_max_duration(surf_action_t action, double duration)
 static void finalize(void)
 {
   surf_model_exit(surf_network_model);
-
-  free(surf_network_model);
   surf_network_model = NULL;
-
-  card_number = 0;
 }
 
 static void surf_network_model_init_internal(void)
 {
-  surf_network_model = xbt_new0(s_surf_model_t, 1);
-
-  surf_model_init(surf_network_model);
-
-  surf_network_model->common_public.get_resource_name = get_resource_name;
-  surf_network_model->common_public.action_get_state = surf_action_get_state;
-  surf_network_model->common_public.action_get_start_time =
-    surf_action_get_start_time;
-  surf_network_model->common_public.action_get_finish_time =
-    surf_action_get_finish_time;
-  surf_network_model->common_public.action_free = action_free;
-  surf_network_model->common_public.action_use = action_use;
-  surf_network_model->common_public.action_cancel = action_cancel;
-  surf_network_model->common_public.action_recycle = action_recycle;
-  surf_network_model->common_public.action_change_state = action_change_state;
-  surf_network_model->common_public.action_set_data = surf_action_set_data;
-  surf_network_model->common_public.name = "network";
-
-  surf_network_model->common_private->resource_used = resource_used;
-  surf_network_model->common_private->share_resources = share_resources;
-  surf_network_model->common_private->update_actions_state =
+  surf_network_model = surf_model_init();
+
+  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->model_private->resource_used = resource_used;
+  surf_network_model->model_private->share_resources = share_resources;
+  surf_network_model->model_private->update_actions_state =
     update_actions_state;
-  surf_network_model->common_private->update_resource_state =
+  surf_network_model->model_private->update_resource_state =
     update_resource_state;
-  surf_network_model->common_private->finalize = finalize;
+  surf_network_model->model_private->finalize = finalize;
 
-  surf_network_model->common_public.suspend = action_suspend;
-  surf_network_model->common_public.resume = action_resume;
-  surf_network_model->common_public.is_suspended = action_is_suspended;
-  surf_cpu_model->common_public.set_max_duration = action_set_max_duration;
+  surf_network_model->suspend = action_suspend;
+  surf_network_model->resume = action_resume;
+  surf_network_model->is_suspended = action_is_suspended;
+  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_name = get_link_name;
   surf_network_model->extension.network.get_link_bandwidth =
     get_link_bandwidth;
   surf_network_model->extension.network.get_link_latency = get_link_latency;
   surf_network_model->extension.network.link_shared = link_shared;
 
-  surf_network_model->common_public.get_properties = get_properties;
-
   if (!random_latency)
     random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
 }