From: Frederic Suter Date: Fri, 2 Mar 2018 10:33:55 +0000 (+0100) Subject: replace msg_io by a C sg_* interface to S4U X-Git-Tag: v3.19~158 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ff44a9035ba4965f2926c04ccdc7a3b1a11c4949 replace msg_io by a C sg_* interface to S4U --- diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index df767ec6fa..b8852312db 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -170,17 +170,28 @@ XBT_PUBLIC(void) MSG_zone_set_property_value(msg_netzone_t netzone, const char* XBT_PUBLIC(void) MSG_zone_get_hosts(msg_netzone_t zone, xbt_dynar_t whereto); /************************** Storage handling ***********************************/ -XBT_PUBLIC(const char *) MSG_storage_get_name(msg_storage_t storage); -XBT_PUBLIC(msg_storage_t) MSG_storage_get_by_name(const char *name); -XBT_PUBLIC(xbt_dict_t) MSG_storage_get_properties(msg_storage_t storage); -XBT_PUBLIC(void) MSG_storage_set_property_value(msg_storage_t storage, const char* name, char* value); -XBT_PUBLIC(const char *)MSG_storage_get_property_value(msg_storage_t storage, const char *name); -XBT_PUBLIC(xbt_dynar_t) MSG_storages_as_dynar(); -XBT_PUBLIC(msg_error_t) MSG_storage_set_data(msg_storage_t host, void *data); -XBT_PUBLIC(void *) MSG_storage_get_data(msg_storage_t storage); -XBT_PUBLIC(const char *) MSG_storage_get_host(msg_storage_t storage); -XBT_PUBLIC(sg_size_t) MSG_storage_read(msg_storage_t storage, sg_size_t size); -XBT_PUBLIC(sg_size_t) MSG_storage_write(msg_storage_t storage, sg_size_t size); +XBT_PUBLIC(const char*) sg_storage_get_name(sg_storage_t storage); +#define MSG_storage_get_name(storage) sg_storage_get_name(storage) +XBT_PUBLIC(sg_storage_t) sg_storage_get_by_name(const char* name); +#define MSG_storage_get_by_name(name) sg_storage_get_by_name(name) +XBT_PUBLIC(xbt_dict_t) sg_storage_get_properties(sg_storage_t storage); +#define MSG_storage_get_properties(storage) sg_storage_get_properties(storage) +XBT_PUBLIC(void) sg_storage_set_property_value(sg_storage_t storage, const char* name, char* value); +#define MSG_storage_set_property_value(storage, name, value) sg_storage_set_property_value(storage, name, value) +XBT_PUBLIC(const char*) sg_storage_get_property_value(sg_storage_t storage, const char* name); +#define MSG_storage_get_property_value(storage, name) sg_storage_get_property_value(storage, name) +XBT_PUBLIC(xbt_dynar_t) sg_storages_as_dynar(); +#define MSG_storages_as_dynar() sg_storages_as_dynar() +XBT_PUBLIC(void) sg_storage_set_data(sg_storage_t host, void* data); +#define MSG_storage_set_data(storage, data) sg_storage_set_data(storage, data) +XBT_PUBLIC(void*) sg_storage_get_data(sg_storage_t storage); +#define MSG_storage_get_data(storage) sg_storage_get_data(storage) +XBT_PUBLIC(const char*) sg_storage_get_host(sg_storage_t storage); +#define MSG_storage_get_host(storage) sg_storage_get_host(storage) +XBT_PUBLIC(sg_size_t) sg_storage_read(sg_storage_t storage, sg_size_t size); +#define MSG_storage_read(storage, size) sg_storage_read(storage, size) +XBT_PUBLIC(sg_size_t) sg_storage_write(sg_storage_t storage, sg_size_t size); +#define MSG_storage_write(storage, size) sg_storage_write(storage, size) /************************** Host handling ***********************************/ XBT_PUBLIC(void) MSG_host_get_process_list(msg_host_t h, xbt_dynar_t whereto); diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp deleted file mode 100644 index 0734919388..0000000000 --- a/src/msg/msg_io.cpp +++ /dev/null @@ -1,127 +0,0 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ - -/* 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.hpp" -#include "src/plugins/file_system/FileSystem.hpp" -#include - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)"); - -extern "C" { - -/********************************* Storage **************************************/ -/** @addtogroup msg_storage_management - * (#msg_storage_t) and the functions for managing it. - */ - -/** \ingroup msg_storage_management - * - * \brief Returns the name of the #msg_storage_t. - * - * This functions checks whether a storage is a valid pointer or not and return its name. - */ -const char* MSG_storage_get_name(msg_storage_t storage) -{ - xbt_assert((storage != nullptr), "Invalid parameters"); - return storage->getCname(); -} - -const char* MSG_storage_get_host(msg_storage_t storage) -{ - xbt_assert((storage != nullptr), "Invalid parameters"); - return storage->getHost()->getCname(); -} - -/** \ingroup msg_storage_management - * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage - * \param storage a storage - * \return a dict containing the properties - */ -xbt_dict_t MSG_storage_get_properties(msg_storage_t storage) -{ - xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)"); - xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); - std::map* props = storage->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 msg_storage_management - * \brief Change the value of a given storage property - * - * \param storage a storage - * \param name a property name - * \param value what to change the property to - */ -void MSG_storage_set_property_value(msg_storage_t storage, const char* name, char* value) -{ - storage->setProperty(name, value); -} - -/** \ingroup m_storage_management - * \brief Returns the value of a given storage property - * - * \param storage a storage - * \param name a property name - * \return value of a property (or nullptr if property not set) - */ -const char *MSG_storage_get_property_value(msg_storage_t storage, const char *name) -{ - return storage->getProperty(name); -} - -/** \ingroup msg_storage_management - * \brief Finds a msg_storage_t using its name. - * \param name the name of a storage - * \return the corresponding storage - */ -msg_storage_t MSG_storage_get_by_name(const char *name) -{ - return simgrid::s4u::Storage::byName(name); -} - -/** \ingroup msg_storage_management - * \brief Returns a dynar containing all the storage elements declared at a given point of time - */ -xbt_dynar_t MSG_storages_as_dynar() -{ - std::map* storage_list = new std::map; - simgrid::s4u::getStorageList(storage_list); - xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),nullptr); - for (auto const& s : *storage_list) - xbt_dynar_push(res, &(s.second)); - delete storage_list; - return res; -} - -void* MSG_storage_get_data(msg_storage_t storage) -{ - xbt_assert((storage != nullptr), "Invalid parameters"); - return storage->getUserdata(); -} - -msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data) -{ - storage->setUserdata(data); - return MSG_OK; -} - -sg_size_t MSG_storage_read(msg_storage_t storage, sg_size_t size) -{ - return storage->read(size); -} - -sg_size_t MSG_storage_write(msg_storage_t storage, sg_size_t size) -{ - return storage->write(size); -} - -} diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp index d8f004ac63..e1aabf1839 100644 --- a/src/s4u/s4u_storage.cpp +++ b/src/s4u/s4u_storage.cpp @@ -3,6 +3,7 @@ /* 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/msg.h" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" #include "simgrid/simix.hpp" @@ -51,7 +52,6 @@ Host* Storage::getHost() return attached_to_; } - std::map* Storage::getProperties() { return simgrid::simix::kernelImmediate([this] { return pimpl_->getProperties(); }); @@ -85,3 +85,115 @@ simgrid::xbt::signal Storage::onDestruction; } /* namespace s4u */ } /* namespace simgrid */ + +/* **************************** Public C interface *************************** */ +SG_BEGIN_DECL() +/** @addtogroup sg_storage_management + * (#sg_storage_t) and the functions for managing it. + */ + +/** \ingroup sg_storage_management + * + * \brief Returns the name of the #sg_storage_t. + * + * This functions checks whether a storage is a valid pointer or not and return its name. + */ +const char* sg_storage_get_name(sg_storage_t storage) +{ + xbt_assert((storage != nullptr), "Invalid parameters"); + return storage->getCname(); +} + +const char* sg_storage_get_host(sg_storage_t storage) +{ + xbt_assert((storage != nullptr), "Invalid parameters"); + return storage->getHost()->getCname(); +} + +/** \ingroup sg_storage_management + * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this storage + * \param storage a storage + * \return a dict containing the properties + */ +xbt_dict_t sg_storage_get_properties(sg_storage_t storage) +{ + xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)"); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + std::map* props = storage->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 sg_storage_management + * \brief Change the value of a given storage property + * + * \param storage a storage + * \param name a property name + * \param value what to change the property to + */ +void sg_storage_set_property_value(sg_storage_t storage, const char* name, char* value) +{ + storage->setProperty(name, value); +} + +/** \ingroup sg_storage_management + * \brief Returns the value of a given storage property + * + * \param storage a storage + * \param name a property name + * \return value of a property (or nullptr if property not set) + */ +const char* sg_storage_get_property_value(sg_storage_t storage, const char* name) +{ + return storage->getProperty(name); +} + +/** \ingroup sg_storage_management + * \brief Finds a sg_storage_t using its name. + * \param name the name of a storage + * \return the corresponding storage + */ +sg_storage_t sg_storage_get_by_name(const char* name) +{ + return simgrid::s4u::Storage::byName(name); +} + +/** \ingroup sg_storage_management + * \brief Returns a dynar containing all the storage elements declared at a given point of time + */ +xbt_dynar_t sg_storages_as_dynar() +{ + std::map* storage_list = new std::map; + simgrid::s4u::getStorageList(storage_list); + xbt_dynar_t res = xbt_dynar_new(sizeof(sg_storage_t), nullptr); + for (auto const& s : *storage_list) + xbt_dynar_push(res, &(s.second)); + delete storage_list; + return res; +} + +void* sg_storage_get_data(sg_storage_t storage) +{ + xbt_assert((storage != nullptr), "Invalid parameters"); + return storage->getUserdata(); +} + +void sg_storage_set_data(sg_storage_t storage, void* data) +{ + storage->setUserdata(data); +} + +sg_size_t sg_storage_read(sg_storage_t storage, sg_size_t size) +{ + return storage->read(size); +} + +sg_size_t sg_storage_write(sg_storage_t storage, sg_size_t size) +{ + return storage->write(size); +} +SG_END_DECL() diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 45a4b8c2c0..a84619b3f0 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -457,7 +457,6 @@ set(MSG_SRC src/msg/msg_global.cpp src/msg/msg_gos.cpp src/msg/msg_host.cpp - src/msg/msg_io.cpp src/msg/msg_mailbox.cpp src/msg/msg_process.cpp src/msg/msg_synchro.cpp