From e427576952c74965f2864ca87332f90dc1fc5924 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Tue, 2 Feb 2021 22:00:34 +0100 Subject: [PATCH] Storage-kill: no more storage in MSG --- include/simgrid/msg.h | 15 -------------- src/msg/msg_legacy.cpp | 46 ------------------------------------------ 2 files changed, 61 deletions(-) diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h index 0419396925..2216065ea4 100644 --- a/include/simgrid/msg.h +++ b/include/simgrid/msg.h @@ -162,21 +162,6 @@ XBT_PUBLIC void MSG_vm_resume(msg_vm_t vm); XBT_PUBLIC void MSG_vm_shutdown(msg_vm_t vm); XBT_PUBLIC void MSG_vm_destroy(msg_vm_t vm); -/* ******************************** Storage ********************************* */ -typedef sg_storage_t msg_storage_t; - -XBT_PUBLIC const char* MSG_storage_get_name(const_sg_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(const_sg_storage_t storage); -XBT_PUBLIC void MSG_storage_set_property_value(msg_storage_t storage, const char* name, const char* value); -XBT_PUBLIC const char* MSG_storage_get_property_value(const_sg_storage_t storage, const char* name); -XBT_PUBLIC xbt_dynar_t MSG_storages_as_dynar(); -XBT_PUBLIC void MSG_storage_set_data(msg_storage_t storage, void* data); -XBT_PUBLIC void* MSG_storage_get_data(const_sg_storage_t storage); -XBT_PUBLIC const char* MSG_storage_get_host(const_sg_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); - /* ******************************** Actor/process *************************** */ /** Processes are independent agents that can do stuff on their own. * They are in charge of executing your code interacting with the simulated world. diff --git a/src/msg/msg_legacy.cpp b/src/msg/msg_legacy.cpp index b98807b8de..ec0eee02f3 100644 --- a/src/msg/msg_legacy.cpp +++ b/src/msg/msg_legacy.cpp @@ -254,52 +254,6 @@ void MSG_zone_get_hosts(const_sg_netzone_t zone, xbt_dynar_t whereto) sg_zone_get_hosts(zone, whereto); } -/* ************************** Storages *************************** */ -const char* MSG_storage_get_name(const_sg_storage_t storage) -{ - return sg_storage_get_name(storage); -} -sg_storage_t MSG_storage_get_by_name(const char* name) -{ - return sg_storage_get_by_name(name); -} -xbt_dict_t MSG_storage_get_properties(const_sg_storage_t storage) -{ - return sg_storage_get_properties(storage); -} -void MSG_storage_set_property_value(sg_storage_t storage, const char* name, const char* value) -{ - sg_storage_set_property_value(storage, name, value); -} -const char* MSG_storage_get_property_value(const_sg_storage_t storage, const char* name) -{ - return sg_storage_get_property_value(storage, name); -} -xbt_dynar_t MSG_storages_as_dynar() -{ - return sg_storages_as_dynar(); -} -void MSG_storage_set_data(sg_storage_t storage, void* data) -{ - sg_storage_set_data(storage, data); -} -void* MSG_storage_get_data(const_sg_storage_t storage) -{ - return sg_storage_get_data(storage); -} -const char* MSG_storage_get_host(const_sg_storage_t storage) -{ - return sg_storage_get_host(storage); -} -sg_size_t MSG_storage_read(sg_storage_t storage, sg_size_t size) -{ - return sg_storage_read(storage, size); -} -sg_size_t MSG_storage_write(sg_storage_t storage, sg_size_t size) -{ - return sg_storage_write(storage, size); -} - /* ************************** hosts *************************** */ xbt_dynar_t MSG_hosts_as_dynar() // XBT_ATTRIB_DEPRECATED_v330 { -- 2.30.2