/*********
* Tools *
*********/
+
XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model;
XBT_PUBLIC(void) host_add_traces();
HostModel() : Model() {}
~HostModel() {}
- virtual Host *createHost(const char *name, RoutingEdge *net, Cpu *cpu, xbt_dict_t props)=0;
+ Host *createHost(const char *name, NetCard *net, Cpu *cpu, xbt_dict_t props);
void addTraces() override {DIE_IMPOSSIBLE;}
virtual void adjustWeightOfDummyCpuActions();
* @brief SURF Host interface class
* @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
*/
-class Host : public simgrid::surf::Resource,
- public simgrid::surf::PropertyHolder {
+class Host :
+ public simgrid::surf::Resource,
+ public simgrid::surf::PropertyHolder {
public:
- static simgrid::xbt::Extension<simgrid::Host, Host> EXTENSION_ID;
-
- /* callbacks */
- static simgrid::surf::signal<void(Host*)> onCreation; /** Called on each newly created object */
- static simgrid::surf::signal<void(Host*)> onDestruction; /** Called just before destructing an object */
- static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> onStateChange;
+ static simgrid::xbt::Extension<simgrid::s4u::Host, Host> EXTENSION_ID;
public:
- static void classInit();
+ static void classInit(); // must be called before the first use of that class
/**
* @brief Host constructor
*
* @param name The name of the Host
* @param props Dictionary of properties associated to this Host
* @param storage The Storage associated to this Host
- * @param netElm The RoutingEdge associated to this Host
* @param cpu The Cpu associated to this Host
*/
- Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu);
+ Host(HostModel *model, const char *name, xbt_dict_t props,
+ xbt_dynar_t storage, Cpu *cpu);
/**
* @brief Host constructor
* @param props Dictionary of properties associated to this Host
* @param constraint The lmm constraint associated to this Host if it is part of a LMM component
* @param storage The Storage associated to this Host
- * @param netElm The RoutingEdge associated to this Host
* @param cpu The Cpu associated to this 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(HostModel *model, const char *name, xbt_dict_t props,
+ lmm_constraint_t constraint, xbt_dynar_t storage, Cpu *cpu);
/* Host destruction logic */
/**************************/
-protected:
~Host();
-public:
- void destroy(); // Must be called instead of the destructor
-private:
- bool currentlyDestroying_ = false;
-
public:
- void attach(simgrid::Host* host);
- void setState(e_surf_resource_state_t state);
-
- /**
- * @brief Execute some quantity of computation
- *
- * @param flops_amount The value of the processing amount (in flop) needed to process
- * @return The CpuAction corresponding to the processing
- * @see Cpu
- */
- virtual Action *execute(double flops_amount)=0;
+ HostModel *getModel()
+ {
+ return static_cast<HostModel*>(Resource::getModel());
+ }
+ void attach(simgrid::s4u::Host* host);
- /**
- * @brief Make a process sleep for duration seconds
- *
- * @param duration The number of seconds to sleep
- * @return The CpuAction corresponding to the sleeping
- * @see Cpu
- */
- virtual Action *sleep(double duration)=0;
+ bool isOn() override;
+ bool isOff() override;
+ void turnOn() override;
+ void turnOff() override;
/** @brief Return the storage of corresponding mount point */
virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage);
*/
virtual int fileMove(surf_file_t fd, const char* fullpath);
+ bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource
+ void updateState(tmgr_trace_event_t event_type, double value, double date) override
+ {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource
+
public:
xbt_dynar_t p_storage;
- RoutingEdge *p_netElm;
Cpu *p_cpu;
- simgrid::Host* p_host = nullptr;
+ simgrid::s4u::Host* p_host = nullptr;
/** @brief Get the list of virtual machines on the current Host */
xbt_dynar_t getVms();
void getParams(vm_params_t params);
/** @brief Sets the params of that VM/PM */
void setParams(vm_params_t params);
- simgrid::Host* getHost() { return p_host; }
+ simgrid::s4u::Host* getHost() { return p_host; }
private:
s_vm_params_t p_params;
};
-/**********
- * Action *
- **********/
-
-/** @ingroup SURF_host_interface
- * @brief SURF host action interface class
- */
-class HostAction : public Action {
-public:
- static simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> onStateChange;
-
- /**
- * @brief HostAction constructor
- *
- * @param model The HostModel associated to this HostAction
- * @param cost The cost of this HostAction in [TODO]
- * @param failed [description]
- */
- HostAction(simgrid::surf::Model *model, double cost, bool failed)
- : Action(model, cost, failed) {}
-
- /**
- * @brief HostAction constructor
- *
- * @param model The HostModel associated to this HostAction
- * @param cost The cost of this HostAction in [TODO]
- * @param failed [description]
- * @param var The lmm variable associated to this StorageAction if it is part of a LMM component
- */
- HostAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
- : Action(model, cost, failed, var) {}
-
- void setState(e_surf_action_state_t state);
-};
-
}
}