X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b76ba4acd263f00d310287d7f891abfcda1c2f9..41c803093e7108f16bfb4cc7e2c41c52104c73c2:/src/smpi/private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 7c5be9dac5..00c8ed89a0 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2009-2014. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -85,10 +85,10 @@ typedef struct s_smpi_mpi_datatype{
 
 typedef struct s_smpi_mpi_request {
   void *buf;
-  /* in the case of non-contignous memory the user address shoud be keep
+  /* in the case of non-contiguous memory the user address should be keep
    * to unserialize the data inside the user memory*/
   void *old_buf;
-  /* this let us know how tounserialize at the end of
+  /* this let us know how to unserialize at the end of
    * the communication*/
   MPI_Datatype old_type;
   size_t size;
@@ -108,10 +108,8 @@ typedef struct s_smpi_mpi_request {
   MPI_Request detached_sender;
   int refcount;
   MPI_Op op;
-#ifdef HAVE_TRACING
   int send;
   int recv;
-#endif
 } s_smpi_mpi_request_t;
 
 typedef struct s_smpi_mpi_comm_key_elem {
@@ -449,8 +447,8 @@ int smpi_type_keyval_free(int* keyval);
 extern double smpi_cpu_threshold;
 extern double smpi_running_power;
 extern int smpi_privatize_global_variables;
-extern char* start_data_exe; //start of the data+bss segment of the executable
-extern int size_data_exe; //size of the data+bss segment of the executable
+extern char* smpi_start_data_exe; //start of the data+bss segment of the executable
+extern int smpi_size_data_exe; //size of the data+bss segment of the executable
 
 
 void smpi_switch_data_segment(int dest);
@@ -738,7 +736,6 @@ void mpi_comm_spawn_multiple_ ( int* count, char *array_of_commands, char** arra
 void mpi_comm_get_parent_ ( int*parent, int* ierr);
 
 
-#ifdef HAVE_TRACING
 /********** Tracing **********/
 /* from smpi_instr.c */
 void TRACE_internal_smpi_set_category (const char *category);
@@ -761,7 +758,6 @@ void TRACE_smpi_send(int rank, int src, int dst, int size);
 void TRACE_smpi_recv(int rank, int src, int dst);
 void TRACE_smpi_init(int rank);
 void TRACE_smpi_finalize(int rank);
-#endif
 
 const char* encode_datatype(MPI_Datatype datatype, int* known);
 
@@ -770,11 +766,11 @@ const char* encode_datatype(MPI_Datatype datatype, int* known);
 typedef struct s_smpi_privatisation_region {
   void* address;
   int file_descriptor;
-} *smpi_privatisation_region_t;
+} s_smpi_privatisation_region_t, *smpi_privatisation_region_t;
 
 extern smpi_privatisation_region_t smpi_privatisation_regions;
-
 extern int smpi_loaded_page;
+extern int smpi_universe_size;
 
 int SIMIX_process_get_PID(smx_process_t self);