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 cf5ca30..c558a2e 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -8,6 +8,8 @@
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "surf_private.h"
+#include "surf/surf_resource.h"
+//#include "surf/surf_resource_lmm.h"
 
 typedef enum {
   SURF_WORKSTATION_RESOURCE_CPU,
@@ -80,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
@@ -402,14 +404,12 @@ static void ptask_update_resource_state(void *id,
 
 static void ptask_finalize(void)
 {
-  if (ptask_parallel_task_link_set != NULL)
-    xbt_dict_free(&ptask_parallel_task_link_set);
+  xbt_dict_free(&ptask_parallel_task_link_set);
 
   surf_model_exit(surf_workstation_model);
   surf_workstation_model = NULL;
   surf_model_exit(surf_network_model);
   surf_network_model = NULL;
-  global_routing->finalize();
 
   ptask_host_count = 0;
 
@@ -463,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]));
@@ -517,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]));
@@ -589,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));
 }
 
@@ -712,20 +712,42 @@ static void* ptask_link_create_resource(const char *name,
 
 static void ptask_parse_link_init(sg_platf_link_cbarg_t link)
 {
-  if(link->V_policy_initial_link == SURF_LINK_FULLDUPLEX)
-  {
-         ptask_link_create_resource(bprintf("%s_UP",link->V_link_id), link->V_link_bandwidth, link->V_link_bandwidth_file,
-                      link->V_link_latency, link->V_link_latency_file, link->V_link_state, link->V_link_state_file,
-                      link->V_policy_initial_link, link->properties);
-    ptask_link_create_resource(bprintf("%s_DOWN",link->V_link_id), link->V_link_bandwidth, link->V_link_bandwidth_file,
-            link->V_link_latency, link->V_link_latency_file, link->V_link_state, link->V_link_state_file,
-            link->V_policy_initial_link, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it
-  }
-  else
-  {
-         ptask_link_create_resource(xbt_strdup(link->V_link_id), link->V_link_bandwidth, link->V_link_bandwidth_file,
-               link->V_link_latency, link->V_link_latency_file, link->V_link_state, link->V_link_state_file,
-                      link->V_policy_initial_link, link->properties);
+  if (link->policy == SURF_LINK_FULLDUPLEX) {
+    char *link_id;
+    link_id = bprintf("%s_UP", link->id);
+    ptask_link_create_resource(link_id,
+                               link->bandwidth,
+                               link->bandwidth_trace,
+                               link->latency,
+                               link->latency_trace,
+                               link->state,
+                               link->state_trace,
+                               link->policy,
+                               link->properties);
+    xbt_free(link_id);
+    link_id = bprintf("%s_DOWN", link->id);
+    ptask_link_create_resource(bprintf("%s_DOWN", link->id),
+                               link->bandwidth,
+                               link->bandwidth_trace,
+                               link->latency,
+                               link->latency_trace,
+                               link->state,
+                               link->state_trace,
+                               link->policy,
+                               NULL); /* FIXME: We need to deep copy the
+                                       * properties or we won't be able to free
+                                       * it */
+    xbt_free(link_id);
+  } else {
+    ptask_link_create_resource(link->id,
+                               link->bandwidth,
+                               link->bandwidth_trace,
+                               link->latency,
+                               link->latency_trace,
+                               link->state,
+                               link->state_trace,
+                               link->policy,
+                               link->properties);
   }
 
   current_property_set = NULL;
@@ -868,11 +890,11 @@ static void ptask_model_init_internal(void)
     ptask_maxmin_system = lmm_system_new();
 
   routing_model_create(sizeof(link_L07_t),
-      ptask_link_create_resource(xbt_strdup("__loopback__"),
-                                      498000000, NULL, 0.000015, NULL,
-                                      SURF_RESOURCE_ON, NULL,
-                                      SURF_LINK_FATPIPE, NULL),
-                       ptask_get_link_latency);
+                       ptask_link_create_resource("__loopback__",
+                                                  498000000, NULL,
+                                                  0.000015, NULL,
+                                                  SURF_RESOURCE_ON, NULL,
+                                                  SURF_LINK_FATPIPE, NULL));
 
 }
 
@@ -887,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);
 }