X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/922f6e237f2ad76ab469014cbaf995b27cac3ea7..5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a:/examples/msg/pmm/msg_pmm.c diff --git a/examples/msg/pmm/msg_pmm.c b/examples/msg/pmm/msg_pmm.c index eda3b83e55..ba8a65c1c4 100644 --- a/examples/msg/pmm/msg_pmm.c +++ b/examples/msg/pmm/msg_pmm.c @@ -70,7 +70,7 @@ int node(int argc, char **argv) int k, myid; char my_mbox[MAILBOX_NAME_SIZE]; node_job_t myjob, jobs[GRID_NUM_NODES]; - xbt_matrix_t A, B, C = NULL, sA, sB, sC; + xbt_matrix_t A, B, C, sA, sB, sC; result_t result; xbt_assert(argc != 1, "Wrong number of arguments for this node"); @@ -96,6 +96,7 @@ int node(int argc, char **argv) broadcast_jobs(jobs + 1); }else{ + A = B = C = NULL; /* Avoid warning at compilation */ myjob = wait_job(myid); } @@ -158,6 +159,10 @@ int node(int argc, char **argv) //xbt_matrix_dump(C, "C:res", 0, xbt_matrix_dump_display_double); + xbt_matrix_free(A); + xbt_matrix_free(B); + xbt_matrix_free(C); + /* The rest: return the result to node 0 */ }else{ msg_task_t task; @@ -170,10 +175,11 @@ int node(int argc, char **argv) result->sC = xbt_matrix_new_sub(sC, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, 0, 0, NULL); task = MSG_task_create("result",100,100,result); - MSG_task_dsend(task, "0", (void_f_pvoid_t) MSG_task_destroy); + MSG_task_send(task, "0"); } /* Clean up and finish*/ + xbt_matrix_free(sC); xbt_matrix_free(myjob->A); xbt_matrix_free(myjob->B); xbt_free(myjob); @@ -198,6 +204,8 @@ static void broadcast_jobs(node_job_t *jobs) } 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) @@ -348,6 +356,8 @@ static void receive_results(result_t *results){ } 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++){