VT configure fixes:

- skip test for libdl on BlueGene? and CrayXT platforms (particularly on CrayXT this library can be linked but it isn't suitable)
- set cache variables for functions 'PMPI_Win_test', 'PMPI_Win_lock', 'PMPI_Win_unlock', and 'MPI_Register_datarep', if VT is configuring for Open MPI
- added test for pthread functions 'pthread_condattr_<set|get>pshared' and 'pthread_mutexattr_<set|get>pshared', because they are not available on some platforms
VT fixes:
- cut 'nm' collected symbol names at '??'
- vtunify:
        - fixed unsafe usage of some strncpy's
        - fixed potential segmentation fault in vtunify-mpi which might occur on 32bit platforms using MPICH2
OTF general:
- updated date in copyright header of each source file
OTF fixes:
- minor code cleanups (indentation, nicer error messages, more correct free's)
- otfaux:
        - fix to place final statistics after the very last record instead of right before
        - changed fatal error to a warning when a file is closed twice (or unexpectedly)

This commit was SVN r22820.

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_<incl|excl>' 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
+	- fixed potential segmentation fault in vtunify-mpi which might occur
-	  BFD library to the shared VT libraries, because the BFD objects might
+	  on 32bit platforms using MPICH2
-	  be built without position independent code (PIC)
 	- patched libtool to avoid a bug in detection of the PGI 10 compilers
 
 5.8openmpi

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
+	AS_IF([test "$PLATFORM" = "bgl" -o "$PLATFORM" = "bgp" -o "$PLATFORM" = "crayxt"],
-	CPPFLAGS="$CPPFLAGS $DLINCDIR"
-	AC_CHECK_HEADER([dlfcn.h], [],
 	[
-		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"],
 	[

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"],
+		ACVT_DL
-		[
+		AS_IF([test x"$have_dl" = "xno"], [libwrap_error="yes"])
-			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"])
 
-			AS_IF([test x"$libwrap_error" = "xno"],
+		AS_IF([test x"$libwrap_error" = "xno"],
-			[
+		[
-				for lw in $check_libwrap
+			for lw in $check_libwrap
-				do
+			do
-					case $lw in
+				case $lw in
-					gen)
+				gen)
-						ACVT_CONF_SUBTITLE([Library wrapper generator])
+					ACVT_CONF_SUBTITLE([Library wrapper generator])
-						ACVT_CTOOL
+					ACVT_CTOOL
-						AS_IF([test x"$have_ctool" = "xyes"],
+					AS_IF([test x"$have_ctool" = "xyes"],
-						[have_libwrap="yes"; build_libwrapgen="yes"],
+					[have_libwrap="yes"; build_libwrapgen="yes"],
-						[
+					[
-							AS_IF([test x"$force_libwrapgen" = "xyes"],
+						AS_IF([test x"$force_libwrapgen" = "xyes"],
-							[libwrap_error="yes"; break])
+						[libwrap_error="yes"; break])
-						])
+					])
-						;;
+					;;
-					libc)
+				libc)
-						ACVT_CONF_SUBTITLE([LIBC])
+					ACVT_CONF_SUBTITLE([LIBC])
-						ACVT_LIBCWRAP
+					ACVT_LIBCWRAP
-						AS_IF([test x"$have_libcwrap" = "xyes"], [have_libwrap="yes"],
+					AS_IF([test x"$have_libcwrap" = "xyes"], [have_libwrap="yes"],
-						[
+					[
-							AS_IF([test x"$force_libcwrap" = "xyes"],
+						AS_IF([test x"$force_libcwrap" = "xyes"],
-							[libwrap_error="yes"; break])
+						[libwrap_error="yes"; break])
-						])
+					])
-						;;
+					;;
-					io)
+				io)
-						ACVT_CONF_SUBTITLE([LIBC-I/O])
+					ACVT_CONF_SUBTITLE([LIBC-I/O])
-						ACVT_IOWRAP
+					ACVT_IOWRAP
-						AS_IF([test x"$have_iowrap" = "xyes"], [have_libwrap="yes"],
+					AS_IF([test x"$have_iowrap" = "xyes"], [have_libwrap="yes"],
-						[
+					[
-							AS_IF([test x"$force_iowrap" = "xyes"],
+						AS_IF([test x"$force_iowrap" = "xyes"],
-							[libwrap_error="yes"; break])
+						[libwrap_error="yes"; break])
-						])
+					])
-						;;
+					;;
-					esac
+				esac
-				done
+			done
-			])
 		])
 	])
 ])

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"
 		])
 	])
 

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.])
 	])

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.

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.

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.c

