X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be27c3513d2b7d273749db733659600b10dc0a54..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/msg/msg_host.cpp

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index 31fd77f1cf..15a78c1cbb 100644
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -9,7 +9,7 @@
 #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);
 
@@ -31,23 +31,6 @@ msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our paramete
 {
   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;
@@ -73,7 +56,7 @@ msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our paramete
  */
 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
@@ -99,17 +82,6 @@ void *MSG_host_get_data(msg_host_t host) {
   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.
@@ -128,7 +100,7 @@ msg_host_t MSG_host_self(void)
  */
 void MSG_host_on(msg_host_t host)
 {
-  host->turnOn();
+  host->turn_on();
 }
 
 /** \ingroup m_host_management
@@ -139,7 +111,7 @@ void MSG_host_on(msg_host_t host)
  */
 void MSG_host_off(msg_host_t host)
 {
-  host->turnOff();
+  host->turn_off();
 }
 
 /*
@@ -149,16 +121,13 @@ void __MSG_host_priv_free(msg_host_priv_t priv)
 {
 
   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);
 }
@@ -171,25 +140,6 @@ int MSG_get_host_number(void)
   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)
@@ -203,7 +153,7 @@ xbt_dynar_t MSG_hosts_as_dynar(void) {
     the current load on the machine.
  */
 double MSG_get_host_speed(msg_host_t host) {
-  return host->getSpeed();
+  return host->speed();
 }
 
 
@@ -214,7 +164,7 @@ double MSG_get_host_speed(msg_host_t host) {
  * \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
@@ -226,7 +176,7 @@ int MSG_host_get_core_number(msg_host_t host) {
 xbt_swag_t MSG_host_get_process_list(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters");
-  return host->getProcessList();
+  return host->processes();
 }
 
 
@@ -251,7 +201,7 @@ const char *MSG_host_get_property_value(msg_host_t host, const char *name)
 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
@@ -302,7 +252,7 @@ int MSG_host_is_off(msg_host_t host)
  */
 void MSG_host_set_params(msg_host_t host, vm_params_t params)
 {
-  host->setParams(params);
+  host->set_parameters(params);
 }
 
 /** \ingroup m_host_management
@@ -313,7 +263,7 @@ void MSG_host_set_params(msg_host_t host, vm_params_t params)
  */
 void MSG_host_get_params(msg_host_t host, vm_params_t params)
 {
-  host->getParams(params);
+  host->get_parameters(params);
 }
 
 /** \ingroup m_host_management
@@ -324,8 +274,8 @@ void MSG_host_get_params(msg_host_t host, vm_params_t params)
  * \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 host->getPowerPeakAt(pstate_index);
+    xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+    return host->power_peak_at(pstate_index);
 }
 
 /** \ingroup m_host_management
@@ -335,8 +285,8 @@ double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) {
  * \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 host->getCurrentPowerPeak();
+    xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
+    return host->current_power_peak();
 }
 
 /** \ingroup m_host_management
@@ -345,32 +295,7 @@ double MSG_host_get_current_power_peak(msg_host_t host) {
  * \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 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);
+    return sg_host_get_nb_pstates(host);
 }
 
 /** \ingroup m_host_management
@@ -381,7 +306,7 @@ double MSG_host_get_wattmax_at(msg_host_t host, int pstate){
 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
@@ -392,7 +317,7 @@ xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host)
 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
@@ -409,7 +334,7 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
   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);