int node;
char node_mbox[MAILBOX_NAME_SIZE];
msg_task_t task;
- xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+ msg_comm_t comms[GRID_NUM_NODES - 1] = {0};
XBT_VERB("Broadcast Jobs");
for (node = 1; node < GRID_NUM_NODES; node++){
task = MSG_task_create("Job", 100, 100, jobs[node-1]);
snprintf(node_mbox, MAILBOX_NAME_SIZE - 1, "%d", node);
- xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, node_mbox));
+ comms[node-1] = MSG_task_isend(task, node_mbox);
}
- MSG_comm_waitall(comms, -1);
-
- msg_comm_t comm;
- unsigned int cursor;
- xbt_dynar_foreach(comms, cursor, comm) {
- MSG_comm_destroy(comm);
- }
-
- xbt_dynar_free(&comms);
+ MSG_comm_waitall(comms, GRID_NUM_NODES-1, -1);
+ for (node = 1; node < GRID_NUM_NODES; node++)
+ MSG_comm_destroy(comms[node - 1]);
}
static node_job_t wait_job(int selfid)
int main(int argc, char *argv[])
{
#ifdef BENCH_THIS_CODE
- xbt_os_timer_t timer = xbt_os_timer_new();
+ xbt_os_cputimer_t timer = xbt_os_timer_new();
#endif
MSG_init(&argc, argv);
MSG_launch_application(application_file);
#ifdef BENCH_THIS_CODE
- xbt_os_timer_start(timer);
+ xbt_os_cputimer_start(timer);
#endif
msg_error_t res = MSG_main();
#ifdef BENCH_THIS_CODE
- xbt_os_timer_stop(timer);
+ xbt_os_cputimer_stop(timer);
#endif
XBT_CRITICAL("Simulated time: %g", MSG_get_clock());
static void receive_results(result_t *results){
int node;
- xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
+ msg_comm_t comms[GRID_NUM_NODES-1] = {0};
msg_task_t tasks[GRID_NUM_NODES-1] = {0};
XBT_VERB("Receive Results.");
/* Get the result from the nodes in the GRID */
for (node = 1; node < GRID_NUM_NODES; node++){
- xbt_dynar_push_as(comms, msg_comm_t, MSG_task_irecv(&tasks[node-1], "0"));
+ comms[node-1] = MSG_task_irecv(&tasks[node-1], "0");
}
- MSG_comm_waitall(comms, -1);
-
- msg_comm_t comm;
- unsigned int cursor;
- xbt_dynar_foreach(comms, cursor, comm) {
- MSG_comm_destroy(comm);
- }
- xbt_dynar_free(&comms);
+ MSG_comm_waitall(comms, GRID_NUM_NODES - 1, -1);
+ for (node = 1; node < GRID_NUM_NODES; node++)
+ MSG_comm_destroy(comms[node - 1]);
/* Reconstruct the result matrix */
for (node = 1; node < GRID_NUM_NODES; node++){