Use kernelImmediate for simcall set_category.

[simgrid.git] / examples / simdag / goal / goal_test.c

diff --git a/examples/simdag/goal/goal_test.c b/examples/simdag/goal/goal_test.c
index 4f1ddf5..05cc09d 100644 (file)
--- a/examples/simdag/goal/goal_test.c
+++ b/examples/simdag/goal/goal_test.c
@@ -1,48 +1,58 @@
-/* GOAL loader prototype. Not ready for public usage yet */
-
-/* Copyright (c) 2011. The SimGrid Team.
+/* Example of scatter communication, accepting a large amount of processes.
+ * This based the experiment of Fig. 4 in http://hal.inria.fr/hal-00650233/
+ * That experiment is a comparison to the LogOPSim simulator, that takes
+ * GOAL files as an input, thus the file name. But there is no actual link
+ * to the GOAL formalism beside of this.
+ */
+
+/* Copyright (c) 2011-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. */
 
-#include <stdlib.h>
 #include <stdio.h>
-#include "simdag/simdag.h"
-#include "xbt/log.h"
-#include "xbt/ex.h"
-#include <string.h>
+#include "simgrid/simdag.h"
+#include "xbt/xbt_os_time.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(goal, "The GOAL loader into SimDag");
 
 typedef struct {
-  int i, j, k;
-} s_bcast_task_t,*bcast_task_t;
-
-
-const SD_workstation_t* ws_list;
+  int i;
+  int j;
+  int k;
+} s_bcast_task_t;
+typedef s_bcast_task_t *bcast_task_t;
+const sg_host_t* ws_list;
 int count = 0;
 
+xbt_dynar_t reclaimed;
+
 static void send_one(int from, int to) {
-  //XBT_DEBUG("send_one(%d, %d)",from,to);
 
-  if (count %1000 == 0)
+  if (count %100000 == 0)
     XBT_INFO("Sending task #%d",count);
   count++;
 
-  bcast_task_t bt = xbt_new(s_bcast_task_t,1);
-
+  bcast_task_t bt;
+  if (!xbt_dynar_is_empty(reclaimed)) {
+     bt = xbt_dynar_pop_as(reclaimed,bcast_task_t);
+  } else {
+    bt = xbt_new(s_bcast_task_t,1);
+  }
   bt->i=from;
   bt->j=(from+to)/2;
   bt->k=to;
 
-  SD_task_t t = 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(t,2,ws_list[bt->i],ws_list[bt->j]);
-  SD_task_watch(t,SD_DONE);
+  SD_task_schedulel(task,2,ws_list[bt->i],ws_list[bt->j]);
+  SD_task_watch(task,SD_DONE);
 }
 
 int main(int argc, char **argv) {
+  xbt_os_timer_t timer = xbt_os_timer_new();
 
   /* initialization of SD */
   SD_init(&argc, argv);
@@ -53,11 +63,14 @@ int main(int argc, char **argv) {
     SD_create_environment("../../platforms/One_cluster_no_backbone.xml");
   }
 
-  ws_list = SD_workstation_get_list();
-  xbt_dynar_t done = NULL;
-  send_one(0,10000);
+  ws_list = sg_host_list();
+  reclaimed = xbt_dynar_new(sizeof(bcast_task_t),xbt_free_ref);
+  xbt_dynar_t done = xbt_dynar_new(sizeof(SD_task_t), NULL);
+
+  xbt_os_cputimer_start(timer);
+  send_one(0,sg_host_count());
   do {
-    if (done != NULL && xbt_dynar_length(done) > 0) {
+    if (!xbt_dynar_is_empty(done)) {
       unsigned int cursor;
       SD_task_t task;
 
@@ -69,14 +82,23 @@ int main(int argc, char **argv) {
         if (bt->j != bt->k -1)
           send_one(bt->j,bt->k);
 
+        if (xbt_dynar_length(reclaimed)<100) {
+          xbt_dynar_push_as(reclaimed,bcast_task_t,bt);
+        } else {
+          free(bt);
+        }
         SD_task_destroy(task);
-        free(bt);
       }
-      xbt_dynar_free(&done);
+      xbt_dynar_free_container(&done);
     }
-    done=SD_simulate(-1);
-  } while(xbt_dynar_length(done) > 0);
+    SD_simulate_with_update(-1, done);
+  } while(!xbt_dynar_is_empty(done));
+  xbt_os_cputimer_stop(timer);
+  printf("exec_time:%f\n", xbt_os_timer_elapsed(timer) );
+
+  xbt_dynar_free(&done);
+  xbt_dynar_free(&reclaimed);
 
-  SD_exit();
+  XBT_INFO("Done. Bailing out");
   return 0;
 }