Let's trust the mathematics here: sqrt + fabs + fabs IS positive or nul :)

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

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index e642573..c558a2e 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -82,7 +82,7 @@ static void ptask_update_action_bound(surf_action_workstation_L07_t action)
   for (i = 0; i < workstation_nb; i++) {
     for (j = 0; j < workstation_nb; j++) {
       xbt_dynar_t route =
-          global_routing->get_route(surf_resource_name
+          routing_get_route(surf_resource_name
                                     (action->workstation_list[i]),
                                     surf_resource_name(action->
                                                        workstation_list
@@ -410,7 +410,6 @@ static void ptask_finalize(void)
   surf_workstation_model = NULL;
   surf_model_exit(surf_network_model);
   surf_network_model = NULL;
-  global_routing->finalize();
 
   ptask_host_count = 0;
 
@@ -464,7 +463,7 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb,
     for (j = 0; j < workstation_nb; j++) {
       link_L07_t link;
       xbt_dynar_t route =
-          global_routing->get_route(surf_resource_name
+          routing_get_route(surf_resource_name
                                     (workstation_list[i]),
                                     surf_resource_name(workstation_list
                                                        [j]));
@@ -518,7 +517,7 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb,
     for (j = 0; j < workstation_nb; j++) {
       link_L07_t link;
       xbt_dynar_t route =
-          global_routing->get_route(surf_resource_name
+          routing_get_route(surf_resource_name
                                     (workstation_list[i]),
                                     surf_resource_name(workstation_list
                                                        [j]));
@@ -590,9 +589,9 @@ static surf_action_t ptask_action_sleep(void *cpu, double duration)
   return (surf_action_t) action;
 }
 
-static xbt_dynar_t ptask_get_route(void *src, void *dst)
+static xbt_dynar_t ptask_get_route(void *src, void *dst) // FIXME: kill that callback kind?
 {
-  return global_routing->get_route(surf_resource_name(src),
+  return routing_get_route(surf_resource_name(src),
                                    surf_resource_name(dst));
 }
 
@@ -895,8 +894,7 @@ static void ptask_model_init_internal(void)
                                                   498000000, NULL,
                                                   0.000015, NULL,
                                                   SURF_RESOURCE_ON, NULL,
-                                                  SURF_LINK_FATPIPE, NULL),
-                       ptask_get_link_latency);
+                                                  SURF_LINK_FATPIPE, NULL));
 
 }
 
@@ -911,8 +909,5 @@ void surf_workstation_model_init_ptask_L07(void)
   surf_network_model = surf_model_init();
   ptask_define_callbacks();
   ptask_model_init_internal();
-
-  update_model_description(surf_workstation_model_description,
-                           "ptask_L07", surf_workstation_model);
   xbt_dynar_push(model_list, &surf_workstation_model);
 }