@@ -1,6 +1,5 @@
 /*
- This is part of the OTF library.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2010.
- Copyright (c) 2005-2009, ZIH, TU Dresden, Federal Republic of Germany
  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"

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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",
+					"OTF_getFilename() failed for event file with name stub '%s' and ID %u.\n",
-					__FUNCTION__, __FILE__, __LINE__ );
+					__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

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
 */
 

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
 */
 

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
 */
 

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 */

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
 */
 

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
 */
 

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 );
 }
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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 );
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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;
+    uint32_t ret;
-	map<uint64_t/*handleid*/, FileOpen>::iterator it;
+    map<uint64_t/*handleid*/, FileOpen>::iterator it;
 
-	it= openfiles.find( handleid );
+    it= openfiles.find( handleid );
 
-	if( it != openfiles.end() ) {
 
-		/* make the statistics */
+    if( it == openfiles.end() ) {
-		map<uint32_t,FileOperationStatistics>::iterator it2;
+/*
+#       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 );
 
-		it2= fostatistics.find( it->second.fileid );	
+        /* make it a warning that cannot be disabled because I suspect an error in VT ! */
+        /* return OTF_RETURN_ABORT; */
+        return OTF_RETURN_OK;
+    }
 
-		if( it2 != fostatistics.end() ) {
 
-			FileOperationStatistics& fos= it2->second;
 
-			++fos.nclose;
+    /* make the statistics */
+    map<uint32_t,FileOperationStatistics>::iterator it2;
 
-			ret= OTF_RETURN_OK;
+    it2= fostatistics.find( it->second.fileid );	
 
-		} else {
+    if( it2 != fostatistics.end() ) {
 
-	#		ifdef OTF_VERBOSE
+        FileOperationStatistics& fos= it2->second;
-				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;
+        ++fos.nclose;
-		}
 
-		/* erase the file from the opened files list */
+        ret= OTF_RETURN_OK;
-		openfiles.erase( it );
 
-	} else {
+    } else {
 
-#		ifdef OTF_VERBOSE
+#       ifdef OTF_VERBOSE
-			fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n "
+            fprintf( stderr, "ERROR in function %s, file: %s, line: %i:\n "
-				"Trying to close not yet opened file. aborting\n",
+                "Trying to close not yet opened file. aborting\n",
-				__FUNCTION__, __FILE__, __LINE__ );
+                __FUNCTION__, __FILE__, __LINE__ );
-#		endif
+#       endif
 
-		ret= OTF_RETURN_ABORT;
+        ret= OTF_RETURN_ABORT;
+    }
 
-	}
+    /* erase the file from the opened files list */
+    openfiles.erase( it );
 
-	return ret;
+    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:

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
 */
 

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 doSnapshots= true;
-    	bool doStatistics= 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,11 +466,11 @@ int main ( int argc, const char** argv ) {
 	OTF_HandlerArray_setFirstHandlerArg( handlers, (void*) control,
 		OTF_ENDPROCESS_RECORD );
 
-        OTF_HandlerArray_setHandler( handlers, 
+    OTF_HandlerArray_setHandler( handlers, 
-    		(OTF_FunctionPointer*) handleCollectiveOperation,
+        (OTF_FunctionPointer*) handleCollectiveOperation,
-    		OTF_COLLOP_RECORD );
+        OTF_COLLOP_RECORD );
-    	OTF_HandlerArray_setFirstHandlerArg( handlers, (void*) control, 
+    OTF_HandlerArray_setFirstHandlerArg( handlers, (void*) control, 
-    		OTF_COLLOP_RECORD );
+        OTF_COLLOP_RECORD );
 
 	OTF_HandlerArray_setHandler( handlers, 
 		(OTF_FunctionPointer*) handleEventComment,
@@ -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 ) {
+    /*
-	
+     * generated sample points, but don't include t_min,
-		control->addTime( (uint64_t) t );
+     * 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 */
@@ -536,11 +543,12 @@ int main ( int argc, const char** argv ) {
 		control->addTime( *it );
 	}
 
+    /* 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 ) {
 
-	if ( control->getLastTime() < tmax ) {
+        control->addTime( 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 );
 
 

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 );
 		}

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
 */
 

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" ) ) {
 

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
 */
 

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
 */
 

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 );
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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;
     }

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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 );
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */
 

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
 */