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
Revert "remove a C-like pimple"
[simgrid.git]
/
src
/
surf
/
host_interface.cpp
diff --git
a/src/surf/host_interface.cpp
b/src/surf/host_interface.cpp
index
8772f95
..
a4367e1
100644
(file)
--- a/
src/surf/host_interface.cpp
+++ b/
src/surf/host_interface.cpp
@@
-31,10
+31,7
@@
void host_add_traces(){
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID =
- simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
- static_cast<simgrid::surf::Host*>(h)->destroy();
- });
+simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
/*********
* Model *
/*********
* Model *
@@
-42,8
+39,7
@@
simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID =
Host *HostModel::createHost(const char *name,NetCard *netElm, Cpu *cpu, xbt_dict_t props){
xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL);
Host *HostModel::createHost(const char *name,NetCard *netElm, Cpu *cpu, xbt_dict_t props){
xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL);
- Host *host = new simgrid::surf::Host(surf_host_model, name, props,
- storageList, netElm, cpu);
+ Host *host = new simgrid::surf::Host(surf_host_model, name, props, storageList, cpu);
XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
return host;
}
XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
return host;
}
@@
-88,22
+84,31
@@
void HostModel::adjustWeightOfDummyCpuActions()
************/
simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onCreation;
simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onDestruction;
************/
simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onCreation;
simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onDestruction;
-simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> Host::onStateChange;
+simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onStateChange;
+
+void Host::classInit()
+{
+ if (!EXTENSION_ID.valid()) {
+ EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
+ static_cast<simgrid::surf::Host*>(h)->destroy();
+ });
+ }
+}
Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- xbt_dynar_t storage,
NetCard *netElm,
Cpu *cpu)
+ xbt_dynar_t storage, Cpu *cpu)
: Resource(model, name)
, PropertyHolder(props)
: Resource(model, name)
, PropertyHolder(props)
- , p_storage(storage), p_
netElm(netElm), p_
cpu(cpu)
+ , p_storage(storage), p_cpu(cpu)
{
p_params.ramsize = 0;
}
Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
{
p_params.ramsize = 0;
}
Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
- xbt_dynar_t storage,
NetCard *netElm,
Cpu *cpu)
+ xbt_dynar_t storage, Cpu *cpu)
: Resource(model, name, constraint)
, PropertyHolder(props)
: Resource(model, name, constraint)
, PropertyHolder(props)
- , p_storage(storage), p_
netElm(netElm), p_
cpu(cpu)
+ , p_storage(storage), p_cpu(cpu)
{
p_params.ramsize = 0;
}
{
p_params.ramsize = 0;
}
@@
-115,7
+120,7
@@
Host::~Host()
delete p_cpu;
// FIXME: VM plays strange games, leading to segfaults if I do the expected thing of next line
// delete p_netElm;
delete p_cpu;
// FIXME: VM plays strange games, leading to segfaults if I do the expected thing of next line
// delete p_netElm;
- delete p_storage;
+
//
delete p_storage;
}
/** @brief Fire the require callbacks and destroy the object
*
}
/** @brief Fire the require callbacks and destroy the object
*
@@
-139,16
+144,24
@@
void Host::attach(simgrid::Host* host)
onCreation(this);
}
onCreation(this);
}
-
e_surf_resource_state_t Host::getState
() {
- return p_cpu->
getState
();
+
bool Host::isOn
() {
+ return p_cpu->
isOn
();
}
}
-void Host::setState(e_surf_resource_state_t state){
- e_surf_resource_state_t old = Resource::getState();
- Resource::setState(state);
- onStateChange(this, old, state);
- p_cpu->setState(state);
+bool Host::isOff() {
+ return p_cpu->isOff();
+}
+void Host::turnOn(){
+ if (isOff()) {
+ p_cpu->turnOn();
+ onStateChange(this);
+ }
+}
+void Host::turnOff(){
+ if (isOn()) {
+ p_cpu->turnOff();
+ onStateChange(this);
+ }
}
}
-
simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
{
simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
{