Thanks; I neglected to test on my Mac... :-(
On Dec 9, 2007, at 10:51 AM, bosi...@osl.iu.edu wrote:
Author: bosilca
Date: 2007-12-09 10:51:10 EST (Sun, 09 Dec 2007)
New Revision: 16908
URL: https://svn.open-mpi.org/trac/ompi/changeset/16908
Log:
Correct the prototype of the profiling functions. Make sure the
_class variable is
only defined when we build the normal version (not in the profiling
compilation step).
Make sure the conversion_null function compil in all cases.
Text files modified:
trunk/ompi/mpi/f77/conversion_fn_null_f.c | 7 ++++---
trunk/ompi/mpi/f77/register_datarep_f.c | 14 ++++++++------
2 files changed, 12 insertions(+), 9 deletions(-)
Modified: trunk/ompi/mpi/f77/conversion_fn_null_f.c
=
=
=
=
=
=
=
=
======================================================================
--- trunk/ompi/mpi/f77/conversion_fn_null_f.c (original)
+++ trunk/ompi/mpi/f77/conversion_fn_null_f.c 2007-12-09 10:51:10
EST (Sun, 09 Dec 2007)
@@ -38,22 +38,23 @@
#include "ompi/mpi/f77/datarep.h"
#include "ompi/mpi/f77/fint_2_int.h"
-
+#include "ompi/mpi/f77/bindings.h"
#if OMPI_HAVE_WEAK_SYMBOLS
#pragma weak MPI_CONVERSION_FN_NULL = mpi_conversion_fn_null_f
#pragma weak mpi_conversion_fn_null = mpi_conversion_fn_null_f
#pragma weak mpi_conversion_fn_null_ = mpi_conversion_fn_null_f
#pragma weak mpi_conversion_fn_null__ = mpi_conversion_fn_null_f
+#endif
-#else
+#if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
OMPI_GENERATE_F77_BINDINGS(MPI_CONVERSION_FN_NULL,
mpi_conversion_fn_null,
mpi_conversion_fn_null_,
mpi_conversion_fn_null__,
mpi_conversion_fn_null_f,
(char *userbuf, MPI_Fint *datatype,
MPI_Fint *count, char *filebuf, MPI_Offset *position, MPI_Aint
*extra_state, MPI_Fint *ierr),
- (userbuf, datatype, count, filebuf,
position, extra_state, ierr)
+ (userbuf, datatype, count, filebuf,
position, extra_state, ierr) )
#endif
Modified: trunk/ompi/mpi/f77/register_datarep_f.c
=
=
=
=
=
=
=
=
======================================================================
--- trunk/ompi/mpi/f77/register_datarep_f.c (original)
+++ trunk/ompi/mpi/f77/register_datarep_f.c 2007-12-09 10:51:10 EST
(Sun, 09 Dec 2007)
@@ -40,7 +40,7 @@
pmpi_register_datarep_,
pmpi_register_datarep__,
pmpi_register_datarep_f,
- (char *datarep, void
*read_conversion_fn, void *write_conversion_fn, void
*dtype_file_extent_fn, MPI_Aint *extra_state, MPI_Fint *ierr, int
datarep_len),
+ (char *datarep,
ompi_mpi2_fortran_datarep_conversion_fn_t *read_conversion_fn,
ompi_mpi2_fortran_datarep_conversion_fn_t *write_conversion_fn,
ompi_mpi2_fortran_datarep_extent_fn_t *dtype_file_extent_fn,
MPI_Aint *extra_state, MPI_Fint *ierr, int datarep_len),
(datarep, read_conversion_fn,
write_conversion_fn, dtype_file_extent_fn, extra_state, ierr,
datarep_len) )
#endif
@@ -57,7 +57,7 @@
mpi_register_datarep_,
mpi_register_datarep__,
mpi_register_datarep_f,
- (char *datarep, void
*read_conversion_fn, void *write_conversion_fn, void
*dtype_file_extent_fn, MPI_Aint *extra_state, MPI_Fint *ierr, int
datarep_len),
+ (char *datarep,
ompi_mpi2_fortran_datarep_conversion_fn_t *read_conversion_fn,
ompi_mpi2_fortran_datarep_conversion_fn_t *write_conversion_fn,
ompi_mpi2_fortran_datarep_extent_fn_t *dtype_file_extent_fn,
MPI_Aint *extra_state, MPI_Fint *ierr, int datarep_len),
(datarep, read_conversion_fn,
write_conversion_fn, dtype_file_extent_fn, extra_state, ierr,
datarep_len) )
#endif
@@ -99,10 +99,12 @@
}
OBJ_CLASS_DECLARATION(intercept_extra_state_t);
+
+#if !OMPI_PROFILE_LAYER
OBJ_CLASS_INSTANCE(intercept_extra_state_t,
opal_list_item_t,
intercept_extra_state_constructor, NULL);
-
+#endif /* !OMPI_PROFILE_LAYER */
/*
* This function works by calling the C version of
@@ -120,10 +122,10 @@
*/
void mpi_register_datarep_f(char *datarep,
ompi_mpi2_fortran_datarep_conversion_fn_t *read_fn_f77,
- ompi_mpi2_fortran_datarep_conversion_fn_t
*write_fn_f77,
- ompi_mpi2_fortran_datarep_extent_fn_t
*extent_fn_f77,
+
ompi_mpi2_fortran_datarep_conversion_fn_t *write_fn_f77,
+ ompi_mpi2_fortran_datarep_extent_fn_t
*extent_fn_f77,
MPI_Aint *extra_state_f77,
- MPI_Fint *ierr, int datarep_len)
+ MPI_Fint *ierr, int datarep_len)
{
char *c_datarep;
int c_err, ret;
_______________________________________________
svn-full mailing list
svn-f...@open-mpi.org
http://www.open-mpi.org/mailman/listinfo.cgi/svn-full
--
Jeff Squyres
Cisco Systems
