kill network_common.h: empty

[simgrid.git] / src / surf / network_constant.c

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index bc6f1bc..4bc123c 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -6,66 +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 {
-  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);
 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 +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 int resource_used(void *resource_id)
@@ -152,8 +105,6 @@ static void update_actions_state(double now, double delta)
       surf_network_model->action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     }
   }
-
-  return;
 }
 
 static void update_resource_state(void *id,
@@ -170,29 +121,18 @@ static surf_action_t communicate(const char *src_name,const char *dst_name,int s
 
   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->states.done_action_set;
-  else
-    action->generic_action.state_set =
-      surf_network_model->states.running_action_set;
-
-  xbt_swag_insert(action, action->generic_action.state_set);
-
+    xbt_swag_insert(action, action->generic_action.state_set);
+  }
 
   XBT_OUT;
 
@@ -220,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;
@@ -250,8 +185,6 @@ static void finalize(void)
 {
   surf_model_exit(surf_network_model);
   surf_network_model = NULL;
-
-  card_number = 0;
 }
 
 static void surf_network_model_init_internal(void)
@@ -282,8 +215,6 @@ static void surf_network_model_init_internal(void)
   surf_network_model->extension.network.get_link_latency = get_link_latency;
   surf_network_model->extension.network.link_shared = link_shared;
 
-  surf_network_model->get_properties = get_properties;
-
   if (!random_latency)
     random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
 }