From a482fa6d0b446a1adc8a673aa299296b3c2a2b5b Mon Sep 17 00:00:00 2001 From: Fred Suter Date: Fri, 17 May 2024 09:46:32 -0400 Subject: [PATCH] constify a few methods --- include/fsmod/JBODStorage.hpp | 6 +++--- include/fsmod/Partition.hpp | 6 +++--- src/Partition.cpp | 6 +++--- test/caching_test.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/fsmod/JBODStorage.hpp b/include/fsmod/JBODStorage.hpp index e0cd34d..d4ae5bc 100644 --- a/include/fsmod/JBODStorage.hpp +++ b/include/fsmod/JBODStorage.hpp @@ -33,8 +33,8 @@ namespace simgrid::module::fs { * @brief Retrieves the storage's RAID level * @return A RAID level */ - [[nodiscard]] RAID get_raid_level() { return raid_level_; } - + [[nodiscard]] RAID get_raid_level() const { return raid_level_; } + void set_raid_level(RAID raid_level); @@ -44,7 +44,7 @@ namespace simgrid::module::fs { void write(sg_size_t size) override; protected: - s4u::MessageQueue* mqueue() { return mq_; } + s4u::MessageQueue* mqueue() const { return mq_; } JBODStorage(const std::string& name, const std::vector& disks); void update_parity_disk_idx() { parity_disk_idx_ = (parity_disk_idx_- 1) % num_disks_; } diff --git a/include/fsmod/Partition.hpp b/include/fsmod/Partition.hpp index d7e0ac4..803a6a2 100644 --- a/include/fsmod/Partition.hpp +++ b/include/fsmod/Partition.hpp @@ -85,11 +85,11 @@ namespace simgrid::module::fs { [[nodiscard]] std::shared_ptr get_storage() const { return storage_; } - [[nodiscard]] bool directory_exists(const std::string& dir_path) { return content_.find(dir_path) != content_.end(); } - std::set list_files_in_directory(const std::string &dir_path); + [[nodiscard]] bool directory_exists(const std::string& dir_path) const { return content_.find(dir_path) != content_.end(); } + std::set list_files_in_directory(const std::string &dir_path) const; void delete_directory(const std::string &dir_path); - [[nodiscard]] FileMetadata* get_file_metadata(const std::string& dir_path, const std::string& file_name); + [[nodiscard]] FileMetadata* get_file_metadata(const std::string& dir_path, const std::string& file_name) const; void create_new_file(const std::string& dir_path, const std::string& file_name, sg_size_t size); diff --git a/src/Partition.cpp b/src/Partition.cpp index 388514e..8df1a7f 100644 --- a/src/Partition.cpp +++ b/src/Partition.cpp @@ -18,7 +18,7 @@ namespace simgrid::module::fs { * @param file_name: the file name * @return A pointer to MetaData, or nullptr if the directory or file is not found */ - FileMetadata *Partition::get_file_metadata(const std::string &dir_path, const std::string &file_name) { + FileMetadata *Partition::get_file_metadata(const std::string &dir_path, const std::string &file_name) const { try { return content_.at(dir_path).at(file_name).get(); } catch (std::out_of_range &e) { @@ -122,12 +122,12 @@ namespace simgrid::module::fs { content_[dst_dir_path][dst_file_name] = std::move(uniq_ptr); } - std::set Partition::list_files_in_directory(const std::string &dir_path) { + std::set Partition::list_files_in_directory(const std::string &dir_path) const { if (content_.find(dir_path) == content_.end()) { throw FileSystemException(XBT_THROW_POINT, "Directory does not exist"); } std::set < std::string > keys; - for (auto const &key: content_[dir_path]) { + for (auto const &key: content_.at(dir_path)) { keys.insert(key.first); } return keys; diff --git a/test/caching_test.cpp b/test/caching_test.cpp index c698605..be54325 100644 --- a/test/caching_test.cpp +++ b/test/caching_test.cpp @@ -24,7 +24,7 @@ class CachingTest : public ::testing::Test { CachingTest() = default; void setup_platform() { - XBT_INFO("Creating a platform with one host and two disks..."); + XBT_INFO("Creating a platform with one host and one disk..."); auto *my_zone = sg4::create_full_zone("zone"); host_ = my_zone->create_host("my_host", "100Gf"); disk_ = host_->create_disk("disk", "1kBps", "2kBps");