diff --git a/ompi/contrib/vt/vt/ChangeLog b/ompi/contrib/vt/vt/ChangeLog index 5931afb5e2..4659caf6c4 100644 --- a/ompi/contrib/vt/vt/ChangeLog +++ b/ompi/contrib/vt/vt/ChangeLog @@ -12,6 +12,8 @@ - added support for "re-locate" an existing VampirTrace installation without re-build it from source - fixed configure's version detection for PAPI to support version 4.x + - added configure tests for a few pthread functions which do not exist + on some platforms - added configure tests to detect Bull MPICH2 - use Open MPI provided Fortran wrapper library 'libmpi_f77' - added functions 'MPI_Group_range_' to Fortran MPI wrappers @@ -23,9 +25,8 @@ segmentation fault - fixed detection of unique node id on MacOS platforms - fixed support for LAM/MPI - - fixed build error: do not add objects from the static version of the - BFD library to the shared VT libraries, because the BFD objects might - be built without position independent code (PIC) + - fixed potential segmentation fault in vtunify-mpi which might occur + on 32bit platforms using MPICH2 - patched libtool to avoid a bug in detection of the PGI 10 compilers 5.8openmpi diff --git a/ompi/contrib/vt/vt/config/m4/acinclude.dl.m4 b/ompi/contrib/vt/vt/config/m4/acinclude.dl.m4 index a2faae2713..dda255f940 100644 --- a/ompi/contrib/vt/vt/config/m4/acinclude.dl.m4 +++ b/ompi/contrib/vt/vt/config/m4/acinclude.dl.m4 @@ -11,6 +11,8 @@ AC_DEFUN([ACVT_DL], DLLIBDIR= DLLIB= + AC_REQUIRE([ACVT_PLATFORM]) + AC_ARG_WITH(dl-dir, AC_HELP_STRING([--with-dl-dir=DLDIR], [give the path for libdl, default: /usr]), [DLDIR="$withval/"]) @@ -31,14 +33,23 @@ AC_DEFUN([ACVT_DL], AC_HELP_STRING([--with-dl-lib=DLLIB], [use given libdl lib, default: -ldl]), [DLLIB="$withval"]) - sav_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $DLINCDIR" - AC_CHECK_HEADER([dlfcn.h], [], + AS_IF([test "$PLATFORM" = "bgl" -o "$PLATFORM" = "bgp" -o "$PLATFORM" = "crayxt"], [ - AC_MSG_NOTICE([error: no dlfcn.h found; check path for libdl package first...]) + AC_MSG_NOTICE([error: dynamic linking library (libdl) isn't suitable on this platform]) dl_error="yes" ]) - CPPFLAGS=$sav_CPPFLAGS + + AS_IF([test x"$dl_error" = "xno"], + [ + sav_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $DLINCDIR" + AC_CHECK_HEADER([dlfcn.h], [], + [ + AC_MSG_NOTICE([error: no dlfcn.h found; check path for libdl package first...]) + dl_error="yes" + ]) + CPPFLAGS=$sav_CPPFLAGS + ]) AS_IF([test x"$DLLIB" = x -a x"$dl_error" = "xno"], [ diff --git a/ompi/contrib/vt/vt/config/m4/acinclude.libwrap.m4 b/ompi/contrib/vt/vt/config/m4/acinclude.libwrap.m4 index c80535bf8e..c0ee7ad74b 100644 --- a/ompi/contrib/vt/vt/config/m4/acinclude.libwrap.m4 +++ b/ompi/contrib/vt/vt/config/m4/acinclude.libwrap.m4 @@ -10,8 +10,6 @@ AC_DEFUN([ACVT_LIBWRAP], force_libcwrap="no" force_iowrap="no" - AC_REQUIRE([ACVT_PLATFORM]) - AC_ARG_ENABLE(libtrace, AC_HELP_STRING([--enable-libtrace=LIST], [enable library tracing support (gen,libc,io), default: automatically by configure]), @@ -44,51 +42,44 @@ AC_DEFUN([ACVT_LIBWRAP], AS_IF([test x"$check_libwrap" != "xno"], [ - AS_IF([test "$PLATFORM" = "bgl" -o "$PLATFORM" = "bgp"], - [ - AC_MSG_NOTICE([error: library tracing not supported on IBM BlueGene]) - libwrap_error="yes" - ], - [ - AS_IF([test x"$dl_error" = x], [ACVT_DL]) - AS_IF([test x"$have_dl" = "xno"], [libwrap_error="yes"]) + ACVT_DL + AS_IF([test x"$have_dl" = "xno"], [libwrap_error="yes"]) - AS_IF([test x"$libwrap_error" = "xno"], - [ - for lw in $check_libwrap - do - case $lw in - gen) - ACVT_CONF_SUBTITLE([Library wrapper generator]) - ACVT_CTOOL - AS_IF([test x"$have_ctool" = "xyes"], - [have_libwrap="yes"; build_libwrapgen="yes"], - [ - AS_IF([test x"$force_libwrapgen" = "xyes"], - [libwrap_error="yes"; break]) - ]) - ;; - libc) - ACVT_CONF_SUBTITLE([LIBC]) - ACVT_LIBCWRAP - AS_IF([test x"$have_libcwrap" = "xyes"], [have_libwrap="yes"], - [ - AS_IF([test x"$force_libcwrap" = "xyes"], - [libwrap_error="yes"; break]) - ]) - ;; - io) - ACVT_CONF_SUBTITLE([LIBC-I/O]) - ACVT_IOWRAP - AS_IF([test x"$have_iowrap" = "xyes"], [have_libwrap="yes"], - [ - AS_IF([test x"$force_iowrap" = "xyes"], - [libwrap_error="yes"; break]) - ]) - ;; - esac - done - ]) + AS_IF([test x"$libwrap_error" = "xno"], + [ + for lw in $check_libwrap + do + case $lw in + gen) + ACVT_CONF_SUBTITLE([Library wrapper generator]) + ACVT_CTOOL + AS_IF([test x"$have_ctool" = "xyes"], + [have_libwrap="yes"; build_libwrapgen="yes"], + [ + AS_IF([test x"$force_libwrapgen" = "xyes"], + [libwrap_error="yes"; break]) + ]) + ;; + libc) + ACVT_CONF_SUBTITLE([LIBC]) + ACVT_LIBCWRAP + AS_IF([test x"$have_libcwrap" = "xyes"], [have_libwrap="yes"], + [ + AS_IF([test x"$force_libcwrap" = "xyes"], + [libwrap_error="yes"; break]) + ]) + ;; + io) + ACVT_CONF_SUBTITLE([LIBC-I/O]) + ACVT_IOWRAP + AS_IF([test x"$have_iowrap" = "xyes"], [have_libwrap="yes"], + [ + AS_IF([test x"$force_iowrap" = "xyes"], + [libwrap_error="yes"; break]) + ]) + ;; + esac + done ]) ]) ]) diff --git a/ompi/contrib/vt/vt/config/m4/acinclude.mpi.m4 b/ompi/contrib/vt/vt/config/m4/acinclude.mpi.m4 index 914590f8ca..cc0659618a 100644 --- a/ompi/contrib/vt/vt/config/m4/acinclude.mpi.m4 +++ b/ompi/contrib/vt/vt/config/m4/acinclude.mpi.m4 @@ -182,6 +182,7 @@ AC_DEFUN([ACVT_MPI], check_mpi2_thread="no"; have_mpi2_thread="yes" check_mpi2_1sided="no"; have_mpi2_1sided="yes" check_mpi2_extcoll="no"; have_mpi2_extcoll="yes" + ac_cv_have_decl_MPI_IN_PLACE="yes" ]) ]) @@ -213,6 +214,7 @@ AC_DEFUN([ACVT_MPI], check_mpi2_thread="no"; have_mpi2_thread="yes" check_mpi2_1sided="no"; have_mpi2_1sided="yes" check_mpi2_extcoll="no"; have_mpi2_extcoll="yes" + ac_cv_have_decl_MPI_IN_PLACE="yes" ]) ]) @@ -244,6 +246,7 @@ AC_DEFUN([ACVT_MPI], check_mpi2_thread="no"; have_mpi2_thread="yes" check_mpi2_1sided="no"; have_mpi2_1sided="yes" check_mpi2_extcoll="no"; have_mpi2_extcoll="yes" + ac_cv_have_decl_MPI_IN_PLACE="yes" ]) ]) @@ -291,6 +294,12 @@ AC_DEFUN([ACVT_MPI], check_mpi2_thread="no"; have_mpi2_thread="yes" check_mpi2_1sided="no"; have_mpi2_1sided="yes" check_mpi2_extcoll="no"; have_mpi2_extcoll="yes" + ac_cv_func_PMPI_Win_test="yes" + ac_cv_func_PMPI_Win_lock="yes" + ac_cv_func_PMPI_Win_unlock="yes" + AS_IF([test x"$inside_openmpi" = "xyes" -a x"$have_mpi2_io" = "xyes"], + [ac_cv_func_MPI_Register_datarep="yes"]) + ac_cv_have_decl_MPI_IN_PLACE="yes" ]) ]) @@ -356,6 +365,7 @@ AC_DEFUN([ACVT_MPI], check_mpi2_thread="no"; have_mpi2_thread="yes" check_mpi2_1sided="no"; have_mpi2_1sided="yes" check_mpi2_extcoll="no"; have_mpi2_extcoll="yes" + ac_cv_have_decl_MPI_IN_PLACE="yes" ]) ]) diff --git a/ompi/contrib/vt/vt/config/m4/acinclude.pthread.m4 b/ompi/contrib/vt/vt/config/m4/acinclude.pthread.m4 index 7e8a37b38c..acd348026b 100644 --- a/ompi/contrib/vt/vt/config/m4/acinclude.pthread.m4 +++ b/ompi/contrib/vt/vt/config/m4/acinclude.pthread.m4 @@ -18,6 +18,17 @@ AC_DEFUN([ACVT_PTHREAD], AS_IF([test x"$pthread_error" = "xno"], [ + sav_CFLAGS=$CFLAGS + sav_LIBS=$LIBS + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$LIBS $PTHREAD_LIBS" + AC_CHECK_FUNCS([pthread_condattr_getpshared \ + pthread_condattr_setpshared \ + pthread_mutexattr_getpshared \ + pthread_mutexattr_setpshared]) + CFLAGS=$sav_CFLAGS + LIBS=$sav_LIBS + have_pthread="yes" AC_DEFINE([HAVE_PTHREAD], [1], [Define to 1 if VT is configured with Pthreads support.]) ]) diff --git a/ompi/contrib/vt/vt/extlib/otf/COPYING b/ompi/contrib/vt/vt/extlib/otf/COPYING index 76a3efec9c..77a408fdba 100644 --- a/ompi/contrib/vt/vt/extlib/otf/COPYING +++ b/ompi/contrib/vt/vt/extlib/otf/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2005-2009, ZIH, Technische Universitaet Dresden, +Copyright (c) 2005-2010, ZIH, Technische Universitaet Dresden, Federal Republic of Germany All rights reserved. diff --git a/ompi/contrib/vt/vt/extlib/otf/LICENSE b/ompi/contrib/vt/vt/extlib/otf/LICENSE index 76a3efec9c..77a408fdba 100644 --- a/ompi/contrib/vt/vt/extlib/otf/LICENSE +++ b/ompi/contrib/vt/vt/extlib/otf/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2005-2009, ZIH, Technische Universitaet Dresden, +Copyright (c) 2005-2010, ZIH, Technische Universitaet Dresden, Federal Republic of Germany All rights reserved. diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c index 15ed578068..eb6ea3354a 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.h index 2d4ef7d228..596542cdd7 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h index 067668a387..ed630a082b 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Errno.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Errno.h index 67bd3beae0..6b5deb4630 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Errno.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Errno.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c index 0a468a5c79..03dda1b932 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.h index e3b6873c60..7248cdf1a3 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.c index 89e07bbad3..1427ba3011 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.h index 9b2bbdfac2..30bfe963eb 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c index 65122a22af..89c8b02727 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.h index 5ad4355d8c..35885b7c3e 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Handler.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Handler.h index be75b83730..b6668007ba 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c index d76c1ae793..cc42891b67 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.h index 2534b61bd6..a7762857b8 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Keywords.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Keywords.h index ed6a07a8e7..83abdfc026 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Keywords.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Keywords.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c index 5a6fe13d6a..1385947164 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.h index c2877b5127..d5c432fac6 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c index adc0550fa2..563d65ac12 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.h index 40504b1c8a..26e0eab22f 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.c index 6306743af3..3fa0cdd750 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.c @@ -1,6 +1,5 @@ /* - This is part of the OTF library. - Copyright (c) 2005-2009, ZIH, TU Dresden, Federal Republic of Germany + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch Copyright (c) 2004-2005, The Trustees of Indiana University and Indiana @@ -11,7 +10,6 @@ University of Stuttgart Copyright (c) 2004-2005, The Regents of the University of California Copyright (c) 2007, Cisco Systems, Inc. - Copyright (c) 2005-2009, ZIH, TU Dresden, Federal Republic of Germany */ #include "OTF_Platform.h" diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.h index 3640019cfd..af9e861b08 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h index 9321c81c03..f9cfb8fdfc 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h index 54e5a35788..b5a5085f76 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c index 95e75e76c1..87294f2ce8 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.h index 5269026309..dcf5547f3c 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c index f4483804bd..b31237e760 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -270,20 +270,27 @@ OTF_RBuffer* OTF_RStream_getEventBuffer( OTF_RStream* rstream ) { if( NULL == filename ) { OTF_fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n " - "OTF_getFilename() failed.\n", - __FUNCTION__, __FILE__, __LINE__ ); + "OTF_getFilename() failed for event file with name stub '%s' and ID %u.\n", + __FUNCTION__, __FILE__, __LINE__, rstream->namestub, rstream->id ); return NULL; } rstream->eventBuffer= OTF_RBuffer_open( filename, rstream->manager ); + if ( NULL == rstream->eventBuffer ) { + + OTF_fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n " + "OTF_RBuffer_open() failed for filename '%s'.\n", + __FUNCTION__, __FILE__, __LINE__, filename ); + + free( filename ); + filename = NULL; + return NULL; + } + free( filename ); filename = NULL; - if ( NULL == rstream->eventBuffer ) { - - return NULL; - } OTF_RBuffer_setSize( rstream->eventBuffer, rstream->buffersizes ); #ifdef HAVE_ZLIB diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.h index 1c540d4855..f879bf9bf1 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c index d5a42d7026..c2b5343ad9 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.h index 18262801e6..8025735739 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Version.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Version.h index 839e84c1b4..efb87f06c1 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Version.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Version.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -16,10 +16,16 @@ #define OTF_VERSION_H -#define OTF_VERSION_MAYOR 1 +#define OTF_VERSION_MAJOR 1 #define OTF_VERSION_MINOR 6 #define OTF_VERSION_SUB 5 #define OTF_VERSION_STRING "openmpi" +/** + * Because of a typo, we need to keep this for backward compatibility + * \ingroup internal + */ +#define OTF_VERSION_MAYOR OTF_VERSION_MAJOR + #endif /* OTF_VERSION_H */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c index 0a9d3cd673..d0bd6d31e3 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.h index 6bf7d27052..71a04f4bee 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c index 4ddf7dd36e..5e81d7a381 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -1353,7 +1353,7 @@ int OTF_WStream_writeDefVersion( OTF_WStream* wstream, uint8_t major, int OTF_WStream_writeOtfVersion( OTF_WStream* wstream ) { - return OTF_WStream_writeDefVersion( wstream, OTF_VERSION_MAYOR, + return OTF_WStream_writeDefVersion( wstream, OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING ); } diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.h index c2fcd5e042..ba49bbc247 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c index bae3afdaed..7af1f1fe90 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.h index a69b68fe88..aaace9dc7b 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.c b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.c index 90006c3e33..a845262b82 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.c +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.h index d218039f31..f7f7a6c07a 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_unix.h.in b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_unix.h.in index 44a237212f..ef34f907ac 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_unix.h.in +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_unix.h.in @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_win.h b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_win.h index 0bfb96dfd9..a91e117bdc 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_win.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_win.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib/otf.h b/ompi/contrib/vt/vt/extlib/otf/otflib/otf.h index bb300a6533..df4869b169 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib/otf.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib/otf.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib_py/otf.i b/ompi/contrib/vt/vt/extlib/otf/otflib_py/otf.i index c13cdbc644..292b4062b1 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib_py/otf.i +++ b/ompi/contrib/vt/vt/extlib/otf/otflib_py/otf.i @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_AuxiliaryFunctions.h b/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_AuxiliaryFunctions.h index 508b5b802c..2c64b4cf87 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_AuxiliaryFunctions.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_AuxiliaryFunctions.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_Wrapper.h b/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_Wrapper.h index bb72a00ef7..f04a2b2d77 100644 --- a/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_Wrapper.h +++ b/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_Wrapper.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.c b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.c index c04d74b36f..4878dcee87 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h index b4f28184f3..886d974259 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.c b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.c index 15eec8e711..8418649c5d 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h index a7e06980e1..0fb0016fb3 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c index 3c9ca4b2a1..9e6d4622d1 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -117,7 +117,7 @@ int main (int argc, char **argv) { } else if ( 0 == strcmp( "-V", argv[i] ) ) { - printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, + printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING); exit( 0 ); diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.cpp index 3ca1749a10..cf5dc4fe8e 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h index 3c8db70331..4525274334 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.cpp index d0ac6e0616..29dd8685cb 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h index 4d654ae6c8..06fcb51736 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.cpp index 76719b4808..4de76ff14a 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -160,53 +160,60 @@ int ProcessState::openFile( uint64_t time, uint32_t fileid, uint64_t handleid, int ProcessState::closeFile( uint64_t handleid ) { - uint32_t ret; - map::iterator it; + uint32_t ret; + map::iterator it; - it= openfiles.find( handleid ); - - if( it != openfiles.end() ) { + it= openfiles.find( handleid ); - /* make the statistics */ - map::iterator it2; - - it2= fostatistics.find( it->second.fileid ); - - if( it2 != fostatistics.end() ) { - - FileOperationStatistics& fos= it2->second; - - ++fos.nclose; - ret= OTF_RETURN_OK; - - } else { - - # ifdef OTF_VERBOSE - fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n " - "Trying to close not yet opened file. aborting\n", - __FUNCTION__, __FILE__, __LINE__ ); - # endif - - ret= OTF_RETURN_ABORT; - } - - /* erase the file from the opened files list */ - openfiles.erase( it ); - - } else { + if( it == openfiles.end() ) { +/* +# ifdef OTF_VERBOSE + fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n " + "Trying to close not yet opened file. aborting\n", + __FUNCTION__, __FILE__, __LINE__ ); +# endif +*/ + fprintf( stderr, "WARNING in function %s, file: %s, line: %i:\n " + "Trying to close a file that is not open with handle %llu. " + "This might be caused by a VT error, please check! Ignore this for now.\n", + __FUNCTION__, __FILE__, __LINE__, (long long unsigned) handleid ); -# ifdef OTF_VERBOSE - fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n " - "Trying to close not yet opened file. aborting\n", - __FUNCTION__, __FILE__, __LINE__ ); -# endif + /* make it a warning that cannot be disabled because I suspect an error in VT ! */ + /* return OTF_RETURN_ABORT; */ + return OTF_RETURN_OK; + } - ret= OTF_RETURN_ABORT; - } - return ret; + /* make the statistics */ + map::iterator it2; + + it2= fostatistics.find( it->second.fileid ); + + if( it2 != fostatistics.end() ) { + + FileOperationStatistics& fos= it2->second; + + ++fos.nclose; + + ret= OTF_RETURN_OK; + + } else { + +# ifdef OTF_VERBOSE + fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n " + "Trying to close not yet opened file. aborting\n", + __FUNCTION__, __FILE__, __LINE__ ); +# endif + + ret= OTF_RETURN_ABORT; + } + + /* erase the file from the opened files list */ + openfiles.erase( it ); + + return ret; } @@ -873,7 +880,6 @@ int State::fileOperation( uint64_t time, uint32_t fileid, uint32_t process, uint64_t handleid, uint32_t operation, uint64_t bytes, uint64_t duration, uint32_t source ) { - switch( operation ) { case OTF_FILEOP_OPEN: diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h index 5f8c9da090..a67c303fe3 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/State.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp index 50fa3b903e..244a151e18 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -101,8 +101,8 @@ int main ( int argc, const char** argv ) { bool showprogress= false; bool listonly= false; - bool doSnapshots= true; - bool doStatistics= true; + bool doSnapshots= true; + bool doStatistics= true; uint64_t read; @@ -143,7 +143,7 @@ int main ( int argc, const char** argv ) { } else if ( 0 == strcmp( "-V", argv[i] ) ) { - printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, + printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING); exit( 0 ); @@ -466,12 +466,12 @@ int main ( int argc, const char** argv ) { OTF_HandlerArray_setFirstHandlerArg( handlers, (void*) control, OTF_ENDPROCESS_RECORD ); - OTF_HandlerArray_setHandler( handlers, - (OTF_FunctionPointer*) handleCollectiveOperation, - OTF_COLLOP_RECORD ); - OTF_HandlerArray_setFirstHandlerArg( handlers, (void*) control, - OTF_COLLOP_RECORD ); - + OTF_HandlerArray_setHandler( handlers, + (OTF_FunctionPointer*) handleCollectiveOperation, + OTF_COLLOP_RECORD ); + OTF_HandlerArray_setFirstHandlerArg( handlers, (void*) control, + OTF_COLLOP_RECORD ); + OTF_HandlerArray_setHandler( handlers, (OTF_FunctionPointer*) handleEventComment, OTF_EVENTCOMMENT_RECORD ); @@ -498,7 +498,7 @@ int main ( int argc, const char** argv ) { uint64_t tcur= 0; uint64_t tmax= (uint64_t) -1; - /* init read operation but do not start to read records yet. this ensures the + /* init read operation but do not start to read records yet. this ensures the time interval of the trace is extracted */ OTF_Reader_setRecordLimit( reader, 0 ); read = OTF_Reader_readEvents( reader, handlers ); @@ -511,6 +511,10 @@ int main ( int argc, const char** argv ) { OTF_Reader_setRecordLimit( reader, OTF_READ_MAXRECORDS ); OTF_Reader_eventProgress( reader, &tmin, &tcur, &tmax ); + + /* increase in order to place final statistics after the very last record */ + tmax += 1; + /* cout << "total time " << (unsigned long long) tmin << " - " << @@ -521,10 +525,13 @@ int main ( int argc, const char** argv ) { d= ( d <= (double) summary_distance ) ? d : (double) summary_distance; d= ( 1.0 < d ) ? d : 1.0; - for ( double t= (double) tmin; t < tmax; t += d ) { - - control->addTime( (uint64_t) t ); - } + /* + * generated sample points, but don't include t_min, + * it is defined as 0-point + */ + for ( double t= (double) tmin + d; t < tmax; t += d ) { + control->addTime( (uint64_t) t ); + } /* append user defined time stamps */ @@ -535,13 +542,14 @@ int main ( int argc, const char** argv ) { control->addTime( *it ); } - - - if ( control->getLastTime() < tmax ) { - - control->addTime( tmax ); - } - + + /* place very last statistics _after_ the last record but not right before it. + Needs to be triggered explictily in the end. */ + if ( control->getLastTime() < tmax ) { + + control->addTime( tmax ); + } + /* restrict streams resp. processes to be read */ @@ -610,6 +618,10 @@ int main ( int argc, const char** argv ) { /* cout << "read " << read << " events" << endl; */ } + /* explicitly trigger writing for the very last timestamp +1 such that + the very last event is included in the final statistics */ + control->checkTime( tmax ); + OTF_Reader_close( reader ); diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/otfcompress.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/otfcompress.c index 29c13f6716..e43110eb92 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/otfcompress.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/otfcompress.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -152,7 +152,7 @@ int main ( int argc, const char** argv ) { if ( 0 == strcmp( "-V", argv[i] ) ) { - printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, + printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING); exit( 0 ); } diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/sys_time.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/sys_time.h index 0639cfbe8f..0c284031b9 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/sys_time.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/sys_time.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/otfconfig.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/otfconfig.c index 053382d2f6..1567df8987 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/otfconfig.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/otfconfig.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -52,7 +52,7 @@ int main( int argc, char** argv ) { } else if ( 0 == strcmp( argv[i], "--version" ) ) { - printf( "%u.%u.%u %s\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING ); + printf( "%u.%u.%u %s\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING ); } else if ( 0 == strcmp( argv[i], "--have-zlib" ) ) { diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.cpp index b02ee9b533..408f366588 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.h index bd01506400..5f78424b09 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump.cpp index efc74539d4..a1c33368b9 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -108,7 +108,7 @@ int main ( int argc, const char** argv ) { } else if ( 0 == strcmp( "-V", argv[i] ) ) { - printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, + printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING); exit( 0 ); diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.c index a5afd9854b..2df98cd576 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Michael Heyde */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.h index 594a87275b..20fdcc6b8e 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Michael Heyde */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.c index 93d43ecd92..f81b3549df 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Michael Heyde */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.h index 45925dbb15..07b2b1ee38 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Michael Heyde */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo.c index 15d251e19b..b92190e4b6 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Michael Heyde */ @@ -104,7 +104,7 @@ int main(int argc, char **argv) } else if( strcmp(parameter,"-V") == 0 ) { - printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, + printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING ); return 0; } diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.c index 5c83d482d3..f0794f04d3 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Michael Heyde */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.h index e76af0eb94..2379d299b4 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Michael Heyde */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.c index 34c21933c8..5c24700c04 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.h index 9e521b84b0..ff8b4ede95 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.c index d73f2af144..a4bcf32705 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.h index 44d94b4418..4624f2df54 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/hash.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge.c b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge.c index 82bd3de77c..97cadb3f2b 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -158,9 +158,9 @@ int main ( int argc, char** argv ) { ++i; - } else if ( 0 == strcmp( "-l", argv[i] ) ) { + } else if ( 0 == strcmp( "-l", argv[i] ) ) { - longformat = 1; + longformat = 1; } else if ( 0 == strcmp( "-p", argv[i] ) ) { @@ -174,7 +174,7 @@ int main ( int argc, char** argv ) { } else if ( 0 == strcmp( "-V", argv[i] ) ) { - printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, + printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING); exit( 0 ); diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.cpp index 1d53f22b86..e9c5fc44f8 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.h index eeaebf33a5..253841fdc2 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/CSVParse.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.cpp index 743d24de3b..5aedaeca65 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.h index 229fde51d2..17fd3d0d12 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/DataStructure.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Definitions.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Definitions.h index 5adc3f4799..17188e5329 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Definitions.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Definitions.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.cpp index c814dd6407..c119258d5b 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.h index 8bcebb6768..e727a49719 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.cpp index 00cff2cb99..90dcad56f7 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.h index 87ebb379bc..6417732d87 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Prodtex.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.cpp index 3a618f9614..360fef93e1 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.h index fe78e98f3f..a971e28c5a 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/Summary.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/otfprofile.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/otfprofile.cpp index ac91b0fa26..298c021287 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/otfprofile.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/otfprofile.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.cpp index 23db22ee5a..b03bd88fb7 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.h index 6e50c380e8..e6cd9a7535 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/Handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp b/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp index 692c3e97e1..bc82fdade8 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp +++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfshrink/otfshrink.cpp @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Denis Huenich, Johannes Spazier */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.c b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.c index a5f037d9aa..a02aaa56fd 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.h b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.h index 54bfe29559..f48aa2b139 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Handler.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.c b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.c index d7cba6c28d..824ac2acb6 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h index 8945838261..3b5160438e 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Hash.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c index 4ec7f32d0b..f9733e63fa 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.h b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.h index 49de3de76d..960e43c57c 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.h +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/Stack.h @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ diff --git a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c index 0a5bd82ae2..85380726f3 100644 --- a/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c +++ b/ompi/contrib/vt/vt/extlib/otf/tools/vtf2otf/vtf2otf.c @@ -1,5 +1,5 @@ /* - This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2009. + This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010. Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch */ @@ -130,7 +130,7 @@ int main (int argc, char **argv) { } else if ( 0 == strcmp( "-V", argv[i] ) ) { - printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAYOR, OTF_VERSION_MINOR, + printf( "%u.%u.%u \"%s\"\n", OTF_VERSION_MAJOR, OTF_VERSION_MINOR, OTF_VERSION_SUB, OTF_VERSION_STRING); exit( 0 ); diff --git a/ompi/contrib/vt/vt/tools/vtunify/mpi/vt_unify_mpi.h b/ompi/contrib/vt/vt/tools/vtunify/mpi/vt_unify_mpi.h index 5473795459..f696ebac52 100644 --- a/ompi/contrib/vt/vt/tools/vtunify/mpi/vt_unify_mpi.h +++ b/ompi/contrib/vt/vt/tools/vtunify/mpi/vt_unify_mpi.h @@ -34,7 +34,7 @@ #define VTUnify_MPI_UNSIGNED_LONG_LONG 6 #define VTUnify_MPI_PACKED 7 -#define VTUnify_MPI_BOTTOM ((void*)-0) +#define VTUnify_MPI_BOTTOM ((void*)0) #define VTUnify_MPI_STATUS_IGNORE ((VTUnify_MPI_Status*)0) typedef struct { @@ -42,9 +42,9 @@ typedef struct { VT_MPI_INT tag; } VTUnify_MPI_Status; -typedef size_t VTUnify_MPI_Aint; -typedef int VTUnify_MPI_Comm; -typedef int VTUnify_MPI_Datatype; +typedef long long VTUnify_MPI_Aint; +typedef int VTUnify_MPI_Comm; +typedef int VTUnify_MPI_Datatype; EXTERN VT_MPI_INT VTUnify_MPI_Abort( VTUnify_MPI_Comm ucomm, VT_MPI_INT errorcode ); diff --git a/ompi/contrib/vt/vt/tools/vtunify/vt_unify.cc b/ompi/contrib/vt/vt/tools/vtunify/vt_unify.cc index 0363ec5f77..0a57d94001 100644 --- a/ompi/contrib/vt/vt/tools/vtunify/vt_unify.cc +++ b/ompi/contrib/vt/vt/tools/vtunify/vt_unify.cc @@ -1128,8 +1128,11 @@ shareParams() if( g_iMPIRank == 0 ) { strncpy( filenames[0], Params.in_file_prefix.c_str(), 1023 ); + filenames[0][1023] = '\0'; strncpy( filenames[1], Params.out_file_prefix.c_str(), 1023 ); + filenames[1][1023] = '\0'; strncpy( filenames[2], Params.stats_out_file.c_str(), 1023 ); + filenames[2][1023] = '\0'; flags[0] = (char)Params.docompress; flags[1] = (char)Params.doclean; flags[2] = (char)Params.showusage; diff --git a/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs.cc b/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs.cc index ab2dadc05a..418c507b91 100644 --- a/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs.cc +++ b/ompi/contrib/vt/vt/tools/vtunify/vt_unify_defs.cc @@ -644,6 +644,7 @@ Definitions::createGlobal( const std::vector * { strncpy( new_name, "MPI_COMM_WORLD", sizeof( new_name ) - 1 ); + new_name[sizeof( new_name ) - 1] = '\0'; } else if( p_loc_def_entry->type == DefRec_DefProcessGroup_struct::TYPE_MPI_COMM_SELF ) @@ -655,8 +656,9 @@ Definitions::createGlobal( const std::vector * { strncpy( new_name, p_loc_def_entry->name.c_str(), sizeof( new_name ) - 1 ); + new_name[sizeof( new_name ) - 1] = '\0'; } - + // add new definition to vector of global definitions p_vecGlobDefs->push_back( new DefRec_DefProcessGroup_struct( 0, diff --git a/ompi/contrib/vt/vt/vtlib/vt_comp_gnu.c b/ompi/contrib/vt/vt/vtlib/vt_comp_gnu.c index 1de58297cc..8eade15eed 100644 --- a/ompi/contrib/vt/vt/vtlib/vt_comp_gnu.c +++ b/ompi/contrib/vt/vt/vtlib/vt_comp_gnu.c @@ -312,6 +312,16 @@ static void get_symtab(void) else if ( addr > 0 ) { char* n = strdup(funcname); + char* p; + + if ( n == NULL ) + vt_error(); + + /* chop function name at '??', if necessary */ + p = strstr(n, "??"); + if ( p != NULL && p != n ) + *p = '\0'; + hash_put(addr, n, filename, lno); } } @@ -419,10 +429,9 @@ void gnu_finalize() max = n_bucket_entries; idx_max = i; } - avg += n_bucket_entries; vt_cntl_msg( 3, "Hash bucket %i had %u entries (%.1f/1000)", i, n_bucket_entries, ((double)n_bucket_entries*1000)/n ); } - avg /= HASH_MAX; + avg = (double)n / HASH_MAX; vt_cntl_msg( 3, "Hash statistics:\n" "\tNumber of entries: %u\n" "\tMin bucket size: %u (%.1f/1000) at index %i\n" diff --git a/ompi/contrib/vt/vt/vtlib/vt_otf_trc.c b/ompi/contrib/vt/vt/vtlib/vt_otf_trc.c index 3856d3cbc0..108a14c7d0 100644 --- a/ompi/contrib/vt/vt/vtlib/vt_otf_trc.c +++ b/ompi/contrib/vt/vt/vtlib/vt_otf_trc.c @@ -1946,7 +1946,7 @@ void vt_exit(uint64_t* time) { VT_TRACE_OFF_PERMANENT) return; do_trace = ((VTTHRD_TRACE_STATUS(VTThrdv[VT_MY_THREAD]) == VT_TRACE_ON) && - (VTTHRD_STACK_LEVEL(VTThrdv[VT_MY_THREAD]) <= max_stack_depth)); + (VTTHRD_STACK_LEVEL(VTThrdv[VT_MY_THREAD])+1 < max_stack_depth)); #if !defined(VT_DISABLE_RFG) if (!RFG_Regions_stackPop(VTTHRD_RFGREGIONS(VTThrdv[VT_MY_THREAD]), diff --git a/ompi/contrib/vt/vt/vtlib/vt_pthreadwrap.c b/ompi/contrib/vt/vt/vtlib/vt_pthreadwrap.c index 8fbac65780..cad58aaa60 100644 --- a/ompi/contrib/vt/vt/vtlib/vt_pthreadwrap.c +++ b/ompi/contrib/vt/vt/vtlib/vt_pthreadwrap.c @@ -10,6 +10,8 @@ * See the file COPYING in the package base directory for details **/ +#include "config.h" + #include #include @@ -430,18 +432,26 @@ GEN_WRAPFUNC(VT__PTHREAD_MUTEXATTR_DESTROY, pthread_mutexattr_destroy, int, *----------------------------------------------------------------------------- */ +#if defined(HAVE_PTHREAD_MUTEXATTR_GETPSHARED) && HAVE_PTHREAD_MUTEXATTR_GETPSHARED + /* -- pthread_mutexattr_getpshared -- */ GEN_WRAPFUNC(VT__PTHREAD_MUTEXATTR_GETPSHARED, pthread_mutexattr_getpshared, int, (const pthread_mutexattr_t* attr, int* pshared), (attr, pshared)) +#endif /* HAVE_PTHREAD_MUTEXATTR_GETPSHARED */ + +#if defined(HAVE_PTHREAD_MUTEXATTR_SETPSHARED) && HAVE_PTHREAD_MUTEXATTR_SETPSHARED + /* -- pthread_mutexattr_setpshared -- */ GEN_WRAPFUNC(VT__PTHREAD_MUTEXATTR_SETPSHARED, pthread_mutexattr_setpshared, int, (pthread_mutexattr_t* attr, int pshared), (attr, pshared)) +#endif /* HAVE_PTHREAD_MUTEXATTR_SETPSHARED */ + /* *----------------------------------------------------------------------------- * @@ -515,14 +525,22 @@ GEN_WRAPFUNC(VT__PTHREAD_CONDATTR_DESTROY, pthread_condattr_destroy, int, *----------------------------------------------------------------------------- */ +#if defined(HAVE_PTHREAD_CONDATTR_GETPSHARED) && HAVE_PTHREAD_CONDATTR_GETPSHARED + /* -- pthread_condattr_getpshared -- */ GEN_WRAPFUNC(VT__PTHREAD_CONDATTR_GETPSHARED, pthread_condattr_getpshared, int, (const pthread_condattr_t* attr, int* pshared), (attr, pshared)) +#endif /* HAVE_PTHREAD_CONDATTR_GETPSHARED */ + +#if defined(HAVE_PTHREAD_CONDATTR_SETPSHARED) && HAVE_PTHREAD_CONDATTR_SETPSHARED + /* -- pthread_condattr_setpshared -- */ GEN_WRAPFUNC(VT__PTHREAD_CONDATTR_SETPSHARED, pthread_condattr_setpshared, int, (pthread_condattr_t* attr, int pshared), (attr, pshared)) + +#endif /* HAVE_PTHREAD_CONDATTR_SETPSHARED */