#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
return sg_host_user(host);
}
-/** \ingroup m_host_management
- *
- * \brief Return the name of the #msg_host_t.
- *
- * This functions checks whether \a host is a valid pointer or not and return
- its name.
- */
-const char *MSG_host_get_name(msg_host_t host) {
- return SIMIX_host_get_name(host);
-}
-
/** \ingroup m_host_management
*
* \brief Return the location on which the current process is executed.
*/
void MSG_host_on(msg_host_t host)
{
- host->on();
+ host->turn_on();
}
/** \ingroup m_host_management
*/
void MSG_host_off(msg_host_t host)
{
- host->off();
+ host->turn_off();
}
/*
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);
the current load on the machine.
*/
double MSG_get_host_speed(msg_host_t host) {
- return host->getSpeed();
+ return host->speed();
}
* \return the number of cores
*/
int MSG_host_get_core_number(msg_host_t host) {
- return host->getCoreAmount();
+ return host->core_count();
}
/** \ingroup m_host_management
xbt_swag_t MSG_host_get_process_list(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters");
- return host->getProcessList();
+ return host->processes();
}
xbt_dict_t MSG_host_get_properties(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return host->getProperties();
+ return host->properties();
}
/** \ingroup m_host_management
*/
void MSG_host_set_params(msg_host_t host, vm_params_t params)
{
- host->setParams(params);
+ host->set_parameters(params);
}
/** \ingroup m_host_management
*/
void MSG_host_get_params(msg_host_t host, vm_params_t params)
{
- host->getParams(params);
+ host->get_parameters(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 host->getPowerPeakAt(pstate_index);
+ return host->power_peak_at(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 host->getCurrentPowerPeak();
+ return host->current_power_peak();
}
/** \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)");
- host->setPstate(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 host->getWattMinAt(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 host->getWattMaxAt(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 host->getMountedStorageList();
+ return host->mounted_storages_as_dict();
}
/** \ingroup m_host_management
xbt_dynar_t MSG_host_get_attached_storage_list(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters");
- return host->getAttachedStorageList();
+ return host->attached_storages();
}
/** \ingroup m_host_management
char* mount_name;
xbt_dict_cursor_t cursor = NULL;
- xbt_dict_t storage_list = host->getMountedStorageList();
+ xbt_dict_t storage_list = host->mounted_storages_as_dict();
xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
storage = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib,storage_name);
