From: Martin Quinson Date: Sat, 9 Jan 2016 22:19:46 +0000 (+0100) Subject: Cosmetics: rename host::on to host::turnOn X-Git-Tag: v3_13~1303 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a23283368258c196be2e66730a7d691f313ef315 Cosmetics: rename host::on to host::turnOn --- diff --git a/include/simgrid/Host.hpp b/include/simgrid/Host.hpp index 3e82229ddf..42fa5ec1da 100644 --- a/include/simgrid/Host.hpp +++ b/include/simgrid/Host.hpp @@ -38,8 +38,8 @@ public: Host(std::string const& name); ~Host(); simgrid::xbt::string const& getName() const { return name_; } - void on(); - void off(); + void turnOn(); + void turnOff(); bool isOn(); bool isOff(); xbt_dict_t getProperties(); diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index 58a3ba5aa8..85bf83fedf 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -128,7 +128,7 @@ msg_host_t MSG_host_self(void) */ void MSG_host_on(msg_host_t host) { - host->on(); + host->turnOn(); } /** \ingroup m_host_management @@ -139,7 +139,7 @@ void MSG_host_on(msg_host_t host) */ void MSG_host_off(msg_host_t host) { - host->off(); + host->turnOff(); } /* diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp index 5f7b902494..f878ce80eb 100644 --- a/src/s4u/s4u_host.cpp +++ b/src/s4u/s4u_host.cpp @@ -53,10 +53,10 @@ const char* Host::name() { } void Host::turnOn() { - p_inferior->on(); + p_inferior->turnOn(); } void Host::turnOff() { - p_inferior->off(); + p_inferior->turnOff(); } bool Host::isOn() { return sg_host_is_on(p_inferior); diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp index af13e1a514..38d3e172be 100644 --- a/src/simgrid/host.cpp +++ b/src/simgrid/host.cpp @@ -177,13 +177,13 @@ Host::~Host() } /** Start the host if it is off */ -void Host::on() +void Host::turnOn() { simgrid::simix::kernel(std::bind(SIMIX_host_on, this)); } /** Stop the host if it is on */ -void Host::off() +void Host::turnOff() { /* Go to that function to follow the code flow through the simcall barrier */ if (0) simcall_HANDLER_host_off(&SIMIX_process_self()->simcall, this);