Add a platform with a bypass route. Add the test to cmake.

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 1bbeb9f..b0d69b5 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -1,10 +1,12 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "surf_private.h"
+#include "surf/surf_resource.h"
+
 
 typedef s_surf_action_lmm_t s_surf_action_cpu_Cas01_t,
     *surf_action_cpu_Cas01_t;
@@ -71,19 +73,18 @@ static void* cpu_create_resource(const char *name, double power_peak,
 }
 
 
-static void parse_cpu_init(surf_parsing_host_arg_t host)
+static void parse_cpu_init(sg_platf_host_cbarg_t host)
 {
-  if(strcmp(host->V_host_coord,"")) xbt_die("Coordinates not implemented yet!");
-
-  cpu_create_resource(host->V_host_id,
-                 host->V_host_power_peak,
-                 host->V_host_power_scale,
-                 host->V_host_power_trace,
-                 host->V_host_core,
-                 host->V_host_state_initial,
-                 host->V_host_state_trace,
-                 current_property_set);
-  current_property_set = NULL;
+  if(strcmp(host->coord,"")) xbt_die("Coordinates not implemented yet!");
+
+  cpu_create_resource(host->id,
+                 host->power_peak,
+                 host->power_scale,
+                 host->power_trace,
+                 host->core_amount,
+                 host->initial_state,
+                 host->state_trace,
+                 host->properties);
 }
 
 static void add_traces_cpu(void)
@@ -124,8 +125,8 @@ static void add_traces_cpu(void)
 
 static void cpu_define_callbacks(void)
 {
-  surf_parse_host_add_cb(parse_cpu_init);
-  surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
+  sg_platf_host_add_cb(parse_cpu_init);
+  sg_platf_postparse_add_cb(add_traces_cpu);
 }
 
 static int cpu_resource_used(void *resource_id)
@@ -143,8 +144,7 @@ static int cpu_action_unref(surf_action_t action)
       lmm_variable_free(cpu_maxmin_system,
                         ((surf_action_cpu_Cas01_t) action)->variable);
 #ifdef HAVE_TRACING
-    if (action->category)
-      xbt_free(action->category);
+    xbt_free(action->category);
 #endif
     surf_action_free(&action);
     return 1;