example fixes

wrench-project · Oct 16, 2024 · 0bddb01 · 0bddb01
1 parent 7eab3d1
commit 0bddb01
Show file tree

Hide file tree

Showing 81 changed files with 289 additions and 288 deletions.
diff --git a/examples/action_api/XRootD/Controller.cpp b/examples/action_api/XRootD/Controller.cpp
@@ -14,8 +14,8 @@
  **/
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MBYTE (1000.0 * 1000.0)
-#define GBYTE (1000.0 * 1000.0 * 1000.0)
+#define MBYTE (1000000ULL)
+#define GBYTE (1000000000ULL)
 
 #include <iostream>
 #include <iomanip>
@@ -169,7 +169,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void Controller::processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent> event) {
+    void Controller::processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->job;
         WRENCH_INFO("Notified that compound job %s has successfully completed", job->getName().c_str());
@@ -180,7 +180,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void Controller::processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent> event) {
+    void Controller::processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->job;
         auto action = *(job->getActions().begin());

diff --git a/examples/action_api/XRootD/Controller.h b/examples/action_api/XRootD/Controller.h
@@ -31,8 +31,8 @@ namespace wrench {
 
     protected:
         // Overridden method
-        void processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent>) override;
-        void processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent> event) override;
+        void processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) override;
+        void processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) override;
 
     private:
         // main() method of the Controller

diff --git a/examples/action_api/bare-metal-bag-of-actions/TwoActionsAtATimeExecutionController.cpp b/examples/action_api/bare-metal-bag-of-actions/TwoActionsAtATimeExecutionController.cpp
@@ -18,7 +18,7 @@
 #include "TwoActionsAtATimeExecutionController.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
+#define MB (1000000ULL)
 
 WRENCH_LOG_CATEGORY(custom_controller, "Log category for TwoActionsAtATimeExecutionController");
 
@@ -118,7 +118,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void TwoActionsAtATimeExecutionController::processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent> event) {
+    void TwoActionsAtATimeExecutionController::processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) {
         WRENCH_INFO("Compound job %s has completed:", event->job->getName().c_str());
         // sort actions by start time
         auto job_actions = event->job->getActions();
@@ -145,7 +145,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void TwoActionsAtATimeExecutionController::processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent> event) {
+    void TwoActionsAtATimeExecutionController::processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) {
         WRENCH_INFO("Compound job %s has failed!", event->job->getName().c_str());
         throw std::runtime_error("This should not happen in this example");
     }

diff --git a/examples/action_api/bare-metal-bag-of-actions/TwoActionsAtATimeExecutionController.h b/examples/action_api/bare-metal-bag-of-actions/TwoActionsAtATimeExecutionController.h
@@ -33,8 +33,8 @@ namespace wrench {
 
     protected:
         // Overridden method
-        void processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent>) override;
-        void processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent>) override;
+        void processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) override;
+        void processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) override;
 
     private:
         // main() method of the WMS

diff --git a/examples/action_api/batch-bag-of-actions/GreedyExecutionController.cpp b/examples/action_api/batch-bag-of-actions/GreedyExecutionController.cpp
@@ -17,7 +17,7 @@
 #include "GreedyExecutionController.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
+#define MB (1000000ULL)
 
 WRENCH_LOG_CATEGORY(custom_controller, "Log category for GreedyExecutionController");
 

diff --git a/examples/action_api/batch-mpi-action/BatchMPIActionController.cpp b/examples/action_api/batch-mpi-action/BatchMPIActionController.cpp
@@ -18,7 +18,7 @@
 #include "smpi/smpi.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
+#define MB (1000000ULL)
 
 #define COMMUNICATOR_SIZE 16UL
 

diff --git a/examples/action_api/cloud-bag-of-actions/GreedyExecutionController.cpp b/examples/action_api/cloud-bag-of-actions/GreedyExecutionController.cpp
@@ -18,7 +18,7 @@
 #include "GreedyExecutionController.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
+#define MB (1000000ULL)
 
 WRENCH_LOG_CATEGORY(custom_controller, "Log category for GreedyExecutionController");
 
