#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_priv_t priv = xbt_new0(s_msg_host_priv_t, 1);
-#ifdef MSG_USE_DEPRECATED
- int i;
- char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
-
- priv->mailboxes = (msg_global->max_channel > 0) ?
- xbt_new0(msg_mailbox_t, msg_global->max_channel) : NULL;
-
- for (i = 0; i < msg_global->max_channel; i++) {
- sprintf(alias, "%s:%d", name, i);
-
- /* the key of the mailbox (in this case) is build from the name of the host and the channel number */
- priv->mailboxes[i] = MSG_mailbox_new(alias);
- memset(alias, 0, MAX_ALIAS_NAME + 1);
- }
-#endif
-
-
priv->dp_objs = xbt_dict_new();
priv->dp_enabled = 0;
priv->dp_updated_by_deleted_tasks = 0;
*/
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)
{
- simcall_host_on(host);
+ host->turn_on();
}
/** \ingroup m_host_management
*/
void MSG_host_off(msg_host_t host)
{
- simcall_host_off(host);
+ host->turn_off();
}
/*
{
if (priv == NULL)
- return;
+ return;
unsigned int size = xbt_dict_size(priv->dp_objs);
if (size > 0)
XBT_WARN("dp_objs: %u pending task?", size);
xbt_dict_free(&priv->dp_objs);
xbt_dict_free(&priv->affinity_mask_db);
xbt_dynar_free(&priv->file_descriptor_table);
-#ifdef MSG_USE_DEPRECATED
- free(priv->mailboxes);
-#endif
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.
*/
return xbt_dict_length(host_list);
}
-#ifdef MSG_USE_DEPRECATED
-msg_host_t *MSG_get_host_table(void)
-{
- if (xbt_dict_is_empty(host_list))
- return nullptr;
-
- void **array = xbt_new0(void *, xbt_dict_length(host_list));
-
- xbt_lib_cursor_t cursor;
- const char *id;
- simgrid::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);
-
- return (msg_host_t *)array;
-}
-#endif
-
/** \ingroup m_host_management
* \brief Return a dynar containing all the hosts declared at a given point of time
* \remark The host order in the returned array is generally different from the host creation/declaration order in the XML platform (we use a hash table internally)
return sg_hosts_as_dynar();
}
-/** \ingroup m_host_management
- * \brief Return the number of MSG tasks currently running on a
- * #msg_host_t. The external load is not taken in account.
- */
-int MSG_get_host_msgload(msg_host_t h)
-{
- xbt_assert((h != NULL), "Invalid parameters");
- xbt_die( "Not implemented yet");
-
- return (0);
-}
-
/** \ingroup m_host_management
* \brief Return the speed of the processor (in flop/s), regardless of
the current load on the machine.
*/
-double MSG_get_host_speed(msg_host_t h)
-{
- xbt_assert((h != NULL), "Invalid parameters");
-
- return sg_host_get_speed(h);
+double MSG_get_host_speed(msg_host_t host) {
+ return host->speed();
}
* \param host a host
* \return the number of cores
*/
-int MSG_host_get_core_number(msg_host_t host)
-{
- xbt_assert((host != NULL), "Invalid parameters");
-
- return sg_host_get_core(host);
+int MSG_host_get_core_number(msg_host_t host) {
+ 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 (simcall_host_get_process_list(host));
+ return host->processes();
}
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->properties();
}
/** \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->set_parameters(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->get_parameters(params);
}
/** \ingroup m_host_management
* \return Returns the processor speed associated with pstate_index
*/
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));
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+ return host->power_peak_at(pstate_index);
}
/** \ingroup m_host_management
* \return Returns the current processor speed
*/
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);
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+ return host->current_power_peak();
}
/** \ingroup m_host_management
* \param host host to test
*/
int MSG_host_get_nb_pstates(msg_host_t host) {
- 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);
+ return sg_host_get_nb_pstates(host);
}
/** \ingroup m_host_management
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->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 (simcall_host_get_attached_storage_list(host));
+ return host->attached_storages();
}
/** \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->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);