X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/060926490b51a0eeb3eb6a13d2ca8abba6d0960c..fc730f07112dd56d4201ee307bc7c54b8ad22df0:/src/msg/msg_host.cpp

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index 917421da5c..28bd9bbf3b 100644
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -9,9 +9,12 @@
 #include "xbt/log.h"
 #include "simgrid/simix.h"
 #include <simgrid/s4u/host.hpp>
+#include <numeric>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
 
+int sg_storage_max_file_descriptors = 1024;
+
 /** @addtogroup m_host_management
  * (#msg_host_t) and the functions for managing it.
  *  
@@ -26,16 +29,12 @@ 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);
 
-  priv->dp_objs = xbt_dict_new();
+  priv->dp_objs = nullptr;
   priv->dp_enabled = 0;
   priv->dp_updated_by_deleted_tasks = 0;
   priv->is_migrating = 0;
 
-  priv->affinity_mask_db = xbt_dict_new_homogeneous(NULL);
-
-  priv->file_descriptor_table = xbt_dynar_new(sizeof(int), NULL);
-  for (int i=1023; i>=0;i--)
-    xbt_dynar_push_as(priv->file_descriptor_table, int, i);
+  priv->file_descriptor_table = nullptr;
 
   sg_host_msg_set(host,priv);
 
@@ -79,9 +78,9 @@ void *MSG_host_get_data(msg_host_t host) {
  *
  * \brief Return the location on which the current process is executed.
  */
-msg_host_t MSG_host_self(void)
+msg_host_t MSG_host_self()
 {
-  return MSG_process_get_host(NULL);
+  return MSG_process_get_host(nullptr);
 }
 
 /** \ingroup m_host_management
@@ -113,24 +112,22 @@ void MSG_host_off(msg_host_t host)
  */
 void __MSG_host_priv_free(msg_host_priv_t priv)
 {
-  if (priv == NULL)
+  if (priv == nullptr)
     return;
-  unsigned int size = xbt_dict_size(priv->dp_objs);
+  unsigned int size = priv->dp_objs ? xbt_dict_size(priv->dp_objs) : 0;
   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);
-
+  delete priv->file_descriptor_table;
   free(priv);
 }
 
 /** \ingroup m_host_management
  * \brief Return the current number MSG hosts.
  */
-int MSG_get_host_number(void)
+int MSG_get_host_number()
 {
-  return xbt_dict_length(host_list);
+  return sg_host_count();
 }
 
 /** \ingroup m_host_management
@@ -138,7 +135,7 @@ int MSG_get_host_number(void)
  * \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)
  */
-xbt_dynar_t MSG_hosts_as_dynar(void) {
+xbt_dynar_t MSG_hosts_as_dynar() {
   return sg_hosts_as_dynar();
 }
 
@@ -158,7 +155,6 @@ double MSG_get_host_speed(msg_host_t host) {
   return MSG_host_get_speed(host);
 }
 
-
 /** \ingroup m_host_management
  * \brief Return the number of cores.
  *
@@ -166,7 +162,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->core_count();
+  return host->coreCount();
 }
 
 /** \ingroup m_host_management
@@ -177,7 +173,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");
+  xbt_assert((host != nullptr), "Invalid parameters");
   return host->processes();
 }
 
@@ -186,11 +182,11 @@ xbt_swag_t MSG_host_get_process_list(msg_host_t host)
  *
  * \param host a host
  * \param name a property name
- * \return value of a property (or NULL if property not set)
+ * \return value of a property (or nullptr if property not set)
  */
 const char *MSG_host_get_property_value(msg_host_t host, const char *name)
 {
-  return (const char*) xbt_dict_get_or_null(MSG_host_get_properties(host), name);
+  return static_cast<const char*>(xbt_dict_get_or_null(MSG_host_get_properties(host), name));
 }
 
 /** \ingroup m_host_management
@@ -201,7 +197,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)");
+  xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)");
   return host->properties();
 }
 
@@ -240,28 +236,6 @@ int MSG_host_is_off(msg_host_t host)
   return host->isOff();
 }
 
-/** \ingroup m_host_management
- * \brief Set the parameters of a given host
- *
- * \param host a host
- * \param params a prameter object
- */
-void MSG_host_set_params(msg_host_t host, vm_params_t params)
-{
-  host->setParameters(params);
-}
-
-/** \ingroup m_host_management
- * \brief Get the parameters of a given host
- *
- * \param host a host
- * \param params a prameter object
- */
-void MSG_host_get_params(msg_host_t host, vm_params_t params)
-{
-  host->parameters(params);
-}
-
 /** \ingroup m_host_management
  * \brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref SURF_plugin_energy.
  *
@@ -270,8 +244,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->powerPeakAt(pstate_index);
+  xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)");
+  return host->getPstateSpeed(pstate_index);
 }
 
 /** \ingroup m_host_management
@@ -281,8 +255,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->currentPowerPeak();
+  xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)");
+  return host->getPstateSpeedCurrent();
 }
 
 /** \ingroup m_host_management
@@ -301,7 +275,7 @@ int MSG_host_get_nb_pstates(msg_host_t host) {
  */
 xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host)
 {
-  xbt_assert((host != NULL), "Invalid parameters");
+  xbt_assert((host != nullptr), "Invalid parameters");
   return host->mountedStoragesAsDict();
 }
 
@@ -312,7 +286,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");
+  xbt_assert((host != nullptr), "Invalid parameters");
   return host->attachedStorages();
 }
 
@@ -323,19 +297,19 @@ xbt_dynar_t MSG_host_get_attached_storage_list(msg_host_t host)
  */
 xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
 {
-  xbt_assert((host != NULL), "Invalid parameters");
-  xbt_dict_t contents = xbt_dict_new_homogeneous(NULL);
+  xbt_assert((host != nullptr), "Invalid parameters");
+  xbt_dict_t contents = xbt_dict_new_homogeneous(nullptr);
   msg_storage_t storage;
   char* storage_name;
   char* mount_name;
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
 
   xbt_dict_t storage_list = host->mountedStoragesAsDict();
 
   xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
-    storage = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib,storage_name);
+    storage = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib,storage_name));
     xbt_dict_t content = simcall_storage_get_content(storage);
-    xbt_dict_set(contents,mount_name, content,NULL);
+    xbt_dict_set(contents,mount_name, content,nullptr);
   }
   xbt_dict_free(&storage_list);
   return contents;
@@ -343,11 +317,17 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
 
 int __MSG_host_get_file_descriptor_id(msg_host_t host){
   msg_host_priv_t priv = sg_host_msg(host);
-  xbt_assert(!xbt_dynar_is_empty(priv->file_descriptor_table), "Too much files are opened! Some have to be closed.");
-  return xbt_dynar_pop_as(priv->file_descriptor_table, int);
+  if(!priv->file_descriptor_table){
+    priv->file_descriptor_table = new std::vector<int>(sg_storage_max_file_descriptors);
+    std::iota (priv->file_descriptor_table->rbegin(), priv->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0.
+  }
+  xbt_assert(!priv->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed.");
+  int desc = priv->file_descriptor_table->back();
+  priv->file_descriptor_table->pop_back();
+  return desc;
 }
 
 void __MSG_host_release_file_descriptor_id(msg_host_t host, int id){
   msg_host_priv_t priv = sg_host_msg(host);
-  xbt_dynar_push_as(priv->file_descriptor_table, int, id);
+  priv->file_descriptor_table->push_back(id);
 }