From: Pierre-Nicolas Clauss <pini@ethernium.org>
Date: Tue, 17 May 2011 19:24:33 +0000 (+0200)
Subject: Merge back master branch.
X-Git-Tag: exp_20120216~195^2~48
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8138044ce3ba946c574a0c3f9e7b7f61e52beb6e

Merge back master branch.

Conflicts:
	src/smpi/smpi_bench.c
---

8138044ce3ba946c574a0c3f9e7b7f61e52beb6e
diff --cc src/smpi/smpi_bench.c
index 2a38ef792e,e531e85913..b9d6366c8d
--- a/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@@ -14,7 -15,7 +15,8 @@@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_be
  
  xbt_dict_t allocs = NULL;       /* Allocated on first use */
  xbt_dict_t samples = NULL;      /* Allocated on first use */
+ xbt_dict_t calls = NULL;        /* Allocated on first use */
 +__thread int smpi_current_rank = 0;      /* Updated after each MPI call */
  
  typedef struct {
    int count;