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
Merge branches, and adapt the new code to the new refactoring.
[simgrid.git]
/
src
/
s4u
/
s4u_host.cpp
diff --git
a/src/s4u/s4u_host.cpp
b/src/s4u/s4u_host.cpp
index
0d3cad4
..
66a13a9
100644
(file)
--- a/
src/s4u/s4u_host.cpp
+++ b/
src/s4u/s4u_host.cpp
@@
-20,8
+20,9
@@
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/storage.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)
@@
-76,11
+83,18
@@
Host *Host::current(){
}
void Host::turnOn() {
}
void Host::turnOn() {
- simgrid::simix::kernelImmediate(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::kernelImmediate(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() {
@@
-133,7
+147,7
@@
void Host::setProperty(const char*key, const char *value){
xbt_swag_t Host::processes()
{
return simgrid::simix::kernelImmediate([&]() {
xbt_swag_t Host::processes()
{
return simgrid::simix::kernelImmediate([&]() {
- return
((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL)
)->process_list;
+ return
this->extension<simgrid::simix::Host>(
)->process_list;
});
}
});
}
@@
-158,8
+172,8
@@
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
s
Count() {
- return pimpl_cpu->
getCore
();
+int Host::coreCount() {
+ return pimpl_cpu->
coreCount
();
}
/** @brief Set the pstate at which the host should run */
}
/** @brief Set the pstate at which the host should run */