}
}
-/**
- * \ingroup simix_host_management
- * \brief Returns a dict of the properties assigned to a host.
- *
- * \param host A host
- * \return The properties of this host
- */
-xbt_dict_t simcall_host_get_properties(sg_host_t host)
-{
- return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, host));
-}
+// ***** Host simcalls
+// Those functions are replaced by methods on the Host object.
-/**
- * \ingroup simix_host_management
- * \brief Returns a dict of the properties assigned to a router or AS.
- *
- * \param name The name of the router or AS
- * \return The properties
- */
-xbt_dict_t simcall_asr_get_properties(const char *name)
+/** \ingroup simix_host_management
+ * \deprecated */
+xbt_dict_t simcall_host_get_properties(sg_host_t host)
{
- return simcall_BODY_asr_get_properties(name);
+ return host->getProperties();
}
-/**
- * \ingroup simix_host_management
- * \brief Returns the list of processes attached to the host.
- *
- * \param host A SIMIX host
- * \return the swag of attached processes
- */
+/** \ingroup simix_host_management
+ * \deprecated */
xbt_swag_t simcall_host_get_process_list(sg_host_t host)
{
- return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, host));
+ return host->getProcessList();
}
-/**
- * \ingroup simix_host_management
- * \brief Returns the power peak of a host.
- *
- * \param host A SIMIX host
- * \return the current power peak value (double)
- */
+/** \ingroup simix_host_management
+ * \deprecated */
double simcall_host_get_current_power_peak(sg_host_t host)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_current_power_peak, host));
+ return host->getCurrentPowerPeak();
}
-/**
- * \ingroup simix_host_management
- * \brief Returns one power peak (in flops/s) of a host at a given pstate
- *
- * \param host A SIMIX host
- * \param pstate_index pstate to test
- * \return the current power peak value (double) for pstate_index
- */
+/** \ingroup simix_host_management
+ * \deprecated */
double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_power_peak_at, host, pstate_index));
+ return host->getPowerPeakAt(pstate_index);
}
-/**
- * \ingroup simix_host_management
- * \brief Sets the pstate at which the host should run
- *
- * \param host A SIMIX host
- * \param pstate_index The pstate to which the CPU power will be set
- */
+/** \ingroup simix_host_management
+ * \deprecated */
void simcall_host_set_pstate(sg_host_t host, int pstate_index)
{
- simgrid::simix::kernel(
- std::bind(SIMIX_host_set_pstate, host, pstate_index));
+ host->setPstate(pstate_index);
}
/** \ingroup simix_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host is idling
- */
+ * \deprecated */
double simcall_host_get_wattmin_at(msg_host_t host, int pstate)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_wattmin_at, host, pstate));
+ return host->getWattMinAt(pstate);
}
/** \ingroup simix_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100%
- */
+ * \deprecated */
double simcall_host_get_wattmax_at(msg_host_t host, int pstate)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_wattmax_at, host, pstate));
+ return host->getWattMaxAt(pstate);
}
+/** \deprecated */
+void simcall_host_get_params(sg_host_t vm, vm_params_t params)
+{
+ vm->getParams(params);
+}
+/** \deprecated */
+void simcall_host_set_params(sg_host_t vm, vm_params_t params)
+{
+ vm->setParams(params);
+}
+
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
+{
+ return host->getMountedStorageList();
+}
+
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
+{
+ return host->getAttachedStorageList();
+}
+
+// ***** Other simcalls
+
+/**
+ * \ingroup simix_host_management
+ * \brief Returns a dict of the properties assigned to a router or AS.
+ *
+ * \param name The name of the router or AS
+ * \return The properties
+ */
+xbt_dict_t simcall_asr_get_properties(const char *name)
+{
+ return simcall_BODY_asr_get_properties(name);
+}
/**
* \ingroup simix_process_management
simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
}
-void simcall_host_get_params(sg_host_t vm, vm_params_t params)
-{
- simgrid::simix::kernel(std::bind(SIMIX_host_get_params, vm, params));
-}
-
-void simcall_host_set_params(sg_host_t vm, vm_params_t params)
-{
- simgrid::simix::kernel(std::bind(SIMIX_host_set_params, vm, params));
-}
-
/**
* \ingroup simix_vm_management
* \brief Migrate the given VM to the given physical host
return simcall_BODY_storage_get_used_size(storage);
}
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages mounted on an host.
- * \param host A SIMIX host
- * \return a dict containing all storages mounted on the host
- */
-xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
-{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_mounted_storage_list, host
- ));
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages attached to an host.
- * \param host A SIMIX host
- * \return a dict containing all storages attached to the host
- */
-xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
-{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_attached_storage_list, host
- ));
-}
-
/**
* \ingroup simix_storage_management
* \brief Returns a dict of the properties assigned to a storage element.
