Fix compilation with tracing and new network_element_t

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

diff --git a/src/surf/network_constant.c b/src/surf/network_constant.c
index a94f7ac..fc5580d 100644 (file)
--- a/src/surf/network_constant.c
+++ b/src/surf/network_constant.c
@@ -21,13 +21,11 @@ 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(sg_platf_host_cbarg_t h)
-{
+static void netcste_count_hosts(sg_platf_host_cbarg_t h) {
   host_number_int++;
 }
 
-static void netcste_define_callbacks(void)
-{
+static void netcste_define_callbacks(void) {
   sg_platf_host_add_cb(netcste_count_hosts);
 }
 
@@ -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,
+static surf_action_t netcste_communicate(void *src,
+                                         void *dst, double size,
                                          double rate)
 {
   surf_action_network_Constant_t action = NULL;
 
+  char *src_name = ((network_element_t)src)->name;
+  char *dst_name = ((network_element_t)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;
 }
 
 static double netcste_get_link_latency(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1.0;
 }
 
 static int link_shared(const void *link)
 {
   DIE_IMPOSSIBLE;
+  return -1;
 }
 
 static void netcste_action_suspend(surf_action_t action)
@@ -236,9 +234,5 @@ void surf_network_model_init_Constant()
   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(sizeof(double), NULL);
 }