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);
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]);
}
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);
+ 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;
xbt_dynar_free(&done);
}
done=SD_simulate(-1);
- } while(xbt_dynar_length(done) > 0);
+ } while(!xbt_dynar_is_empty(done));
+ xbt_dynar_free(&done);
+ xbt_dynar_free(&reclaimed);
SD_exit();
+ XBT_INFO("Done. Bailing out");
return 0;
}