From: Mark Stillwell <marklee@fortawesome.org>
Date: Fri, 25 Nov 2011 10:15:14 +0000 (+0100)
Subject: Merge branch 'smpi' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid into... 
X-Git-Tag: exp_20120216~195^2~19
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/65524ea02277d920b22ee6c1f29ec198e620ca20?hp=5fd5fb0042a290c557781f1dbb809b609ac69838

Merge branch 'smpi' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid into smpi
---

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index a104544a73..962b1349aa 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -71,6 +71,7 @@ typedef struct {
 } MPI_Status;
 
 #define MPI_STATUS_IGNORE NULL
+#define MPI_STATUSES_IGNORE NULL
 
 #define MPI_DATATYPE_NULL NULL
 extern MPI_Datatype MPI_CHAR;
diff --git a/src/msg/gos.c b/src/msg/gos.c
index 4a09c655dd..de98ec029b 100644
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -499,7 +499,7 @@ msg_comm_t MSG_task_irecv(m_task_t *task, const char *name)
 
   if (*task)
     XBT_CRITICAL
-        ("MSG_task_get() was asked to write in a non empty task struct.");
+        ("MSG_task_irecv() was asked to write in a non empty task struct.");
 
   /* Try to receive it by calling SIMIX network layer */
   msg_comm_t comm = xbt_new0(s_msg_comm_t, 1);
diff --git a/src/smpi/smpi_bench.c b/src/smpi/smpi_bench.c
index a6e7b631d5..6cad02ee91 100644
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@ -177,11 +177,14 @@ unsigned int smpi_sleep(unsigned int secs)
 
 int smpi_gettimeofday(struct timeval *tv, struct timezone *tz)
 {
-  double now = SIMIX_get_clock();
+  double now;
+  smpi_bench_end();
+  now = SIMIX_get_clock();
   if (tv) {
-    tv->tv_sec = (time_t) now;
+    tv->tv_sec = (time_t)now;
     tv->tv_usec = (suseconds_t)((now - tv->tv_sec) * 1e6);
   }
+  smpi_bench_begin();
   return 0;
 }