#include "host_interface.hpp"
-#include <simgrid/Host.hpp>
+#include <simgrid/s4u/host.hpp>
#include "src/simix/smx_private.h"
#include "cpu_cas01.hpp"
simgrid::surf::HostModel *surf_host_model = NULL;
-void host_add_traces(){
- surf_host_model->addTraces();
-}
-
/*************
* Callbacks *
*************/
namespace simgrid {
namespace surf {
-simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
+simgrid::xbt::Extension<simgrid::s4u::Host, Host> Host::EXTENSION_ID;
/*********
* Model *
*********/
-Host *HostModel::createHost(const char *name,RoutingEdge *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 *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, cpu);
XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
return host;
}
iter != VMModel::ws_vms.end(); ++iter) {
VirtualMachine *ws_vm = &*iter;
- CpuCas01 *cpu_cas01 = static_cast<CpuCas01*>(ws_vm->p_cpu);
- xbt_assert(cpu_cas01, "cpu-less host");
+ Cpu *cpu = ws_vm->p_cpu;
- int is_active = lmm_constraint_used(cpu_cas01->getModel()->getMaxminSystem(), cpu_cas01->getConstraint());
- // int is_active_old = constraint_is_active(cpu_cas01);
+ int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint());
if (is_active) {
/* some tasks exist on this VM */
}
}
+Action *HostModel::executeParallelTask(int host_nb,
+ sg_host_t *host_list,
+ double *flops_amount,
+ double *bytes_amount,
+ double rate){
+#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
+ Action *action =NULL;
+ if ((host_nb == 1)
+ && (cost_or_zero(bytes_amount, 0) == 0.0)){
+ action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
+ } else if ((host_nb == 1)
+ && (cost_or_zero(flops_amount, 0) == 0.0)) {
+ action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
+ host_list[0]->pimpl_netcard,
+ bytes_amount[0], rate);
+ } else if ((host_nb == 2)
+ && (cost_or_zero(flops_amount, 0) == 0.0)
+ && (cost_or_zero(flops_amount, 1) == 0.0)) {
+ int i,nb = 0;
+ double value = 0.0;
+
+ for (i = 0; i < host_nb * host_nb; i++) {
+ if (cost_or_zero(bytes_amount, i) > 0.0) {
+ nb++;
+ value = cost_or_zero(bytes_amount, i);
+ }
+ }
+ if (nb == 1){
+ action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
+ host_list[1]->pimpl_netcard,
+ value, rate);
+ }
+ } else
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts */
+#undef cost_or_zero
+ xbt_free(host_list);
+ return action;
+}
+
/************
* Resource *
************/
-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;
+
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();
- });
- SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
+ EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::Host>();
}
}
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
+ xbt_dynar_t storage, Cpu *cpu)
: 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,
- xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
+ xbt_dynar_t storage, Cpu *cpu)
: 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;
}
/** @brief use destroy() instead of this destructor */
Host::~Host()
{
- xbt_assert(currentlyDestroying_, "Don't delete Hosts directly. Call destroy() instead.");
-}
-/** @brief Fire the require callbacks and destroy the object
- *
- * Don't delete directly an Host, call h->destroy() instead.
- */
-void Host::destroy()
-{
- if (!currentlyDestroying_) {
- currentlyDestroying_ = true;
- onDestruction(this);
- delete this;
- }
}
-void Host::attach(simgrid::Host* host)
+void Host::attach(simgrid::s4u::Host* host)
{
if (p_host != nullptr)
- xbt_die("Already attached to host %s", host->getName().c_str());
+ xbt_die("Already attached to host %s", host->name().c_str());
host->extension_set(this);
p_host = host;
- 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();
}
-
-Action *Host::execute(double size) {
- return p_cpu->execute(size);
+void Host::turnOn(){
+ if (isOff()) {
+ p_cpu->turnOn();
+ simgrid::s4u::Host::onStateChange(*this->p_host);
+ }
}
-Action *Host::sleep(double duration) {
- return p_cpu->sleep(duration);
+void Host::turnOff(){
+ if (isOn()) {
+ p_cpu->turnOff();
+ simgrid::s4u::Host::onStateChange(*this->p_host);
+ }
}
-
simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
{
simgrid::surf::Storage *st = NULL;