X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a1a25a87636041e2863cfb26b85c19c3a3d2ca6..9fa16e4064e1789bb1c56e0862ec6e03194a959c:/examples/msg/pmm/msg_pmm.c diff --git a/examples/msg/pmm/msg_pmm.c b/examples/msg/pmm/msg_pmm.c index 444aff3bae..6a0e8a9aac 100644 --- a/examples/msg/pmm/msg_pmm.c +++ b/examples/msg/pmm/msg_pmm.c @@ -64,7 +64,6 @@ static node_job_t wait_job(int selfid); static void broadcast_matrix(xbt_matrix_t M, int num_nodes, int *nodes); static void get_sub_matrix(xbt_matrix_t *sM, int selfid); static void receive_results(result_t *results); -static void task_cleanup(void *arg); int node(int argc, char **argv) { @@ -217,8 +216,8 @@ static node_job_t wait_job(int selfid) msg_error_t err; snprintf(self_mbox, MAILBOX_NAME_SIZE - 1, "%d", selfid); err = MSG_task_receive(&task, self_mbox); - if (err != MSG_OK) - xbt_die("Error while receiving from %s (%d)", self_mbox, (int)err); + xbt_assert(err == MSG_OK, "Error while receiving from %s (%d)", + self_mbox, (int)err); job = (node_job_t)MSG_task_get_data(task); MSG_task_destroy(task); XBT_VERB("Got Job (%d,%d)", job->row, job->col); @@ -237,7 +236,7 @@ static void broadcast_matrix(xbt_matrix_t M, int num_nodes, int *nodes) snprintf(node_mbox, MAILBOX_NAME_SIZE - 1, "%d", nodes[node]); sM = xbt_matrix_new_sub(M, NODE_MATRIX_SIZE, NODE_MATRIX_SIZE, 0, 0, NULL); task = MSG_task_create("sub-matrix", 100, 100, sM); - MSG_task_dsend(task, node_mbox, task_cleanup); + MSG_task_dsend(task, node_mbox, NULL); XBT_DEBUG("sub-matrix sent to %s", node_mbox); } @@ -259,13 +258,6 @@ static void get_sub_matrix(xbt_matrix_t *sM, int selfid) MSG_task_destroy(task); } -static void task_cleanup(void *arg){ - msg_task_t task = (msg_task_t)arg; - xbt_matrix_t m = (xbt_matrix_t)MSG_task_get_data(task); - xbt_matrix_free(m); - MSG_task_destroy(task); -} - /** * \brief Main function. */