#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "simgrid/simix.h"
-#include "simgrid/Host.hpp"
+#include <simgrid/s4u/host.hpp>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
*/
msg_host_t MSG_host_by_name(const char *name)
{
- return simgrid::Host::by_name_or_null(name);
+ return simgrid::s4u::Host::by_name_or_null(name);
}
/** \ingroup m_host_management
*/
void MSG_host_on(msg_host_t host)
{
- host->on();
+ host->turnOn();
}
/** \ingroup m_host_management
*/
void MSG_host_off(msg_host_t host)
{
- host->off();
+ host->turnOff();
}
/*
free(priv);
}
-/*
- * \brief Destroys a host (internal call only)
- */
-void __MSG_host_destroy(msg_host_t host) //FIXME: killme?
-{
- /* TODO:
- * What happens if VMs still remain on this host?
- * Revisit here after the surf layer gets stable.
- **/
- sg_host_msg_destroy(host);
-}
-
/** \ingroup m_host_management
* \brief Return the current number MSG hosts.
*/
xbt_lib_cursor_t cursor;
const char *id;
- simgrid::Host* host;
+ simgrid::s4u::Host* host;
xbt_dict_foreach(host_list, cursor, id, host)
if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST)
array[i++] = host->facet(MSG_HOST_LEVEL);
xbt_swag_t MSG_host_get_process_list(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters");
-
- return (simcall_host_get_process_list(host));
+ return host->getProcessList();
}
xbt_dict_t MSG_host_get_properties(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-
- return (simcall_host_get_properties(host));
+ return host->getProperties();
}
/** \ingroup m_host_management
int MSG_host_is_on(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return sg_host_get_state(host);
+ return sg_host_is_on(host);
}
/** @ingroup m_host_management
*
int MSG_host_is_off(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return !(sg_host_get_state(host));
+ return !(sg_host_is_on(host));
}
/** \ingroup m_host_management
*/
void MSG_host_set_params(msg_host_t host, vm_params_t params)
{
- simcall_host_set_params(host, params);
+ host->setParams(params);
}
/** \ingroup m_host_management
*/
void MSG_host_get_params(msg_host_t host, vm_params_t params)
{
- simcall_host_get_params(host, params);
+ host->getParams(params);
}
/** \ingroup m_host_management
*/
double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) {
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return (simcall_host_get_power_peak_at(host, pstate_index));
+ return host->getPowerPeakAt(pstate_index);
}
/** \ingroup m_host_management
*/
double MSG_host_get_current_power_peak(msg_host_t host) {
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return simcall_host_get_current_power_peak(host);
+ return host->getCurrentPowerPeak();
}
/** \ingroup m_host_management
return sg_host_get_nb_pstates(host);
}
-/** \ingroup m_host_management
- * \brief Sets the speed of the processor (in flop/s) at a given pstate. See also @ref SURF_plugin_energy.
- *
- * \param host host to test
- * \param pstate_index pstate to switch to
- */
-void MSG_host_set_pstate(msg_host_t host, int pstate_index) {
- xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-
- simcall_host_set_pstate(host, pstate_index);
-}
-/** \ingroup m_host_management
- * \brief Gets the pstate at which the given host is currently running. See also @ref SURF_plugin_energy.
- *
- * \param host host to test
- */
-int MSG_host_get_pstate(msg_host_t host) {
- return sg_host_get_pstate(host);
-}
-
-/** \ingroup m_host_management
- * \brief Return the total energy consumed by a host (in Joules). See also @ref SURF_plugin_energy.
- *
- * \param host host to test
- * \return Returns the consumed energy
- */
-double MSG_host_get_consumed_energy(msg_host_t host) {
- xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return sg_host_get_consumed_energy(host);
-}
-/** \ingroup m_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host is idling
- *
- */
-double MSG_host_get_wattmin_at(msg_host_t host, int pstate){
- return simcall_host_get_wattmin_at(host, pstate);
-}
-/** \ingroup m_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100%
- *
- */
-double MSG_host_get_wattmax_at(msg_host_t host, int pstate){
- return simcall_host_get_wattmax_at(host, pstate);
-}
-
/** \ingroup m_host_management
* \brief Return the list of mount point names on an host.
* \param host a host
xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters");
- return (simcall_host_get_mounted_storage_list(host));
+ return host->getMountedStorageList();
}
/** \ingroup m_host_management
xbt_dynar_t MSG_host_get_attached_storage_list(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters");
- return (simcall_host_get_attached_storage_list(host));
+ return host->getAttachedStorageList();
}
/** \ingroup m_host_management
char* mount_name;
xbt_dict_cursor_t cursor = NULL;
- xbt_dict_t storage_list = simcall_host_get_mounted_storage_list(host);
+ xbt_dict_t storage_list = host->getMountedStorageList();
xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
storage = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib,storage_name);
