Update copyright notices

[simgrid.git] / src / smpi / private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index bc36a1c..c911cac 100644 (file)
--- 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
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -108,10 +108,8 @@ typedef struct s_smpi_mpi_request {
   MPI_Request detached_sender;
   int refcount;
   MPI_Op op;
   MPI_Request detached_sender;
   int refcount;
   MPI_Op op;

-#ifdef HAVE_TRACING

   int send;
   int recv;
   int send;
   int recv;

-#endif

 } s_smpi_mpi_request_t;
 
 typedef struct s_smpi_mpi_comm_key_elem {
 } s_smpi_mpi_request_t;
 
 typedef struct s_smpi_mpi_comm_key_elem {


@@ -180,6 +178,8 @@ smx_rdv_t smpi_process_mailbox(void);
 smx_rdv_t smpi_process_remote_mailbox(int index);
 smx_rdv_t smpi_process_mailbox_small(void);
 smx_rdv_t smpi_process_remote_mailbox_small(int index);
 smx_rdv_t smpi_process_remote_mailbox(int index);
 smx_rdv_t smpi_process_mailbox_small(void);
 smx_rdv_t smpi_process_remote_mailbox_small(int index);

+xbt_mutex_t smpi_process_mailboxes_mutex(void);
+xbt_mutex_t smpi_process_remote_mailboxes_mutex(int index);

 xbt_os_timer_t smpi_process_timer(void);
 void smpi_process_simulated_start(void);
 double smpi_process_simulated_elapsed(void);
 xbt_os_timer_t smpi_process_timer(void);
 void smpi_process_simulated_start(void);
 double smpi_process_simulated_elapsed(void);


@@ -447,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 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);
 
 
 void smpi_switch_data_segment(int dest);


@@ -736,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);
 
 
 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);
 /********** Tracing **********/
 /* from smpi_instr.c */
 void TRACE_internal_smpi_set_category (const char *category);


@@ -759,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);
 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);
 
 
 const char* encode_datatype(MPI_Datatype datatype, int* known);
 


@@ -768,11 +766,11 @@ const char* encode_datatype(MPI_Datatype datatype, int* known);
 typedef struct s_smpi_privatisation_region {
   void* address;
   int file_descriptor;
 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 smpi_privatisation_region_t smpi_privatisation_regions;

-

 extern int smpi_loaded_page;
 extern int smpi_loaded_page;

+extern int smpi_universe_size;

 
 int SIMIX_process_get_PID(smx_process_t self);
 
 
 int SIMIX_process_get_PID(smx_process_t self);