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
Simplify the code taking Cpu::m_speedPeak changes into account
[simgrid.git]
/
src
/
surf
/
host_interface.cpp
diff --git
a/src/surf/host_interface.cpp
b/src/surf/host_interface.cpp
index
50afd76
..
a639622
100644
(file)
--- a/
src/surf/host_interface.cpp
+++ b/
src/surf/host_interface.cpp
@@
-36,7
+36,7
@@
simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
/*********
* Model *
*********/
/*********
* Model *
*********/
-Host *HostModel::createHost(const char *name,
RoutingEdge
*netElm, Cpu *cpu, xbt_dict_t props){
+Host *HostModel::createHost(const char *name,
NetCard
*netElm, Cpu *cpu, xbt_dict_t props){
Host *host = new simgrid::surf::Host(surf_host_model, name, props,
(xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
netElm, cpu);
Host *host = new simgrid::surf::Host(surf_host_model, name, props,
(xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
netElm, cpu);
@@
-92,12
+92,11
@@
void Host::classInit()
EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
static_cast<simgrid::surf::Host*>(h)->destroy();
});
EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
static_cast<simgrid::surf::Host*>(h)->destroy();
});
- SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
}
}
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,
RoutingEdge
*netElm, Cpu *cpu)
+ xbt_dynar_t storage,
NetCard
*netElm, Cpu *cpu)
: Resource(model, name)
, PropertyHolder(props)
, p_storage(storage), p_netElm(netElm), p_cpu(cpu)
: Resource(model, name)
, PropertyHolder(props)
, p_storage(storage), p_netElm(netElm), p_cpu(cpu)
@@
-106,7
+105,7
@@
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, lmm_constraint_t constraint,
}
Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
- xbt_dynar_t storage,
RoutingEdge
*netElm, Cpu *cpu)
+ xbt_dynar_t storage,
NetCard
*netElm, Cpu *cpu)
: Resource(model, name, constraint)
, PropertyHolder(props)
, p_storage(storage), p_netElm(netElm), p_cpu(cpu)
: Resource(model, name, constraint)
, PropertyHolder(props)
, p_storage(storage), p_netElm(netElm), p_cpu(cpu)
@@
-151,15
+150,6
@@
void Host::setState(e_surf_resource_state_t state){
p_cpu->setState(state);
}
p_cpu->setState(state);
}
-Action *Host::execute(double size) {
- xbt_assert(0,"FIXME: DEADCODE");
- return p_cpu->execute(size);
-}
-Action *Host::sleep(double duration) {
- xbt_assert(0,"FIXME: DEADCODE");
- return p_cpu->sleep(duration);
-}
-
simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
{
simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
{