Merge branch 'release-4-6'

[alexxy/gromacs.git] / src / gromacs / gmxlib / thread_mpi / profile.c

diff --git a/src/gromacs/gmxlib/thread_mpi/profile.c b/src/gromacs/gmxlib/thread_mpi/profile.c
index a7de36be2c10a5d059f5c8bc19b519ca8574880f..c92e0fad25cdf00fc9385a988265705ebbe2ccbf 100644 (file)
--- a/src/gromacs/gmxlib/thread_mpi/profile.c
+++ b/src/gromacs/gmxlib/thread_mpi/profile.c
@@ -120,7 +120,7 @@ const char *tmpi_waitfn_names[] =
    stage about empty object files */
 #ifdef TMPI_PROFILE
 
-void tMPI_Profile_init(struct tmpi_profile *prof)
+int tMPI_Profile_init(struct tmpi_profile *prof)
 {
     int i;
 
@@ -138,7 +138,7 @@ void tMPI_Profile_init(struct tmpi_profile *prof)
     {
         prof->wait_cycles[i] = 0;
     }
-    prof->global_start = tmpi_cycles_read();
+    prof->global_start = tMPI_Cycles_read();
     prof->global_stop  = 0;
     prof->wait_start   = 0;
 #endif
@@ -148,6 +148,8 @@ void tMPI_Profile_init(struct tmpi_profile *prof)
     prof->total_p2p_xfers     = 0;
     prof->total_coll_xfers    = 0;
     tMPI_Profile_started      = 1;
+
+    return TMPI_SUCCESS;
 }
 
 
@@ -162,7 +164,7 @@ void tMPI_Profile_destroy(struct tmpi_profile *prof)
 void tMPI_Profile_stop(struct tmpi_profile *prof)
 {
 #ifdef TMPI_CYCLE_COUNT
-    prof->global_stop = tmpi_cycles_read();
+    prof->global_stop = tMPI_Cycles_read();
 #endif
     tMPI_Profile_started = 0;
 }