#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::Host::extension_create<simgrid::surf::Host>([](void *h) {
- static_cast<simgrid::surf::Host*>(h)->destroy();
- });
+simgrid::xbt::Extension<simgrid::s4u::Host, Host> Host::EXTENSION_ID;
/*********
* Model *
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;
}
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*)> Host::onStateChange;
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- xbt_dynar_t storage, NetCard *netElm, Cpu *cpu)
+
+void Host::classInit()
+{
+ if (!EXTENSION_ID.valid()) {
+ EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::Host>();
+ }
+}
+
+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, NetCard *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.");
- 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;
-}
-/** @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);
}
bool Host::isOn() {
void Host::turnOn(){
if (isOff()) {
p_cpu->turnOn();
- onStateChange(this);
+ simgrid::s4u::Host::onStateChange(*this->p_host);
}
}
void Host::turnOff(){
if (isOn()) {
p_cpu->turnOff();
- onStateChange(this);
+ simgrid::s4u::Host::onStateChange(*this->p_host);
}
}
xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL);
xbt_lib_foreach(storage_lib, cursor, key, data) {
if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) {
- simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
- if(!strcmp((const char*)storage->p_attach,this->getName())){
- xbt_dynar_push_as(result, void *, (void*)storage->getName());
- }
- }
+ simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL));
+ if(!strcmp((const char*)storage->p_attach,this->getName())){
+ xbt_dynar_push_as(result, void *, (void*)storage->getName());
+ }
+ }
}
return result;
}
}
if(longest_prefix_length>0)
{ /* Mount point found, split fullpath into mount_name and path+filename*/
- path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1));
- mount_name = (char *) xbt_malloc ((longest_prefix_length+1));
- strncpy(mount_name, fullpath, longest_prefix_length+1);
- strncpy(path, fullpath+longest_prefix_length, strlen(fullpath)-longest_prefix_length+1);
- path[strlen(fullpath)-longest_prefix_length] = '\0';
- mount_name[longest_prefix_length] = '\0';
+ path = (char *) xbt_malloc ((strlen(fullpath)-longest_prefix_length+1));
+ mount_name = (char *) xbt_malloc ((longest_prefix_length+1));
+ strncpy(mount_name, fullpath, longest_prefix_length+1);
+ strncpy(path, fullpath+longest_prefix_length, strlen(fullpath)-longest_prefix_length+1);
+ path[strlen(fullpath)-longest_prefix_length] = '\0';
+ mount_name[longest_prefix_length] = '\0';
}
else
xbt_die("Can't find mount point for '%s' on '%s'", fullpath, getName());