sed -i -e 's/\t/ /g' [sources] Please people, stop using tabs

[simgrid.git] / examples / msg / pmm / msg_pmm.c

diff --git a/examples/msg/pmm/msg_pmm.c b/examples/msg/pmm/msg_pmm.c
index 18743c1..530b15d 100644 (file)
--- a/examples/msg/pmm/msg_pmm.c
+++ b/examples/msg/pmm/msg_pmm.c
@@ -1,11 +1,12 @@
 /* pmm - parallel matrix multiplication "double diffusion"                  */
 
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team.
+/* Copyright (c) 2006-2015. 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 "msg/msg.h"
+
+#include "simgrid/msg.h"
 #include "xbt/matrix.h"
 #include "xbt/log.h"
 
@@ -28,7 +29,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_pmm,
 /* This example should always be executed using a deployment of
  * GRID_SIZE * GRID_SIZE nodes. */
 #define GRID_SIZE 3    /* Modify to adjust the grid's size */
-#define NODE_MATRIX_SIZE 300  /* Ammount of work done by each node*/
+#define NODE_MATRIX_SIZE 300  /* Amount of work done by each node*/
 
 #define GRID_NUM_NODES GRID_SIZE * GRID_SIZE
 #define MATRIX_SIZE NODE_MATRIX_SIZE * GRID_SIZE
@@ -194,24 +195,18 @@ static void broadcast_jobs(node_job_t *jobs)
   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));
-  }
-
-  MSG_comm_waitall(comms, -1);
-
-  msg_comm_t comm;
-  unsigned int cursor;
-  xbt_dynar_foreach(comms, cursor, comm) {
-    MSG_comm_destroy(comm);
+    comms[node-1] = MSG_task_isend(task, node_mbox);
   }
 
-  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)
@@ -222,8 +217,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);
@@ -277,7 +272,7 @@ static void task_cleanup(void *arg){
 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);
@@ -292,18 +287,15 @@ int main(int argc, char *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());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }
 
 static void create_jobs(xbt_matrix_t A, xbt_matrix_t B, node_job_t *jobs)
@@ -351,24 +343,19 @@ static void create_jobs(xbt_matrix_t A, xbt_matrix_t B, node_job_t *jobs)
 
 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++){