A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unify the naming of that property
[simgrid.git]
/
src
/
s4u
/
s4u_host.cpp
diff --git
a/src/s4u/s4u_host.cpp
b/src/s4u/s4u_host.cpp
index
7b9c90b
..
66a13a9
100644
(file)
--- a/
src/s4u/s4u_host.cpp
+++ b/
src/s4u/s4u_host.cpp
@@
-14,14
+14,15
@@
#include "src/surf/HostImpl.hpp"
#include "xbt/log.h"
#include "src/msg/msg_private.h"
#include "src/surf/HostImpl.hpp"
#include "xbt/log.h"
#include "src/msg/msg_private.h"
-#include "src/simix/
smx_process_private.h
"
+#include "src/simix/
ActorImpl.hpp
"
#include "src/simix/smx_private.h"
#include "src/surf/cpu_interface.hpp"
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.hpp"
#include "src/simix/smx_private.h"
#include "src/surf/cpu_interface.hpp"
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.hpp"
+xbt_dict_t host_list = nullptr; // FIXME: make it a static field of Host
+
int MSG_HOST_LEVEL = -1;
int MSG_HOST_LEVEL = -1;
-int SIMIX_HOST_LEVEL = -1;
int USER_HOST_LEVEL = -1;
namespace simgrid {
int USER_HOST_LEVEL = -1;
namespace simgrid {
@@
-56,6
+57,12
@@
Host *Host::by_name(std::string name) {
}
Host* Host::by_name_or_null(const char* name)
{
}
Host* Host::by_name_or_null(const char* name)
{
+ if (host_list == nullptr)
+ host_list = xbt_dict_new_homogeneous([](void*p) {
+ simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);
+ simgrid::s4u::Host::onDestruction(*host);
+ delete host;
+ });
return (Host*) xbt_dict_get_or_null(host_list, name);
}
Host* Host::by_name_or_create(const char* name)
return (Host*) xbt_dict_get_or_null(host_list, name);
}
Host* Host::by_name_or_create(const char* name)
@@
-69,18
+76,25
@@
Host* Host::by_name_or_create(const char* name)
}
Host *Host::current(){
}
Host *Host::current(){
- smx_
process
_t smx_proc = SIMIX_process_self();
+ smx_
actor
_t smx_proc = SIMIX_process_self();
if (smx_proc == nullptr)
xbt_die("Cannot call Host::current() from the maestro context");
if (smx_proc == nullptr)
xbt_die("Cannot call Host::current() from the maestro context");
- return
SIMIX_process_get_host(smx_proc)
;
+ return
smx_proc->host
;
}
void Host::turnOn() {
}
void Host::turnOn() {
- simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
+ if (isOff()) {
+ simgrid::simix::kernelImmediate([&]{
+ this->extension<simgrid::simix::Host>()->turnOn();
+ this->extension<simgrid::surf::HostImpl>()->turnOn();
+ });
+ }
}
void Host::turnOff() {
}
void Host::turnOff() {
- simgrid::simix::kernel(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+ if (isOn()) {
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_host_off, this, SIMIX_process_self()));
+ }
}
bool Host::isOn() {
}
bool Host::isOn() {
@@
-111,7
+125,7
@@
boost::unordered_map<std::string, Storage*> const& Host::mountedStorages() {
/** Get the properties assigned to a host */
xbt_dict_t Host::properties() {
/** Get the properties assigned to a host */
xbt_dict_t Host::properties() {
- return simgrid::simix::kernel([&] {
+ return simgrid::simix::kernel
Immediate
([&] {
simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
return surf_host->getProperties();
});
simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
return surf_host->getProperties();
});
@@
-123,7
+137,7
@@
const char*Host::property(const char*key) {
return surf_host->getProperty(key);
}
void Host::setProperty(const char*key, const char *value){
return surf_host->getProperty(key);
}
void Host::setProperty(const char*key, const char *value){
- simgrid::simix::kernel([&] {
+ simgrid::simix::kernel
Immediate
([&] {
simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
surf_host->setProperty(key,value);
});
simgrid::surf::HostImpl* surf_host = this->extension<simgrid::surf::HostImpl>();
surf_host->setProperty(key,value);
});
@@
-132,24
+146,24
@@
void Host::setProperty(const char*key, const char *value){
/** Get the processes attached to the host */
xbt_swag_t Host::processes()
{
/** Get the processes attached to the host */
xbt_swag_t Host::processes()
{
- return simgrid::simix::kernel([&]() {
- return
((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL)
)->process_list;
+ return simgrid::simix::kernel
Immediate
([&]() {
+ return
this->extension<simgrid::simix::Host>(
)->process_list;
});
}
/** Get the peak power of a host */
});
}
/** Get the peak power of a host */
-double Host::
currentPowerPeak
()
+double Host::
getPstateSpeedCurrent
()
{
{
- return simgrid::simix::kernel([&] {
- return this->pimpl_cpu->get
CurrentPowerPeak
();
+ return simgrid::simix::kernel
Immediate
([&] {
+ return this->pimpl_cpu->get
PstateSpeedCurrent
();
});
}
/** Get one power peak (in flops/s) of a host at a given pstate */
});
}
/** Get one power peak (in flops/s) of a host at a given pstate */
-double Host::
powerPeakAt
(int pstate_index)
+double Host::
getPstateSpeed
(int pstate_index)
{
{
- return simgrid::simix::kernel([&] {
- return this->pimpl_cpu->getP
owerPeakAt
(pstate_index);
+ return simgrid::simix::kernel
Immediate
([&] {
+ return this->pimpl_cpu->getP
stateSpeed
(pstate_index);
});
}
});
}
@@
-158,14
+172,14
@@
double Host::speed() {
return pimpl_cpu->getSpeed(1.0);
}
/** @brief Returns the number of core of the processor. */
return pimpl_cpu->getSpeed(1.0);
}
/** @brief Returns the number of core of the processor. */
-int Host::core
_c
ount() {
- return pimpl_cpu->
getCore
();
+int Host::core
C
ount() {
+ return pimpl_cpu->
coreCount
();
}
/** @brief Set the pstate at which the host should run */
void Host::setPstate(int pstate_index)
{
}
/** @brief Set the pstate at which the host should run */
void Host::setPstate(int pstate_index)
{
- simgrid::simix::kernel(std::bind(
+ simgrid::simix::kernel
Immediate
(std::bind(
&simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
));
}
&simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
));
}
@@
-177,14
+191,14
@@
int Host::pstate()
void Host::parameters(vm_params_t params)
{
void Host::parameters(vm_params_t params)
{
- simgrid::simix::kernel([&]() {
+ simgrid::simix::kernel
Immediate
([&]() {
this->extension<simgrid::surf::HostImpl>()->getParams(params);
});
}
void Host::setParameters(vm_params_t params)
{
this->extension<simgrid::surf::HostImpl>()->getParams(params);
});
}
void Host::setParameters(vm_params_t params)
{
- simgrid::simix::kernel([&]() {
+ simgrid::simix::kernel
Immediate
([&]() {
this->extension<simgrid::surf::HostImpl>()->setParams(params);
});
}
this->extension<simgrid::surf::HostImpl>()->setParams(params);
});
}
@@
-196,7
+210,7
@@
void Host::setParameters(vm_params_t params)
*/
xbt_dict_t Host::mountedStoragesAsDict()
{
*/
xbt_dict_t Host::mountedStoragesAsDict()
{
- return simgrid::simix::kernel([&] {
+ return simgrid::simix::kernel
Immediate
([&] {
return this->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
});
}
return this->extension<simgrid::surf::HostImpl>()->getMountedStorageList();
});
}
@@
-208,7
+222,7
@@
xbt_dict_t Host::mountedStoragesAsDict()
*/
xbt_dynar_t Host::attachedStorages()
{
*/
xbt_dynar_t Host::attachedStorages()
{
- return simgrid::simix::kernel([&] {
+ return simgrid::simix::kernel
Immediate
([&] {
return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
});
}
return this->extension<simgrid::surf::HostImpl>()->getAttachedStorageList();
});
}