create a singleton for s4u::Engine

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

diff --git a/src/smpi/private.h b/src/smpi/private.h
index ce79532..cf6c55c 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -7,16 +7,15 @@
 #ifndef SMPI_PRIVATE_H
 #define SMPI_PRIVATE_H
 
-#include "internal_config.h"
+#include "src/internal_config.h"
 #include "xbt.h"
 #include "xbt/base.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/synchro_core.h"
 #include "simgrid/simix.h"
-#include "smpi/smpi_interface.h"
+#include "src/include/smpi/smpi_interface.h"
 #include "smpi/smpi.h"
-#include "smpi/smpi_cocci.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 
 SG_BEGIN_DECL()
 
@@ -176,10 +175,10 @@ XBT_PRIVATE int smpi_process_count(void);
 XBT_PRIVATE MPI_Comm smpi_process_comm_world(void);
 XBT_PRIVATE MPI_Comm smpi_process_get_comm_intra(void);
 XBT_PRIVATE void smpi_process_set_comm_intra(MPI_Comm comm);
-XBT_PRIVATE smx_rdv_t smpi_process_mailbox(void);
-XBT_PRIVATE smx_rdv_t smpi_process_remote_mailbox(int index);
-XBT_PRIVATE smx_rdv_t smpi_process_mailbox_small(void);
-XBT_PRIVATE smx_rdv_t smpi_process_remote_mailbox_small(int index);
+XBT_PRIVATE smx_mailbox_t smpi_process_mailbox(void);
+XBT_PRIVATE smx_mailbox_t smpi_process_remote_mailbox(int index);
+XBT_PRIVATE smx_mailbox_t smpi_process_mailbox_small(void);
+XBT_PRIVATE smx_mailbox_t smpi_process_remote_mailbox_small(int index);
 XBT_PRIVATE xbt_mutex_t smpi_process_mailboxes_mutex(void);
 XBT_PRIVATE xbt_mutex_t smpi_process_remote_mailboxes_mutex(int index);
 XBT_PRIVATE xbt_os_timer_t smpi_process_timer(void);
@@ -739,7 +738,7 @@ void mpi_comm_get_parent_ ( int*parent, int* ierr);
 
 
 /********** Tracing **********/
-/* from smpi_instr.c */
+/* from instr_smpi.c */
 XBT_PRIVATE void TRACE_internal_smpi_set_category (const char *category);
 XBT_PRIVATE const char *TRACE_internal_smpi_get_category (void);
 XBT_PRIVATE void TRACE_smpi_collective_in(int rank, int root, const char *operation, instr_extra_data extra);