@@ -158,15 +158,15 @@ namespace wrench {
      * @brief Method to handle a compound job failure
      * @param event: the event
      */
-    void GreedyExecutionController::processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent> event) {
+    void GreedyExecutionController::processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) {
         WRENCH_INFO("Job %s failed!", event->job->getName().c_str());
     }
 
     /**
      * @brief Method to handle a compound job completion
      * @param event: the event
      */
-    void GreedyExecutionController::processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent> event) {
+    void GreedyExecutionController::processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) {
         WRENCH_INFO("Job %s completed successfully!", event->job->getName().c_str());
     }
 

diff --git a/examples/action_api/cloud-bag-of-actions/GreedyExecutionController.h b/examples/action_api/cloud-bag-of-actions/GreedyExecutionController.h
@@ -42,8 +42,8 @@ namespace wrench {
 
         int num_actions;
 
-        void processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent>) override;
-        void processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent>) override;
+        void processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) override;
+        void processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) override;
     };
 }// namespace wrench
 #endif//WRENCH_EXAMPLE_GREEDY_EXECUTION_CONTROLLER_H
diff --git a/examples/action_api/communicating-custom-actions/CommunicatingActions.cpp b/examples/action_api/communicating-custom-actions/CommunicatingActions.cpp
@@ -26,7 +26,7 @@
 
 #include "CommunicatingActionsController.h"// Controller implementation
 
-#define KB 1000.0
+#define KB 1000ULL
 #define MB (1000 * KB)
 #define GB (1000 * MB)
 #define GB (1000 * MB)

diff --git a/examples/action_api/communicating-custom-actions/CommunicatingActionsController.cpp b/examples/action_api/communicating-custom-actions/CommunicatingActionsController.cpp
@@ -17,7 +17,7 @@
 #include "CommunicatingActionsController.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
+#define MB (1000000ULL)
 
 #define COMMUNICATOR_SIZE 16UL
 
