All tests pass without any valgrind warning

wrench-project · Jul 7, 2017 · 28bb148 · 28bb148
1 parent c50d807
commit 28bb148
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/wrench/services/compute_services/multicore_compute_service/MulticoreComputeService.cpp b/src/wrench/services/compute_services/multicore_compute_service/MulticoreComputeService.cpp
@@ -690,7 +690,7 @@ namespace wrench {
         return true;
 
       } else if (ComputeServiceSubmitPilotJobRequestMessage *msg = dynamic_cast<ComputeServiceSubmitPilotJobRequestMessage *>(message.get())) {
-        WRENCH_INFO("Asked to run a pilot job with %d cores for %lf seconds", msg->job->getNumCores(),
+        WRENCH_INFO("Asked to run a pilot job with %ld cores for %lf seconds", msg->job->getNumCores(),
                     msg->job->getDuration());
 
 //        WRENCH_INFO("THE REPLY MAILBOX IS %s", msg->answer_mailbox.c_str());

diff --git a/src/wrench/workflow_job/WorkflowJob.cpp b/src/wrench/workflow_job/WorkflowJob.cpp
@@ -21,8 +21,9 @@ namespace wrench {
      * @param type: job type
      * @param num_cores: the number of cores required by the job
      */
-    WorkflowJob::WorkflowJob(Type type, unsigned long num_cores) : type(type), num_cores(num_cores)
-                                                                                     {}
+    WorkflowJob::WorkflowJob(Type type, unsigned long num_cores) : type(type), num_cores(num_cores) {
+      this->parent_compute_service = nullptr;
+    }
 
 
     /**
@@ -69,7 +70,7 @@ namespace wrench {
      *
      * @return  the number of cores
      */
-    unsigned int WorkflowJob::getNumCores() {
+    unsigned long WorkflowJob::getNumCores() {
       return this->num_cores;
     }
 

diff --git a/src/wrench/workflow_job/WorkflowJob.h b/src/wrench/workflow_job/WorkflowJob.h
@@ -44,7 +44,7 @@ namespace wrench {
 
         std::string getName();
 
-        unsigned int getNumCores();
+        unsigned long getNumCores();
 
         /***********************/
         /** \cond INTERNAL     */