From 54c01fbf2d86535eec63e10421a9655d00a2170f Mon Sep 17 00:00:00 2001
From: coldpeace <coldpeace@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 23 Jul 2010 13:00:14 +0000
Subject: [PATCH 1/1] declare create_resource callback for other CPU models

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8055 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/surf/cpu.c    | 12 ++++++++++++
 src/surf/cpu_ti.c | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index 07761ee09e..eee410728e 100644
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -378,6 +378,17 @@ static double cpu_get_available_speed(void *cpu)
   return ((cpu_Cas01_t) cpu)->power_scale;
 }
 
+static void cpu_create_resource(char *name, double power_peak,
+        double power_scale,
+        tmgr_trace_t power_trace,
+        e_surf_resource_state_t state_initial,
+        tmgr_trace_t state_trace,
+        xbt_dict_t cpu_properties)
+{
+	cpu_new(name,power_peak,power_scale,power_trace,
+					  state_initial,state_trace,cpu_properties);
+}
+
 static void cpu_finalize(void)
 {
   lmm_system_free(cpu_maxmin_system);
@@ -425,6 +436,7 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->extension.cpu.get_state = cpu_get_state;
   surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
   surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed;
+  surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
 
   if (!cpu_maxmin_system)
     cpu_maxmin_system = lmm_system_new();
diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c
index a3bfa2fc7b..e89313842c 100644
--- a/src/surf/cpu_ti.c
+++ b/src/surf/cpu_ti.c
@@ -725,6 +725,17 @@ static double cpu_ti_get_available_speed(void *cpu)
   return CPU->power_scale;
 }
 
+static void cpu_ti_create_resource(char *name, double power_peak,
+        double power_scale,
+        tmgr_trace_t power_trace,
+        e_surf_resource_state_t state_initial,
+        tmgr_trace_t state_trace,
+        xbt_dict_t cpu_properties)
+{
+	cpu_ti_new(name,power_peak,power_scale,power_trace,
+					  state_initial,state_trace,cpu_properties);
+}
+
 static void cpu_ti_finalize(void)
 {
   void *cpu;
@@ -783,6 +794,7 @@ static void surf_cpu_ti_model_init_internal(void)
   surf_cpu_model->extension.cpu.get_state = cpu_ti_get_state;
   surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed;
   surf_cpu_model->extension.cpu.get_available_speed = cpu_ti_get_available_speed;
+  surf_cpu_model->extension.cpu.create_resource = cpu_ti_create_resource;
 
   cpu_ti_action_heap = xbt_heap_new(8, NULL);
   xbt_heap_set_update_callback(cpu_ti_action_heap, cpu_ti_action_update_index_heap);
-- 
2.20.1