From 9832d5d883287485aef0742ae736e9fe6abe78bf Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Mon, 7 Nov 2005 19:37:32 +0000 Subject: [PATCH] The OMPI_GENERATE_F77_BINDINGS work only for the most common F77 bindings, the one that does not return any value. There are 2 exceptions MPI_Wtick and MPI_Wtime. For these 2 we can insert the bindings manually. This commit was SVN r8016. --- ompi/mpi/f77/wtick_f.c | 16 ++++++++++++++++ ompi/mpi/f77/wtime_f.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/ompi/mpi/f77/wtick_f.c b/ompi/mpi/f77/wtick_f.c index 3fdb81b232..add39625f7 100644 --- a/ompi/mpi/f77/wtick_f.c +++ b/ompi/mpi/f77/wtick_f.c @@ -20,12 +20,17 @@ #include "mpi/f77/bindings.h" +/* The OMPI_GENERATE_F77_BINDINGS work only for the most common F77 bindings, the + * one that does not return any value. There are 2 exceptions MPI_Wtick and MPI_Wtime. + * For these 2 we can insert the bindings manually. + */ #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_WTICK = mpi_wtick_f #pragma weak pmpi_wtick = mpi_wtick_f #pragma weak pmpi_wtick_ = mpi_wtick_f #pragma weak pmpi_wtick__ = mpi_wtick_f #elif OMPI_PROFILE_LAYER +/* OMPI_GENERATE_F77_BINDINGS (PMPI_WTICK, pmpi_wtick, pmpi_wtick_, @@ -33,6 +38,11 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_WTICK, pmpi_wtick_f, (), () ) +*/ +double PMPI_WTICK(void) { return pmpi_wtick_f(); } +double pmpi_wtick(void) { return pmpi_wtick_f(); } +double pmpi_wtick_(void) { return pmpi_wtick_f(); } +double pmpi_wtick__(void) { return pmpi_wtick_f(); } #endif #if OMPI_HAVE_WEAK_SYMBOLS @@ -43,6 +53,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_WTICK, #endif #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER +/* OMPI_GENERATE_F77_BINDINGS (MPI_WTICK, mpi_wtick, mpi_wtick_, @@ -50,6 +61,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WTICK, mpi_wtick_f, (), () ) +*/ +double MPI_WTICK(void) { return mpi_wtick_f(); } +double mpi_wtick(void) { return mpi_wtick_f(); } +double mpi_wtick_(void) { return mpi_wtick_f(); } +double mpi_wtick__(void) { return mpi_wtick_f(); } #endif diff --git a/ompi/mpi/f77/wtime_f.c b/ompi/mpi/f77/wtime_f.c index f0e56c2110..430f234c8b 100644 --- a/ompi/mpi/f77/wtime_f.c +++ b/ompi/mpi/f77/wtime_f.c @@ -20,12 +20,17 @@ #include "mpi/f77/bindings.h" +/* The OMPI_GENERATE_F77_BINDINGS work only for the most common F77 bindings, the + * one that does not return any value. There are 2 exceptions MPI_Wtick and MPI_Wtime. + * For these 2 we can insert the bindings manually. + */ #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER #pragma weak PMPI_WTIME = mpi_wtime_f #pragma weak pmpi_wtime = mpi_wtime_f #pragma weak pmpi_wtime_ = mpi_wtime_f #pragma weak pmpi_wtime__ = mpi_wtime_f #elif OMPI_PROFILE_LAYER +/* OMPI_GENERATE_F77_BINDINGS (PMPI_WTIME, pmpi_wtime, pmpi_wtime_, @@ -33,6 +38,11 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_WTIME, pmpi_wtime_f, (), () ) +*/ +double PMPI_WTIME(void) { return pmpi_wtime_f(); } +double pmpi_wtime(void) { return pmpi_wtime_f(); } +double pmpi_wtime_(void) { return pmpi_wtime_f(); } +double pmpi_wtime__(void) { return pmpi_wtime_f(); } #endif #if OMPI_HAVE_WEAK_SYMBOLS @@ -43,6 +53,7 @@ OMPI_GENERATE_F77_BINDINGS (PMPI_WTIME, #endif #if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER +/* OMPI_GENERATE_F77_BINDINGS (MPI_WTIME, mpi_wtime, mpi_wtime_, @@ -50,6 +61,11 @@ OMPI_GENERATE_F77_BINDINGS (MPI_WTIME, mpi_wtime_f, (), () ) +*/ +double MPI_WTIME(void) { return mpi_wtime_f(); } +double mpi_wtime(void) { return mpi_wtime_f(); } +double mpi_wtime_(void) { return mpi_wtime_f(); } +double mpi_wtime__(void) { return mpi_wtime_f(); } #endif