#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_host_private.h"
-
+#include "src/simix/smx_host_private.hpp"
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;
+extern "C" {
/** @addtogroup m_host_management
* (#msg_host_t) and the functions for managing it.
void MSG_host_get_process_list(msg_host_t host, xbt_dynar_t whereto)
{
xbt_assert((host != nullptr), "Invalid parameters");
- smx_actor_t actor = NULL;
- xbt_swag_foreach(actor, host->extension<simgrid::simix::Host>()->process_list) {
- msg_process_t p = actor->ciface();
+ for (auto& actor : host->extension<simgrid::simix::Host>()->process_list) {
+ msg_process_t p = actor.ciface();
xbt_dynar_push(whereto, &p);
}
}
*/
const char *MSG_host_get_property_value(msg_host_t host, const char *name)
{
- return static_cast<const char*>(xbt_dict_get_or_null(MSG_host_get_properties(host), name));
+ return host->getProperty(name);
}
/** \ingroup m_host_management
xbt_dict_t MSG_host_get_properties(msg_host_t host)
{
xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)");
- return host->getProperties();
+ xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
+ std::map<std::string, std::string>* props = host->getProperties();
+ if (props == nullptr)
+ return nullptr;
+ for (auto const& elm : *props) {
+ xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr);
+ }
+ return as_dict;
}
/** \ingroup m_host_management
*/
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);
+ host->setProperty(name, value);
}
/** @ingroup m_host_management
return sg_host_get_attached_storage_list(host);
}
-/** \ingroup m_host_management
- * \brief Return the content of mounted storages on an host.
- * \param host a host
- * \return a dict containing content (as a dict) of all storages mounted on the host
- */
-xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
-{
- xbt_assert((host != nullptr), "Invalid parameters");
- xbt_dict_t contents = xbt_dict_new_homogeneous(nullptr);
- for (auto elm : host->getMountedStorages())
- xbt_dict_set(contents, elm.first.c_str(), MSG_storage_get_content(elm.second), nullptr);
-
- return contents;
}
-
-SG_END_DECL()