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.
Этот коммит содержится в:
родитель
c16cd10bb2
Коммит
86e58eb6d3
@ -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
|
||||
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
|
||||
|
@ -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"],
|
||||
[
|
||||
|
@ -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
|
||||
])
|
||||
])
|
||||
])
|
||||
|
@ -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"
|
||||
])
|
||||
])
|
||||
|
||||
|
@ -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.])
|
||||
])
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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 );
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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 );
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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<uint64_t/*handleid*/, FileOpen>::iterator it;
|
||||
uint32_t ret;
|
||||
map<uint64_t/*handleid*/, FileOpen>::iterator it;
|
||||
|
||||
it= openfiles.find( handleid );
|
||||
|
||||
if( it != openfiles.end() ) {
|
||||
it= openfiles.find( handleid );
|
||||
|
||||
/* make the statistics */
|
||||
map<uint32_t,FileOperationStatistics>::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<uint32_t,FileOperationStatistics>::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:
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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 );
|
||||
|
||||
|
||||
|
@ -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 );
|
||||
}
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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" ) ) {
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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 );
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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 );
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
||||
|
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
x
Ссылка в новой задаче
Block a user