MSG_process_ref/unref: allow to fiddle with the process refcounting

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

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index 856b7f8..3d68513 100644 (file)
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -4,15 +4,16 @@
 /* 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 "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/storage.hpp"
 #include "src/msg/msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/simix.h"
-#include <simgrid/s4u/host.hpp>
-#include <numeric>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
 
+simgrid::xbt::Extension<simgrid::s4u::Host, simgrid::MsgHostExt> simgrid::MsgHostExt::EXTENSION_ID;
+
+SG_BEGIN_DECL()
+
 int sg_storage_max_file_descriptors = 1024;
 
 /** @addtogroup m_host_management
@@ -25,23 +26,6 @@ int sg_storage_max_file_descriptors = 1024;
  */
 
 /********************************* Host **************************************/
-msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our parameter
-{
-  msg_host_priv_t priv = xbt_new0(s_msg_host_priv_t, 1);
-
-  priv->dp_objs = xbt_dict_new();
-  priv->dp_enabled = 0;
-  priv->dp_updated_by_deleted_tasks = 0;
-  priv->is_migrating = 0;
-
-  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.
-
-  sg_host_msg_set(host,priv);
-
-  return host;
-}
-
 /** \ingroup m_host_management
  * \brief Finds a msg_host_t using its name.
  *
@@ -108,21 +92,6 @@ void MSG_host_off(msg_host_t host)
   host->turnOff();
 }
 
-/*
- * \brief Frees private data of a host (internal call only)
- */
-void __MSG_host_priv_free(msg_host_priv_t priv)
-{
-  if (priv == nullptr)
-    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);
-  delete priv->file_descriptor_table;
-  free(priv);
-}
-
 /** \ingroup m_host_management
  * \brief Return the current number MSG hosts.
  */
@@ -208,10 +177,10 @@ xbt_dict_t MSG_host_get_properties(msg_host_t host)
  * \param host a host
  * \param name a property name
  * \param value what to change the property to
- * \param free_ctn the freeing function to use to kill the value on need
  */
-void MSG_host_set_property_value(msg_host_t host, const char *name, char *value,void_f_pvoid_t free_ctn) {
-  xbt_dict_set(MSG_host_get_properties(host), name, value,free_ctn);
+void MSG_host_set_property_value(msg_host_t host, const char* name, char* value)
+{
+  xbt_dict_set(MSG_host_get_properties(host), name, value, nullptr);
 }
 
 /** @ingroup m_host_management
@@ -287,8 +256,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 != nullptr), "Invalid parameters");
-  return host->attachedStorages();
+  return sg_host_get_attached_storage_list(host);
 }
 
 /** \ingroup m_host_management
@@ -316,15 +284,4 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
   return contents;
 }
 
-int __MSG_host_get_file_descriptor_id(msg_host_t host){
-  msg_host_priv_t priv = sg_host_msg(host);
-  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);
-  priv->file_descriptor_table->push_back(id);
-}
+SG_END_DECL()