sanitizes host user_data: create a lib level

[simgrid.git] / src / msg / msg_host.c

diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c
index 31823c3..f96e1ee 100644 (file)
--- a/src/msg/msg_host.c
+++ b/src/msg/msg_host.c
@@ -4,8 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "src/msg/msg_private.h"
+#include "src/msg/msg_mailbox.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "simgrid/simix.h"
@@ -54,6 +54,10 @@ msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our paramete
 
   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);
+
   sg_host_msg_set(host,priv);
   
   return host;
@@ -71,7 +75,6 @@ msg_host_t MSG_host_by_name(const char *name)
   return (msg_host_t) xbt_lib_get_elm_or_null(host_lib,name);
 }
 
-static const char *msg_data = "data";
 /** \ingroup m_host_management
  *
  * \brief Set the user data of a #msg_host_t.
@@ -79,9 +82,8 @@ static const char *msg_data = "data";
  * This functions checks whether some data has already been associated to \a host
    or not and attach \a data to \a host if it is possible.
  */
-msg_error_t MSG_host_set_data(msg_host_t host, void *data)
-{
-  MSG_host_set_property_value(host, msg_data, data, NULL);
+msg_error_t MSG_host_set_data(msg_host_t host, void *data) {
+  sg_host_user_set(host, data);
   return MSG_OK;
 }
 
@@ -92,9 +94,8 @@ msg_error_t MSG_host_set_data(msg_host_t host, void *data)
  * This functions checks whether \a host is a valid pointer or not and return
    the user data associated to \a host if it is possible.
  */
-void *MSG_host_get_data(msg_host_t host)
-{
-  return (void *)MSG_host_get_property_value(host, msg_data);
+void *MSG_host_get_data(msg_host_t host) {
+  return sg_host_user(host);
 }
 
 /** \ingroup m_host_management
@@ -153,7 +154,7 @@ void __MSG_host_priv_free(msg_host_priv_t priv)
     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
@@ -232,7 +233,7 @@ double MSG_get_host_speed(msg_host_t h)
 {
   xbt_assert((h != NULL), "Invalid parameters");
 
-  return (simcall_host_get_speed(h));
+  return sg_host_get_speed(h);
 }
 
 
@@ -246,7 +247,7 @@ int MSG_host_get_core_number(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters");
 
-  return (simcall_host_get_core(host));
+  return sg_host_get_core(host);
 }
 
 /** \ingroup m_host_management
@@ -314,7 +315,7 @@ void MSG_host_set_property_value(msg_host_t host, const char *name, char *value,
 int MSG_host_is_on(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-  return (simcall_host_get_state(host));
+  return sg_host_get_state(host);
 }
 /** @ingroup m_host_management
  *
@@ -325,7 +326,7 @@ int MSG_host_is_on(msg_host_t host)
 int MSG_host_is_off(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-  return !(simcall_host_get_state(host));
+  return !(sg_host_get_state(host));
 }
 
 /** \ingroup m_host_management
@@ -379,9 +380,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) {
-
-         xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-         return (simcall_host_get_nb_pstates(host));
+         return sg_host_get_nb_pstates(host);
 }
 
 /** \ingroup m_host_management
@@ -401,7 +400,7 @@ void MSG_host_set_pstate(msg_host_t host, int pstate_index) {
  * \param  host host to test
  */
 int MSG_host_get_pstate(msg_host_t host) {
-         return simcall_host_get_pstate(host);
+         return sg_host_get_pstate(host);
 }
 
 /** \ingroup m_host_management
@@ -412,7 +411,7 @@ int MSG_host_get_pstate(msg_host_t host) {
  */
 double MSG_host_get_consumed_energy(msg_host_t host) {
          xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-         return simcall_host_get_consumed_energy(host);
+         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
@@ -475,3 +474,15 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
   xbt_dict_free(&storage_list);
   return contents;
 }
+
+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);
+}
+
+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);
+}