X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0213e3927d6ac21f3089d8a2d60f3603c8cbac43..3f0c94e70e5ee6fc659b2e1dd45c765e7afbd0fe:/examples/simdag/goal/goal_test.c

diff --git a/examples/simdag/goal/goal_test.c b/examples/simdag/goal/goal_test.c
index e35e30ef22..0cec495a68 100644
--- a/examples/simdag/goal/goal_test.c
+++ b/examples/simdag/goal/goal_test.c
@@ -12,6 +12,7 @@
 #include "xbt/log.h"
 #include "xbt/ex.h"
 #include <string.h>
+#include "xbt/xbt_os_time.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(goal, "The GOAL loader into SimDag");
 
@@ -33,7 +34,7 @@ static void send_one(int from, int to) {
   count++;
 
   bcast_task_t bt;
-  if (xbt_dynar_length(reclaimed)>0) {
+  if (!xbt_dynar_is_empty(reclaimed)) {
      bt = xbt_dynar_pop_as(reclaimed,bcast_task_t);
   } else {
     bt = xbt_new(s_bcast_task_t,1);
@@ -42,7 +43,7 @@ static void send_one(int from, int to) {
   bt->j=(from+to)/2;
   bt->k=to;
 
-  SD_task_t task = SD_task_create_comm_e2e("Blab",bt,424242);
+  SD_task_t task = SD_task_create_comm_e2e(NULL,bt,424242);
 
   XBT_DEBUG("Schedule task between %d and %d",bt->i,bt->j);
   SD_task_schedulel(task,2,ws_list[bt->i],ws_list[bt->j]);
@@ -51,6 +52,7 @@ static void send_one(int from, int to) {
 
 
 int main(int argc, char **argv) {
+  xbt_os_timer_t timer = xbt_os_timer_new();
 
   /* initialization of SD */
   SD_init(&argc, argv);
@@ -62,11 +64,13 @@ int main(int argc, char **argv) {
   }
 
   ws_list = SD_workstation_get_list();
-  reclaimed = xbt_dynar_new(sizeof(bcast_task_t),NULL);
+  reclaimed = xbt_dynar_new(sizeof(bcast_task_t),xbt_free_ref);
   xbt_dynar_t done = NULL;
-  send_one(0,262144);
+
+  xbt_os_timer_start(timer);
+  send_one(0,SD_workstation_get_number());
   do {
-    if (done != NULL && xbt_dynar_length(done) > 0) {
+    if (done != NULL && !xbt_dynar_is_empty(done)) {
       unsigned int cursor;
       SD_task_t task;
 
@@ -88,8 +92,14 @@ int main(int argc, char **argv) {
       xbt_dynar_free(&done);
     }
     done=SD_simulate(-1);
-  } while(xbt_dynar_length(done) > 0);
+  } while(!xbt_dynar_is_empty(done));
+  xbt_os_timer_stop(timer);
+  printf("%lf\n", xbt_os_timer_elapsed(timer) );
+
+  xbt_dynar_free(&done);
+  xbt_dynar_free(&reclaimed);
 
   SD_exit();
+  XBT_INFO("Done. Bailing out");
   return 0;
 }