Unify models apis

[simgrid.git] / src / surf / cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 1a08d36..089e373 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -30,20 +30,9 @@ surf_callback(void, CpuPtr) cpuDestructedCallbacks;
 surf_callback(void, CpuPtr, e_surf_resource_state_t, e_surf_resource_state_t) cpuStateChangedCallbacks;
 surf_callback(void, CpuActionPtr, e_surf_action_state_t, e_surf_action_state_t) cpuActionStateChangedCallbacks;
 
-void parse_cpu_init(sg_platf_host_cbarg_t host){
-  surf_cpu_model_pm->parseInit(host);
-}
-
-void add_traces_cpu(){
-  surf_cpu_model_pm->addTraces();
-}
-
-/*********
- * Model *
- *********/
-void CpuModel::parseInit(sg_platf_host_cbarg_t host)
-{
-  createResource(host->id,
+void cpu_parse_init(sg_platf_host_cbarg_t host){
+  surf_cpu_model_pm->createCpu(
+        host->id,
         host->power_peak,
         host->pstate,
         host->power_scale,
@@ -54,6 +43,13 @@ void CpuModel::parseInit(sg_platf_host_cbarg_t host)
         host->properties);
 }
 
+void cpu_add_traces(){
+  surf_cpu_model_pm->addTraces();
+}
+
+/*********
+ * Model *
+ *********/
 void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
 {
   CpuActionPtr action;