@@ -103,7 +103,7 @@ namespace wrench {
 
                     // Participate in an all to all communication
                     unsigned long num_comm_bytes = 1 * MB;
-                    std::map<unsigned long, double> sends;
+                    std::map<unsigned long, sg_size_t> sends;
                     for (unsigned long i = 0; i < num_ranks; i++) {
                         if (i != my_rank) {
                             sends[i] = num_comm_bytes;

diff --git a/examples/action_api/job-action-failure/JobActionFailureController.cpp b/examples/action_api/job-action-failure/JobActionFailureController.cpp
@@ -17,8 +17,8 @@
 #include "JobActionFailureController.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
-#define GB (1000.0 * 1000.0 * 1000.0)
+#define MB (1000000ULL)
+#define GB (1000000000ULL)
 
 WRENCH_LOG_CATEGORY(custom_controller, "Log category for JobActionFailureController");
 

diff --git a/examples/action_api/multi-action-multi-job/MultiActionMultiJobController.cpp b/examples/action_api/multi-action-multi-job/MultiActionMultiJobController.cpp
@@ -17,7 +17,7 @@
 #include "MultiActionMultiJobController.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
+#define MB (1000000ULL)
 
 WRENCH_LOG_CATEGORY(custom_controller, "Log category for MultiActionMultiJobController");
 
@@ -144,7 +144,7 @@ namespace wrench {
                                 action->getName().c_str(),
                                 action->getExecutionHistory().top().execution_host.c_str(),
                                 action->getExecutionHistory().top().physical_execution_host.c_str());
-                    WRENCH_INFO("     - it used %lu cores for computation, and %.2lf bytes of RAM",
+                    WRENCH_INFO("     - it used %lu cores for computation, and %llu bytes of RAM",
                                 action->getExecutionHistory().top().num_cores_allocated,
                                 action->getExecutionHistory().top().ram_allocated);
                     WRENCH_INFO("     - it started at time %.2lf and finished at time %.2lf",

diff --git a/examples/action_api/storage-service-proxy/Controller.cpp b/examples/action_api/storage-service-proxy/Controller.cpp
@@ -15,7 +15,7 @@
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
 #define MBYTE (1000.0 * 1000.0)
-#define GBYTE (1000.0 * 1000.0 * 1000.0)
+#define GB (1000000000ULL)
 
 #include <iostream>
 #include <iomanip>
@@ -172,7 +172,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void Controller::processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent> event) {
+    void Controller::processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->job;
         WRENCH_INFO("Notified that compound job %s has successfully completed", job->getName().c_str());
@@ -183,7 +183,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void Controller::processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent> event) {
+    void Controller::processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->job;
         auto action = *(job->getActions().begin());

diff --git a/examples/action_api/storage-service-proxy/Controller.h b/examples/action_api/storage-service-proxy/Controller.h
@@ -32,8 +32,8 @@ namespace wrench {
 
     protected:
         // Overridden method
-        void processEventCompoundJobCompletion(std::shared_ptr<CompoundJobCompletedEvent>) override;
-        void processEventCompoundJobFailure(std::shared_ptr<CompoundJobFailedEvent> event) override;
+        void processEventCompoundJobCompletion(const std::shared_ptr<CompoundJobCompletedEvent> &event) override;
+        void processEventCompoundJobFailure(const std::shared_ptr<CompoundJobFailedEvent> &event) override;
 
     private:
         // main() method of the Controller

diff --git a/examples/action_api/super-custom-action/SuperCustomActionController.cpp b/examples/action_api/super-custom-action/SuperCustomActionController.cpp
@@ -17,7 +17,7 @@
 #include "SuperCustomActionController.h"
 
 #define GFLOP (1000.0 * 1000.0 * 1000.0)
-#define MB (1000.0 * 1000.0)
+#define MB (1000000ULL)
 
 WRENCH_LOG_CATEGORY(custom_controller, "Log category for SuperCustomActionController");
 
@@ -138,7 +138,7 @@ namespace wrench {
                             action->getName().c_str(),
                             action->getExecutionHistory().top().execution_host.c_str(),
                             action->getExecutionHistory().top().physical_execution_host.c_str());
-                WRENCH_INFO("     - it used %lu cores for computation, and %.2lf bytes of RAM",
+                WRENCH_INFO("     - it used %lu cores for computation, and %luu bytes of RAM",
                             action->getExecutionHistory().top().num_cores_allocated,
                             action->getExecutionHistory().top().ram_allocated);
                 WRENCH_INFO("     - it started at time %.2lf and finished at time %.2lf",

diff --git a/...w_api/basic-examples/bare-metal-bag-of-tasks-programmatic-platform/TwoTasksAtATimeWMS.cpp b/...w_api/basic-examples/bare-metal-bag-of-tasks-programmatic-platform/TwoTasksAtATimeWMS.cpp
@@ -137,7 +137,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void TwoTasksAtATimeWMS::processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent> event) {
+    void TwoTasksAtATimeWMS::processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's tasks */
@@ -152,7 +152,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void TwoTasksAtATimeWMS::processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent> event) {
+    void TwoTasksAtATimeWMS::processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         WRENCH_INFO("Notified that a standard job has failed (failure cause: %s)",

diff --git a/...low_api/basic-examples/bare-metal-bag-of-tasks-programmatic-platform/TwoTasksAtATimeWMS.h b/...low_api/basic-examples/bare-metal-bag-of-tasks-programmatic-platform/TwoTasksAtATimeWMS.h
@@ -31,8 +31,8 @@ namespace wrench {
 
     protected:
         // Overridden method
-        void processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent>) override;
-        void processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent>) override;
+        void processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) override;
+        void processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) override;
 
     private:
         // main() method of the WMS

diff --git a/examples/workflow_api/basic-examples/bare-metal-chain-scratch/WorkflowAsAsingleJobWMS.cpp b/examples/workflow_api/basic-examples/bare-metal-chain-scratch/WorkflowAsAsingleJobWMS.cpp
@@ -101,7 +101,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void WorkflowAsAsingleJobWMS::processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent> event) {
+    void WorkflowAsAsingleJobWMS::processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */
@@ -115,7 +115,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void WorkflowAsAsingleJobWMS::processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent> event) {
+    void WorkflowAsAsingleJobWMS::processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */

diff --git a/examples/workflow_api/basic-examples/bare-metal-chain-scratch/WorkflowAsAsingleJobWMS.h b/examples/workflow_api/basic-examples/bare-metal-chain-scratch/WorkflowAsAsingleJobWMS.h
@@ -31,8 +31,8 @@ namespace wrench {
 
     protected:
         // Overridden methods
-        void processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent>) override;
-        void processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent>) override;
+        void processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) override;
+        void processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) override;
 
     private:
         // main() method of the WMS

diff --git a/examples/workflow_api/basic-examples/bare-metal-chain/OneTaskAtATimeWMS.cpp b/examples/workflow_api/basic-examples/bare-metal-chain/OneTaskAtATimeWMS.cpp
@@ -93,7 +93,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void OneTaskAtATimeWMS::processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent> event) {
+    void OneTaskAtATimeWMS::processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */
@@ -106,7 +106,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void OneTaskAtATimeWMS::processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent> event) {
+    void OneTaskAtATimeWMS::processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */

diff --git a/examples/workflow_api/basic-examples/bare-metal-chain/OneTaskAtATimeWMS.h b/examples/workflow_api/basic-examples/bare-metal-chain/OneTaskAtATimeWMS.h
@@ -33,8 +33,8 @@ namespace wrench {
 
     protected:
         // Overridden method
-        void processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent>) override;
-        void processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent>) override;
+        void processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) override;
+        void processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) override;
 
     private:
         // main() method of the WMS

