Commit d4e93988 authored by miller86's avatar miller86
Browse files

truncated loging from glxinfo ; changed order of run-id and level in names of debug lobs

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3795 18c085ea-50e0-402c-830e-de6fd14e8384
parent a613afd0
......@@ -489,6 +489,11 @@ DebugStream::~DebugStream()
// Change the extension from '.log' to '.vlog'. Made it loop to find
// a unique filename.
//
// Mark C. Miller, Thu Apr 10 08:07:52 PDT 2008
// Changed order of debug level and run number in filename.
// Changed strspn to scan progname, not filename (which would already
// have a 'level' sprintf'd into it.
//
// ****************************************************************************
......@@ -499,7 +504,7 @@ DebugStream::open(const char *progname, bool clobber)
sprintf(filename, "%s.%d.vlog", progname, level);
// only search for a unique name if we don't have pids
bool findUnique = !clobber && strspn(filename, ".0123456789") == 0;
bool findUnique = !clobber && (strspn(progname, ".0123456789") == 0);
// loop until we create a name for which stat returns 0
int n = 1;
......@@ -517,7 +522,7 @@ DebugStream::open(const char *progname, bool clobber)
if (stat(filename, &stbuf) != 0)
break;
#endif
sprintf(filename, "%s.%d.%d.vlog", progname, level, n);
sprintf(filename, "%s.%d.%d.vlog", progname, n, level);
n++;
}
......
......@@ -48,19 +48,31 @@ fi
PYDIR=$VISITHOME/python/2.5/linux-i686_gcc-3.2.3
PYVERSION=python2.5
##
## Specify the location of the silo include files and library.
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.6.1/linux-i686_gcc-3.2.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.6.1/linux-i686_gcc-3.2.3/lib
#
# SZIP
#
DEFAULT_SZIP_INCLUDE=$VISITHOME/szip/2.1/i386-pc-linux-gcc-3.2.3/include
DEFAULT_SZIP_LIB=$VISITHOME/szip/2.1/i386-pc-linux-gcc-3.2.3/lib
#
# HDF5
#
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.5/linux-i686_gcc-3.2.3/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.5/linux-i686_gcc-3.2.3/lib
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.6/i386-pc-linux-gcc-3.2.3/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.6/i386-pc-linux-gcc-3.2.3/lib
##
## Specify the location of the silo include files and library.
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.6.1/linux_rhel3-gcc-3.2.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.6.1/linux_rhel3-gcc-3.2.3/lib
#
# Mili
#
MILI_DIR=$VISITHOME/mili/1.10.0/linux-i686_gcc-3.2.3
#
# CGNS
#
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/linux-i686_gcc-3.2.3/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/linux-i686_gcc-3.2.3/lib
......@@ -110,6 +110,10 @@ LogCommand(const char *cmd, const char *truncate_at_pattern)
//
// Programmer: Mark C. Miller
// Created: April 9, 2008
//
// Modifications:
// Mark C. Miller, Thu Apr 10 08:16:51 PDT 2008
// Truncated glxinfo output
// ****************************************************************************
static void
......@@ -118,8 +122,8 @@ LogGlxAndXdpyInfo()
#if !defined(_WIN32)
if (debug5_real)
{
LogCommand("xdpyinfo", "number of visuals");
LogCommand("glxinfo -v -t", 0);
LogCommand("xdpyinfo", "number of visuals"); // truncate at list of visuals
LogCommand("glxinfo -v -t", "^Vis Vis"); // truncate at table of visuals
}
#endif
}
......@@ -196,6 +200,9 @@ LogGlxAndXdpyInfo()
//
// Mark C. Miller, Thu Apr 3 14:36:48 PDT 2008
// Moved setting of component name to before Initialize
//
// Mark C. Miller, Thu Apr 10 08:16:51 PDT 2008
// Added logging of info from X display and glx
// ****************************************************************************
int
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment