X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bd1bbd35034c2e93a030a676dc244ad2cf74c70..9e16470be6ab815e9db9f301760848bb5492dd43:/teshsuite/msg/task_progress/task_progress.cpp

diff --git a/teshsuite/msg/task_progress/task_progress.cpp b/teshsuite/msg/task_progress/task_progress.cpp
index 7c3ad78048..3971b80b0c 100644
--- a/teshsuite/msg/task_progress/task_progress.cpp
+++ b/teshsuite/msg/task_progress/task_progress.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,6 +6,8 @@
 #include <xbt/ex.hpp>
 #include "simgrid/msg.h"
 
+#include <stdio.h> /* snprintf */
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 static std::vector<msg_task_t> tasks = std::vector<msg_task_t>();
@@ -15,22 +16,23 @@ static int seq_task(int /*argc*/, char* /*argv*/ [])
 {
   double task_comp_size = 5E7;
   double task_comm_size = 1E6;
-  double progress = 0;
+  double progress;
 
   msg_task_t task = MSG_task_create("simple", task_comp_size, task_comm_size, NULL);
   tasks.push_back(task);
 
   XBT_INFO("get the progress of %s before the task starts", task->name);
   progress = MSG_task_get_remaining_work_ratio(task);
-  xbt_assert(progress == 0, "Progress should be 0 not %f", progress);
+  xbt_assert(progress == 1.0, "Progress should be 1.0 not %f", progress);
 
   XBT_INFO("Executing task: \"%s\"", task->name);
   MSG_task_execute(task);
 
   XBT_INFO("get the progress of %s after the task finishes", task->name);
   progress = MSG_task_get_remaining_work_ratio(task);
-  xbt_assert(progress == 0, "Progress should be equal to 1 not %f", progress);
+  xbt_assert(progress == 0.0, "Progress should be equal to 0.0 not %f", progress);
 
+  MSG_task_destroy(task);
   XBT_INFO("Goodbye now!");
   return 0;
 }
@@ -39,7 +41,7 @@ static int par_task(int /*argc*/, char* /*argv*/ [])
 {
   double * computation_amount = new double[2] {10E7, 10E7};
   double * communication_amount = new double[4] {1E6, 1E6, 1E6, 1E6};
-  double progress = 0;
+  double progress;
 
   std::vector<msg_host_t> hosts_to_use = std::vector<msg_host_t>();
   hosts_to_use.push_back(MSG_get_host_by_name("Tremblay"));
@@ -50,14 +52,18 @@ static int par_task(int /*argc*/, char* /*argv*/ [])
 
   XBT_INFO("get the progress of %s before the task starts", task->name);
   progress = MSG_task_get_remaining_work_ratio(task);
-  xbt_assert(progress == 0, "Progress should be 0 not %f", progress);
+  xbt_assert(progress == 1.0, "Progress should be 1.0 not %f", progress);
 
   XBT_INFO("Executing task: \"%s\"", task->name);
   MSG_parallel_task_execute(task);
 
   XBT_INFO("get the progress of %s after the task finishes", task->name);
   progress = MSG_task_get_remaining_work_ratio(task);
-  xbt_assert(progress == 0, "Progress should be equal to 1 not %f", progress);
+  xbt_assert(progress == 0.0, "Progress should be equal to 0.0 not %f", progress);
+
+  MSG_task_destroy(task);
+  delete[] computation_amount;
+  delete[] communication_amount;
 
   XBT_INFO("Goodbye now!");
   return 0;