From: Henri Casanova <henric@hawaii.edu>
Date: Thu, 8 May 2014 20:12:11 +0000 (-1000)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_11~86
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/68a3972f6c3c8865130f4341e3f2aaf7b69ea190?hp=-c

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

68a3972f6c3c8865130f4341e3f2aaf7b69ea190
diff --combined src/smpi/instr_smpi.c
index 6e048ba96e,9064b469b8..cd5a306fa5
--- a/src/smpi/instr_smpi.c
+++ b/src/smpi/instr_smpi.c
@@@ -26,7 -26,7 +26,7 @@@ static const char *smpi_colors[] =
      "wait",     "1 1 0",
      "waitall",  "0.78 0.78 0",
      "waitany",  "0.78 0.78 0.58",
-     "test",     "0.52 0.52 0"
+     "test",     "0.52 0.52 0",
  
      "allgather",     "1 0 0",
      "allgatherv",    "1 0.52 0.52",
@@@ -43,10 -43,7 +43,10 @@@
      "exscan",          "1 0.54 0.25",
      "scatterv",      "0.52 0 0.52",
      "scatter",       "1 0.74 0.54",
 +
      "computing",     "0 1 1",
 +    "sleeping",      "0 0.5 0.5",
 +
      "init",       "0 1 0",
      "finalize",     "0 1 0",
      NULL, NULL,
@@@ -285,49 -282,6 +285,49 @@@ void TRACE_smpi_computing_out(int rank
    new_pajePopState (SIMIX_get_clock(), container, type);
  }
  
 +void TRACE_smpi_sleeping_init(int rank)
 +{
 + //first use, initialize the color in the trace
 + //TODO : check with lucas and Pierre how to generalize this approach
 +  //to avoid unnecessary access to the color array
 +  if (!TRACE_smpi_is_enabled() || !TRACE_smpi_is_sleeping()) return;
 +
 +  char str[INSTR_DEFAULT_STR_SIZE];
 +  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
 +  container_t container = PJ_container_get (str);
 +  type_t type = PJ_type_get ("MPI_STATE", container->type);
 +  const char *color = instr_find_color ("sleeping");
 +  val_t value = PJ_value_get_or_new ("sleeping", color, type);
 +  new_pajePushState (SIMIX_get_clock(), container, type, value);
 +}
 +
 +void TRACE_smpi_sleeping_in(int rank, instr_extra_data extra)
 +{
 +  //do not forget to set the color first, otherwise this will explode
 +  if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping()) {
 +      cleanup_extra_data(extra);
 +      return;
 +  }
 +
 +  char str[INSTR_DEFAULT_STR_SIZE];
 +  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
 +  container_t container = PJ_container_get (str);
 +  type_t type = PJ_type_get ("MPI_STATE", container->type);
 +  val_t value = PJ_value_get_or_new ("sleeping", NULL, type);
 +  new_pajePushStateWithExtra  (SIMIX_get_clock(), container, type, value, (void*)extra);
 +}
 +
 +void TRACE_smpi_sleeping_out(int rank)
 +{
 +  if (!TRACE_smpi_is_enabled()|| !TRACE_smpi_is_sleeping()) return;
 +  char str[INSTR_DEFAULT_STR_SIZE];
 +  smpi_container(rank, str, INSTR_DEFAULT_STR_SIZE);
 +  container_t container = PJ_container_get (str);
 +  type_t type = PJ_type_get ("MPI_STATE", container->type);
 +  new_pajePopState (SIMIX_get_clock(), container, type);
 +}
 +
 +
  void TRACE_smpi_testing_in(int rank, instr_extra_data extra)
  {
    //do not forget to set the color first, otherwise this will explode