Preparing release 2.6

Author: henricasanova

CMakeLists.txt

@@ -79,7 +79,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(WRENCH_VERSION_MAJOR "2")
 set(WRENCH_VERSION_MINOR "6")
 set(WRENCH_VERSION_PATCH "0")
-set(WRENCH_VERSION_EXTRA "dev")
+set(WRENCH_VERSION_EXTRA "")
 
 if (${WRENCH_VERSION_PATCH} EQUAL "0")
     set(WRENCH_RELEASE_VERSION "${WRENCH_VERSION_MAJOR}.${WRENCH_VERSION_MINOR}")

RELEASENOTES.md

@@ -1,7 +1,7 @@
 WRENCH Release Notes
 ------
 
-### wrench 2.6-dev
+### wrench 2.6
 
 - Implementation of a "backfilling depth" feature for EASY and convervative_bf batch scheduling algorithms
 - Upgrade to SimGrid v4.0 and FSMod v0.3

doc/source/installation.rst

@@ -22,10 +22,10 @@ And, one of the following: - **g++** - version 7.5 or higher - **clang**
 Required Dependencies
 ---------------------
 
--  `SimGrid <https://simgrid.org/>`__ ??? version 3.36
--  `SimGrid File System Module <https://github.com/simgrid/file-system-module>`__ ??? version 0.2 or higher
+-  `SimGrid <https://simgrid.org/>`__ ??? version 4.0
+-  `SimGrid File System Module <https://github.com/simgrid/file-system-module>`__ ??? version 0.3 or higher
 -  `JSON for Modern C++ <https://github.com/nlohmann/json>`__ ??? version
-   3.9.0 or higher
+   3.11.0 or higher
 
 (See the :ref:`install-troubleshooting` section below if encountering difficulties
 installing dependencies)

include/wrench/services/compute/ComputeService.h

@@ -120,9 +120,9 @@ namespace wrench {
 
         std::map<std::string, double> getCoreFlopRate(bool simulate_it = false);
 
-        double getTotalScratchSpaceSize() const;
+        sg_size_t getTotalScratchSpaceSize() const;
 
-        double getFreeScratchSpaceSize() const;
+        sg_size_t getFreeScratchSpaceSize() const;
 
 
         /***********************/

include/wrench/services/storage/xrootd/Deployment.h

@@ -56,7 +56,7 @@ namespace wrench {
             //            virtual void createFile(const std::shared_ptr<DataFile> &file, const std::shared_ptr<Node> &location);
             void deleteFile(const std::shared_ptr<DataFile> &file);
             void removeFileLocation(const std::shared_ptr<DataFile> &file, const std::shared_ptr<Node> &location);
-            unsigned int size();
+            unsigned int size() const;
             /***********************/
             /** \endcond          */
             /***********************/
@@ -73,7 +73,7 @@ namespace wrench {
             /***********************/
 
             std::shared_ptr<Node> root_supervisor = nullptr;
-            std::shared_ptr<Node> createStorageServer(const std::string &hostname, const std::string &mount_point, WRENCH_PROPERTY_COLLECTION_TYPE storage_property_list, WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE storage_messagepayload_list, WRENCH_PROPERTY_COLLECTION_TYPE node_property_list = {}, WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE node_messagepayload_list = {});
+            std::shared_ptr<Node> createStorageServer(const std::string &hostname, const std::string &mount_point, WRENCH_PROPERTY_COLLECTION_TYPE storage_property_list, WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE storage_messagepayload_list, const WRENCH_PROPERTY_COLLECTION_TYPE& node_property_list = {}, const WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE& node_messagepayload_list = {});
             std::shared_ptr<Node> createSupervisor(const std::string &hostname, WRENCH_PROPERTY_COLLECTION_TYPE node_property_list = {}, WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE node_messagepayload_list = {});
 
             friend Node;

include/wrench/simulation/Version.h

@@ -9,5 +9,5 @@
  */
 
 namespace wrench {
-#define WRENCH_VERSION_STRING "2.6-dev"
+#define WRENCH_VERSION_STRING "2.6"
 }// namespace wrench

src/wrench/services/compute/ComputeService.cpp

@@ -416,16 +416,16 @@ namespace wrench {
      * @brief Get the total capacity of the compute service's scratch storage space
      * @return a size (in bytes)
      */
-    double ComputeService::getTotalScratchSpaceSize() const {
+    sg_size_t ComputeService::getTotalScratchSpaceSize() const {
         // A scratch space SS is always created with a single mount point
-        return this->scratch_space_storage_service ? this->scratch_space_storage_service->getTotalSpace() : 0.0;
+        return this->scratch_space_storage_service ? this->scratch_space_storage_service->getTotalSpace() : 0;
     }
 
     /**
      * @brief Get the free space on the compute service's scratch storage space
      * @return a size (in bytes)
      */
-    double ComputeService::getFreeScratchSpaceSize() const {
+    sg_size_t ComputeService::getFreeScratchSpaceSize() const {
         return this->scratch_space_storage_service->getTotalFreeSpace();
     }
 

src/wrench/services/helper_services/host_state_change_detector/HostStateChangeDetectorMessage.cpp

@@ -27,7 +27,7 @@ namespace wrench {
      * @param hostname: the name of the host that has turned on
      */
     HostHasTurnedOnMessage::HostHasTurnedOnMessage(const std::string& hostname) : HostStateChangeDetectorMessage() {
-        this->hostname = std::move(hostname);
+        this->hostname = hostname;
     }
 
     /**
@@ -36,7 +36,7 @@ namespace wrench {
      * @param hostname: the name of the host that has turned off
      */
     HostHasTurnedOffMessage::HostHasTurnedOffMessage(const std::string& hostname) : HostStateChangeDetectorMessage() {
-        this->hostname = std::move(hostname);
+        this->hostname = hostname;
     }
 
     /**

src/wrench/services/storage/xrootd/Deployment.cpp

@@ -78,9 +78,9 @@ namespace wrench {
                 const std::string &mount_point,
                 WRENCH_PROPERTY_COLLECTION_TYPE storage_property_list,
                 WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE storage_messagepayload_list,
-                WRENCH_PROPERTY_COLLECTION_TYPE node_property_list,
-                WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE node_messagepayload_list) {
-            std::shared_ptr<Node> ret = createNode(hostname, std::move(node_property_list), std::move(node_messagepayload_list));
+                const WRENCH_PROPERTY_COLLECTION_TYPE& node_property_list,
+                const WRENCH_MESSAGE_PAYLOAD_COLLECTION_TYPE& node_messagepayload_list) {
+            std::shared_ptr<Node> ret = createNode(hostname, node_property_list, node_messagepayload_list);
             ret->makeFileServer({mount_point}, std::move(storage_property_list), std::move(storage_messagepayload_list));
             simulation->add(ret->internalStorage);
             dataservers.push_back(ret);
@@ -122,7 +122,7 @@ namespace wrench {
         *
         * @return the number of nodes in the federation
         */
-        unsigned int Deployment::size() {
+        unsigned int Deployment::size() const {
             return nodes.size();
         }