#include "../surf/StorageImpl.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Storage.hpp"
#include "src/msg/msg_private.h"
#include <numeric>
return 0;
/* Find the host where the file is physically located and read it */
- msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, fd->storageId));
- msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
- msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
+ msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId);
+ msg_host_t attached_host = MSG_host_by_name(storage_src->host());
read_size = simcall_file_read(fd->simdata->smx_file, size, attached_host);
- if (strcmp(storage_priv_src->hostname, MSG_host_self()->cname())) {
+ if (strcmp(storage_src->host(), MSG_host_self()->cname())) {
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
- XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->hostname, read_size);
+ XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_src->host(), read_size);
msg_host_t m_host_list[] = {MSG_host_self(), attached_host};
double flops_amount[] = {0, 0};
double bytes_amount[] = {0, 0, static_cast<double>(read_size), 0};
return 0;
/* Find the host where the file is physically located (remote or local)*/
- msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, fd->storageId));
- msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
- msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
+ msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId);
+ msg_host_t attached_host = MSG_host_by_name(storage_src->host());
- if (strcmp(storage_priv_src->hostname, MSG_host_self()->cname())) {
+ if (strcmp(storage_src->host(), MSG_host_self()->cname())) {
/* the file is hosted on a remote host, initiate a communication between src and dest hosts for data transfer */
- XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_priv_src->hostname, size);
+ XBT_DEBUG("File is on %s remote host, initiate data transfer of %llu bytes.", storage_src->host(), size);
msg_host_t m_host_list[] = {MSG_host_self(), attached_host};
double flops_amount[] = {0, 0};
double bytes_amount[] = {0, static_cast<double>(size), 0, 0};
msg_error_t MSG_file_unlink(msg_file_t fd)
{
/* Find the host where the file is physically located (remote or local)*/
- msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, fd->storageId));
- msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
- msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
+ msg_storage_t storage_src = simgrid::s4u::Storage::byName(fd->storageId);
+ msg_host_t attached_host = MSG_host_by_name(storage_src->host());
int res = simcall_file_unlink(fd->simdata->smx_file, attached_host);
__MSG_file_destroy(fd);
return static_cast<msg_error_t>(res);
msg_error_t MSG_file_rcopy (msg_file_t file, msg_host_t host, const char* fullpath)
{
/* Find the host where the file is physically located and read it */
- msg_storage_t storage_src = static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib, file->storageId));
- msg_storage_priv_t storage_priv_src = MSG_storage_priv(storage_src);
- msg_host_t attached_host = MSG_host_by_name(storage_priv_src->hostname);
+ msg_storage_t storage_src = simgrid::s4u::Storage::byName(file->storageId);
+ msg_host_t attached_host = MSG_host_by_name(storage_src->host());
MSG_file_seek(file, 0, SEEK_SET);
sg_size_t read_size = simcall_file_read(file->simdata->smx_file, file->size, attached_host);
if (not strcmp(file_mount_name, mount_name) && strlen(mount_name) > longest_prefix_length) {
/* The current mount name is found in the full path and is bigger than the previous*/
longest_prefix_length = strlen(mount_name);
- storage_dest = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib, storage_name);
+ storage_dest = simgrid::s4u::Storage::byName(storage_name);
}
xbt_free(file_mount_name);
}
xbt_dict_free(&storage_list);
- char* host_name_dest = nullptr;
if(longest_prefix_length>0){
/* Mount point found, retrieve the host the storage is attached to */
- msg_storage_priv_t storage_dest_priv = MSG_storage_priv(storage_dest);
- host_name_dest = (char*)storage_dest_priv->hostname;
- host_dest = MSG_host_by_name(host_name_dest);
+ host_dest = MSG_host_by_name(storage_dest->host());
}else{
XBT_WARN("Can't find mount point for '%s' on destination host '%s'", fullpath, host->cname());
return MSG_TASK_CANCELED;
}
- XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, storage_priv_src->hostname,
- host_name_dest);
+ XBT_DEBUG("Initiate data transfer of %llu bytes between %s and %s.", read_size, storage_src->host(),
+ storage_dest->host());
msg_host_t m_host_list[] = {attached_host, host_dest};
double flops_amount[] = {0, 0};
double bytes_amount[] = {0, static_cast<double>(read_size), 0, 0};
if(transfer != MSG_OK){
if (transfer == MSG_HOST_FAILURE)
- XBT_WARN("Transfer error, %s remote host just turned off!", host_name_dest);
+ XBT_WARN("Transfer error, %s remote host just turned off!", storage_dest->host());
if (transfer == MSG_TASK_CANCELED)
XBT_WARN("Transfer error, task has been canceled!");
* (#msg_storage_t) and the functions for managing it.
*/
-msg_storage_t __MSG_storage_create(smx_storage_t storage)
-{
- msg_storage_priv_t storage_private = xbt_new0(s_msg_storage_priv_t, 1);
-
- storage_private->name = surf_storage_get_name(storage);
- storage_private->hostname = surf_storage_get_host(storage);
- storage_private->size = surf_storage_get_size(storage);
-
- xbt_lib_set(storage_lib, storage_private->name, MSG_STORAGE_LEVEL, storage_private);
- return xbt_lib_get_elm_or_null(storage_lib, storage_private->name);
-}
-
-/**
- * \brief Destroys a storage (internal call only)
- */
-void __MSG_storage_destroy(msg_storage_priv_t storage) {
- free(storage);
-}
-
/** \ingroup msg_storage_management
*
* \brief Returns the name of the #msg_storage_t.
*/
const char *MSG_storage_get_name(msg_storage_t storage) {
xbt_assert((storage != nullptr), "Invalid parameters");
- msg_storage_priv_t priv = MSG_storage_priv(storage);
- return priv->name;
+ return storage->name();
}
/** \ingroup msg_storage_management
* \return the free space size of the storage element (as a #sg_size_t)
*/
sg_size_t MSG_storage_get_free_size(msg_storage_t storage){
- return simgrid::simix::kernelImmediate([storage] { return surf_storage_resource_priv(storage)->getFreeSize(); });
+ return storage->sizeFree();
}
/** \ingroup msg_storage_management
* \return the used space size of the storage element (as a #sg_size_t)
*/
sg_size_t MSG_storage_get_used_size(msg_storage_t storage){
- return simgrid::simix::kernelImmediate([storage] { return surf_storage_resource_priv(storage)->getUsedSize(); });
+ return storage->sizeUsed();
}
/** \ingroup msg_storage_management
xbt_dict_t MSG_storage_get_properties(msg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters (storage is nullptr)");
- return (simcall_storage_get_properties(storage));
+ return storage->properties();
}
/** \ingroup msg_storage_management
*/
void MSG_storage_set_property_value(msg_storage_t storage, const char* name, char* value)
{
- xbt_dict_set(MSG_storage_get_properties(storage), name, value, nullptr);
+ storage->setProperty(name, value);
}
/** \ingroup m_storage_management
*/
const char *MSG_storage_get_property_value(msg_storage_t storage, const char *name)
{
- return static_cast<char*>(xbt_dict_get_or_null(MSG_storage_get_properties(storage), name));
+ return storage->property(name);
}
/** \ingroup msg_storage_management
*/
msg_storage_t MSG_storage_get_by_name(const char *name)
{
- return static_cast<msg_storage_t>(xbt_lib_get_elm_or_null(storage_lib,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() {
- xbt_lib_cursor_t cursor;
- char *key;
- void **data;
xbt_dynar_t res = xbt_dynar_new(sizeof(msg_storage_t),nullptr);
-
- xbt_lib_foreach(storage_lib, cursor, key, data) {
- if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), MSG_STORAGE_LEVEL) != nullptr) {
- xbt_dictelm_t elm = xbt_dict_cursor_get_elm(cursor);
- xbt_dynar_push(res, &elm);
- }
+ for (auto s : *simgrid::s4u::allStorages()) {
+ xbt_dynar_push(res, &(s.second));
}
return res;
}
*/
msg_error_t MSG_storage_set_data(msg_storage_t storage, void *data)
{
- msg_storage_priv_t priv = MSG_storage_priv(storage);
- priv->data = data;
+ storage->setUserdata(data);
return MSG_OK;
}
void *MSG_storage_get_data(msg_storage_t storage)
{
xbt_assert((storage != nullptr), "Invalid parameters");
- msg_storage_priv_t priv = MSG_storage_priv(storage);
- return priv->data;
+ return storage->userdata();
}
/** \ingroup msg_storage_management
*/
xbt_dict_t MSG_storage_get_content(msg_storage_t storage)
{
- std::map<std::string, sg_size_t*>* content =
- simgrid::simix::kernelImmediate([storage] { return surf_storage_resource_priv(storage)->getContent(); });
+ std::map<std::string, sg_size_t*>* content = storage->content();
xbt_dict_t content_dict = xbt_dict_new_homogeneous(nullptr);
for (auto entry : *content) {
*/
sg_size_t MSG_storage_get_size(msg_storage_t storage)
{
- msg_storage_priv_t priv = MSG_storage_priv(storage);
- return priv->size;
+ return storage->size();
}
/** \ingroup msg_storage_management
*/
const char *MSG_storage_get_host(msg_storage_t storage) {
xbt_assert((storage != nullptr), "Invalid parameters");
- msg_storage_priv_t priv = MSG_storage_priv(storage);
- return priv->hostname;
+ return storage->host();
}
SG_END_DECL()
