/** @ingroup SURF_callbacks
* @brief Callbacks fired after VM creation. Signature: `void(VirtualMachine*)`
*/
-extern XBT_PRIVATE surf_callback(void, simgrid::surf::VirtualMachine*) VMCreatedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks fired after VM destruction. Signature: `void(VirtualMachine*)`
*/
-extern XBT_PRIVATE surf_callback(void, simgrid::surf::VirtualMachine*) VMDestructedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMDestructedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks after VM State changes. Signature: `void(VirtualMachine*)`
*/
-extern XBT_PRIVATE surf_callback(void, simgrid::surf::VirtualMachine*) VMStateChangedCallbacks;
+extern XBT_PRIVATE simgrid::xbt::signal<void(simgrid::surf::VirtualMachine*)> VMStateChangedCallbacks;
/************
* Resource *
* @param model VMModel associated to this VM
* @param name The name of the VM
* @param props Dictionary of properties associated to this VM
- * @param netElm The RoutingEdge associated to this VM
- * @param cpu The Cpu associated to this VM
+ * @param host The host
*/
- VirtualMachine(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- RoutingEdge *netElm, Cpu *cpu);
+ VirtualMachine(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
+ simgrid::s4u::Host *host);
/** @brief Destructor */
~VirtualMachine();
- void setState(e_surf_resource_state_t state);
-
/** @brief Suspend the VM */
virtual void suspend()=0;
virtual void restore()=0;
/** @brief Migrate the VM to the destination host */
- virtual void migrate(surf_resource_t dest_PM)=0;
+ virtual void migrate(sg_host_t dest_PM)=0;
/** @brief Get the physical machine hosting the VM */
- virtual surf_resource_t getPm()=0;
+ sg_host_t getPm();
virtual void setBound(double bound)=0;
virtual void setAffinity(Cpu *cpu, unsigned long mask)=0;
/* The vm object of the lower layer */
CpuAction *p_action;
- Host *p_subWs;
- e_surf_vm_state_t p_currentState;
+ simgrid::s4u::Host *p_hostPM;
+
+ void turnOn() override;
+ void turnOff() override;
+
+public:
+ e_surf_vm_state_t getState();
+ void setState(e_surf_vm_state_t state);
+protected:
+ e_surf_vm_state_t p_vm_state = SURF_VM_STATE_CREATED;
+
+
public:
boost::intrusive::list_member_hook<> vm_hook;
};
VMModel() :HostModel(){}
~VMModel(){};
- Host *createHost(const char *name, RoutingEdge *netElm, Cpu *cpu){DIE_IMPOSSIBLE;}
-
/**
* @brief Create a new VM
*
* @param host_PM The real machine hosting the VM
*
*/
- virtual VirtualMachine *createVM(const char *name, surf_resource_t host_PM)=0;
+ virtual VirtualMachine *createVM(const char *name, sg_host_t host_PM)=0;
void adjustWeightOfDummyCpuActions() {};
typedef boost::intrusive::member_hook<
static vm_list_t ws_vms;
};
-/**********
- * Action *
- **********/
-
}
}