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

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index 7b811c41e8..e290e10611 100644
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -21,14 +21,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 static random_data_t random_latency = NULL;
 static int host_number_int = 0;
 
-static void netcste_count_hosts(void)
-{
+static void netcste_count_hosts(sg_platf_host_cbarg_t h) {
   host_number_int++;
 }
 
-static void netcste_define_callbacks(const char *file)
-{
-  surfxml_add_callback(STag_surfxml_host_cb_list, &netcste_count_hosts);
+static void netcste_define_callbacks(void) {
+  sg_platf_host_add_cb(netcste_count_hosts);
 }
 
 static int netcste_resource_used(void *resource_id)
@@ -111,12 +109,15 @@ static void netcste_update_resource_state(void *id,
   DIE_IMPOSSIBLE;
 }
 
-static surf_action_t netcste_communicate(const char *src_name,
-                                         const char *dst_name, double size,
-                                         double rate)
+static surf_action_t netcste_communicate(sg_routing_edge_t src,
+                                         sg_routing_edge_t dst,
+                                         double size, double rate)
 {
   surf_action_network_Constant_t action = NULL;
 
+  char *src_name = src->name;
+  char *dst_name = dst->name;
+
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
 
   action =
@@ -146,25 +147,22 @@ static void netcste_action_set_category(surf_action_t action, const char *catego
 }
 #endif
 
-/* returns an array of link_Constant_t */
-static xbt_dynar_t netcste_get_route(void *src, void *dst)
-{
-  xbt_die("Calling this function does not make any sense");
-}
-
 static double netcste_get_link_bandwidth(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
 }
 
 static double netcste_get_link_latency(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1.0; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
 }
 
 static int link_shared(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1; /* useless since DIE actually abort(), but eclipse prefer to have a useless and harmless return */
 }
 
 static void netcste_action_suspend(surf_action_t action)
@@ -191,7 +189,7 @@ static void netcste_finalize(void)
 
 
 
-void surf_network_model_init_Constant(const char *filename)
+void surf_network_model_init_Constant()
 {
   xbt_assert(surf_network_model == NULL);
   if (surf_network_model)
@@ -202,7 +200,7 @@ void surf_network_model_init_Constant(const char *filename)
   surf_network_model->action_unref = netcste_action_unref;
   surf_network_model->action_cancel = netcste_action_cancel;
   surf_network_model->action_recycle = net_action_recycle;
-  surf_network_model->get_remains = net_action_get_remains;
+  surf_network_model->get_remains = surf_action_get_remains;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   surf_network_model->get_latency_limited = net_get_link_latency_limited;
 #endif
@@ -219,7 +217,7 @@ void surf_network_model_init_Constant(const char *filename)
   surf_network_model->suspend = netcste_action_suspend;
   surf_network_model->resume = netcste_action_resume;
   surf_network_model->is_suspended = netcste_action_is_suspended;
-  surf_cpu_model->set_max_duration = net_action_set_max_duration;
+  surf_cpu_model->set_max_duration = surf_action_set_max_duration;
 
   surf_network_model->extension.network.communicate = netcste_communicate;
   surf_network_model->extension.network.get_link_bandwidth =
@@ -233,12 +231,8 @@ void surf_network_model_init_Constant(const char *filename)
 
   if (!random_latency)
     random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
-  netcste_define_callbacks(filename);
+  netcste_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
 
-  update_model_description(surf_network_model_description,
-                           "Constant", surf_network_model);
-
-  xbt_cfg_set_string(_surf_cfg_set, "routing", "none");
-  routing_model_create(sizeof(double), NULL, netcste_get_link_latency);
+  routing_model_create(NULL);
 }