Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI

[simgrid.git] / src / s4u / s4u_host.cpp

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index ee6ea5b..b9d83b4 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -44,11 +44,11 @@ Host *Host::current(){
        if (smx_proc == NULL)
                xbt_die("Cannot call Host::current() from the maestro context");
 
-       return Host::byName(SIMIX_host_get_name(SIMIX_process_get_host(smx_proc)));
+       return Host::byName(sg_host_get_name(SIMIX_process_get_host(smx_proc)));
 }
 
 const char* Host::name() {
-       return sg_host_name(p_inferior);
+       return sg_host_get_name(p_inferior);
 }
 
 void Host::turnOn() {
@@ -58,7 +58,7 @@ void Host::turnOff() {
        simcall_host_off(p_inferior);
 }
 bool Host::isOn() {
-       return simcall_host_get_state(p_inferior);
+       return sg_host_get_state(p_inferior);
 }
 
 boost::unordered_map<std::string, Storage&> &Host::mountedStorages() {