/*********
* Model *
*********/
-HostImpl *HostModel::createHost(const char *name,NetCard *netElm, Cpu *cpu){
+HostImpl *HostModel::createHost(const char *name, NetCard *netElm, Cpu *cpu){
xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL);
HostImpl *host = new simgrid::surf::HostImpl(surf_host_model, name, storageList, cpu);
/* FIXME: we should use lmm_update_variable_weight() ? */
/* FIXME: If we assign 1.05 and 0.05, the system makes apparently wrong values. */
- ws_vm->p_action->setPriority(1);
+ ws_vm->action_->setPriority(1);
} else {
/* no task exits on this VM */
XBT_DEBUG("set the weight of the dummy CPU action on PM to 0");
- ws_vm->p_action->setPriority(0);
+ ws_vm->action_->setPriority(0);
}
}
}
iter != simgrid::surf::VMModel::ws_vms.end(); ++iter) {
simgrid::surf::VirtualMachine *ws_vm = &*iter;
- if (this == ws_vm->p_hostPM->extension(simgrid::surf::HostImpl::EXTENSION_ID))
+ if (this == ws_vm->getPm()->extension(simgrid::surf::HostImpl::EXTENSION_ID))
xbt_dynar_push(dyn, &ws_vm);
}
namespace simgrid {
namespace surf {
- class NetworkModel;
class NetworkAction;
- /*************
- * Callbacks *
- *************/
-
-
/** @brief Callback signal fired when the state of a NetworkAction changes
* Signature: `void(NetworkAction *action, simgrid::surf::Action::State old, simgrid::surf::Action::State current)` */
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::Action::State, simgrid::surf::Action::State)>) networkActionStateChangedCallbacks;
- }
+ }
}
/*********
* Model *
* @param bandwidth The initial bandwidth of the Link in bytes per second
* @param latency The initial latency of the Link in seconds
* @param policy The sharing policy of the Link
- * @param properties Dictionary of properties associated to this Resource
- * @return The created Link
*/
virtual Link* createLink(const char *name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0;
/**
* @brief Create a communication between two hosts.
* @details It makes calls to the routing part, and execute the communication
- * between the two end points.
+ * between the two end points.
*
* @param src The source of the communication
* @param dst The destination of the communication
public simgrid::surf::Resource,
public simgrid::surf::PropertyHolder {
public:
- /**
- * @brief Link constructor
- *
- * @param model The NetworkModel associated to this Link
- * @param name The name of the Link
- * @param props Dictionary of properties associated to this Link
- */
- Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props);
- /**
- * @brief Link constructor
- *
- * @param model The NetworkModel associated to this Link
- * @param name The name of the Link
- * @param props Dictionary of properties associated to this Link
- * @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
- */
+ /** @brief Constructor of non-LMM links */
+ Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props);
+ /** @brief Constructor of LMM links */
Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint);
/* Link destruction logic */
VirtualMachine::VirtualMachine(HostModel *model, const char *name, simgrid::s4u::Host *hostPM)
: HostImpl(model, name, NULL, NULL, NULL)
-, p_hostPM(hostPM)
+, hostPM_(hostPM)
{
VMModel::ws_vms.push_back(*this);
simgrid::s4u::Host::by_name_or_create(name)->extension_set<simgrid::surf::HostImpl>(this);
VMDestructedCallbacks(this);
VMModel::ws_vms.erase(VMModel::vm_list_t::s_iterator_to(*this));
/* Free the cpu_action of the VM. */
- XBT_ATTRIB_UNUSED int ret = p_action->unref();
+ XBT_ATTRIB_UNUSED int ret = action_->unref();
xbt_assert(ret == 1, "Bug: some resource still remains");
}
/** @brief returns the physical machine on which the VM is running **/
sg_host_t VirtualMachine::getPm() {
- return p_hostPM;
+ return hostPM_;
}
}
*/
class VirtualMachine : public HostImpl {
public:
- /**
- * @brief Constructor
- *
- * @param model VMModel associated to this VM
- * @param name The name of the VM
- * @param host The host
- */
VirtualMachine(simgrid::surf::HostModel *model, const char *name, simgrid::s4u::Host *host);
-
- /** @brief Destructor */
~VirtualMachine();
/** @brief Suspend the VM */
virtual void setAffinity(Cpu *cpu, unsigned long mask)=0;
/* The vm object of the lower layer */
- CpuAction *p_action;
- simgrid::s4u::Host *p_hostPM;
+ CpuAction *action_;
+protected:
+ simgrid::s4u::Host *hostPM_;
+public:
void turnOn() override;
void turnOff() override;
-public:
e_surf_vm_state_t getState();
void setState(e_surf_vm_state_t state);
protected:
Cpu *cpu = ws_vm->p_cpu;
xbt_assert(cpu, "cpu-less host");
- double solved_value = ws_vm->p_action->getVariable()->value;
- XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getName(), ws_vm->p_hostPM->name().c_str());
+ double solved_value = ws_vm->action_->getVariable()->value;
+ XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getName(), ws_vm->getPm()->name().c_str());
// TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution.
// cpu_cas01->constraint->bound = solved_value;
/* We create cpu_action corresponding to a VM process on the host operating system. */
/* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
- p_action = sub_cpu->execution_start(0);
+ action_ = sub_cpu->execution_start(0);
- XBT_VERB("Create VM(%s)@PM(%s) with %ld mounted disks", name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage));
+ XBT_VERB("Create VM(%s)@PM(%s) with %ld mounted disks", name, hostPM_->name().c_str(), xbt_dynar_length(p_storage));
}
void VMHL13::suspend()
{
- p_action->suspend();
+ action_->suspend();
p_vm_state = SURF_VM_STATE_SUSPENDED;
}
void VMHL13::resume()
{
- p_action->resume();
+ action_->resume();
p_vm_state = SURF_VM_STATE_RUNNING;
}
p_vm_state = SURF_VM_STATE_SAVING;
/* FIXME: do something here */
- p_action->suspend();
+ action_->suspend();
p_vm_state = SURF_VM_STATE_SAVED;
}
p_vm_state = SURF_VM_STATE_RESTORING;
/* FIXME: do something here */
- p_action->resume();
+ action_->resume();
p_vm_state = SURF_VM_STATE_RUNNING;
}
{
HostImpl *surfHost_dst = host_dest->extension<HostImpl>();
const char *vm_name = getName();
- const char *pm_name_src = p_hostPM->name().c_str();
+ const char *pm_name_src = hostPM_->name().c_str();
const char *pm_name_dst = surfHost_dst->getName();
/* update net_elm with that of the destination physical host */
sg_host_by_name(vm_name)->pimpl_netcard = sg_host_by_name(pm_name_dst)->pimpl_netcard;
- p_hostPM = host_dest;
+ hostPM_ = host_dest;
/* Update vcpu's action for the new pm */
{
/* create a cpu action bound to the pm model at the destination. */
CpuAction *new_cpu_action = static_cast<CpuAction*>(host_dest->pimpl_cpu->execution_start(0));
- Action::State state = p_action->getState();
+ Action::State state = action_->getState();
if (state != Action::State::done)
XBT_CRITICAL("FIXME: may need a proper handling, %d", static_cast<int>(state));
- if (p_action->getRemainsNoUpdate() > 0)
- XBT_CRITICAL("FIXME: need copy the state(?), %f", p_action->getRemainsNoUpdate());
+ if (action_->getRemainsNoUpdate() > 0)
+ XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->getRemainsNoUpdate());
/* keep the bound value of the cpu action of the VM. */
- double old_bound = p_action->getBound();
+ double old_bound = action_->getBound();
if (old_bound != 0) {
XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst);
new_cpu_action->setBound(old_bound);
}
- XBT_ATTRIB_UNUSED int ret = p_action->unref();
+ XBT_ATTRIB_UNUSED int ret = action_->unref();
xbt_assert(ret == 1, "Bug: some resource still remains");
- p_action = new_cpu_action;
+ action_ = new_cpu_action;
}
XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst);
}
void VMHL13::setBound(double bound){
- p_action->setBound(bound);
+ action_->setBound(bound);
}
void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){
- p_action->setAffinity(cpu, mask);
+ action_->setAffinity(cpu, mask);
}
}