diff --git a/examples/workflow_api/basic-examples/bare-metal-complex-job/ComplexJobWMS.cpp b/examples/workflow_api/basic-examples/bare-metal-complex-job/ComplexJobWMS.cpp
@@ -112,7 +112,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void ComplexJobWMS::processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent> event) {
+    void ComplexJobWMS::processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */
@@ -125,7 +125,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void ComplexJobWMS::processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent> event) {
+    void ComplexJobWMS::processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */

diff --git a/examples/workflow_api/basic-examples/bare-metal-complex-job/ComplexJobWMS.h b/examples/workflow_api/basic-examples/bare-metal-complex-job/ComplexJobWMS.h
@@ -32,8 +32,8 @@ namespace wrench {
 
     protected:
         // Overridden method
-        void processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent>) override;
-        void processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent>) override;
+        void processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) override;
+        void processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) override;
 
     private:
         // main() method of the WMS

diff --git a/examples/workflow_api/basic-examples/bare-metal-data-movement/DataMovementWMS.cpp b/examples/workflow_api/basic-examples/bare-metal-data-movement/DataMovementWMS.cpp
@@ -136,7 +136,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void DataMovementWMS::processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent> event) {
+    void DataMovementWMS::processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */
@@ -149,7 +149,7 @@ namespace wrench {
      *
      * @param event: the event
      */
-    void DataMovementWMS::processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent> event) {
+    void DataMovementWMS::processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) {
         /* Retrieve the job that this event is for */
         auto job = event->standard_job;
         /* Retrieve the job's first (and in our case only) task */

diff --git a/examples/workflow_api/basic-examples/bare-metal-data-movement/DataMovementWMS.h b/examples/workflow_api/basic-examples/bare-metal-data-movement/DataMovementWMS.h
@@ -32,8 +32,8 @@ namespace wrench {
 
     protected:
         // Overridden method
-        void processEventStandardJobCompletion(std::shared_ptr<StandardJobCompletedEvent>) override;
-        void processEventStandardJobFailure(std::shared_ptr<StandardJobFailedEvent>) override;
+        void processEventStandardJobCompletion(const std::shared_ptr<StandardJobCompletedEvent> &event) override;
+        void processEventStandardJobFailure(const std::shared_ptr<StandardJobFailedEvent> &event) override;
 
     private:
         // main() method of the WMS