Commit 0413ac8d authored by ghweber's avatar ghweber

Merged 1.12RC changes into trunk: Use libtcmalloc_minimal instead of...

Merged 1.12RC changes into trunk: Use libtcmalloc_minimal instead of libtcmalloc. Fix invalid cycle display for Chombo plugin. Update configuration for harlow.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7885 18c085ea-50e0-402c-830e-de6fd14e8384
parent 51c77b68
# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
......
......@@ -132,4 +132,4 @@ DEFAULT_CCMIO_LIB=$VISITHOME/ccmio/2.6.1/$VISITARCH/lib
##
## TCMALLOC
##
DEFAULT_TCMALLOC_DIR=$VISITHOME/google-perftools/1.0/$VISITARCH/lib
DEFAULT_TCMALLOC_DIR=$VISITHOME/google-perftools/1.3/linux-x86_64_gcc-4.2/lib
......@@ -9512,12 +9512,12 @@ fi;
if test "$google_perftools_specified" = "yes"; then
if test "$withval" != "no"; then
TCMALLOC_DIR=`echo $withval | cut -f1 -d' '`
TCMALLOC_LIB="-ltcmalloc"
TCMALLOC_LIB="-ltcmalloc_minimal"
fi
else
if test "$DEFAULT_TCMALLOC_DIR" != "" ; then
TCMALLOC_DIR=$DEFAULT_TCMALLOC_DIR
TCMALLOC_LIB="-ltcmalloc"
TCMALLOC_LIB="-ltcmalloc_minimal"
fi
fi
if test "$TCMALLOC_LIB" != "" ; then
......
......@@ -968,6 +968,10 @@ dnl
dnl Tom Fogal, Wed Jul 1 20:30:30 MDT 2009
dnl Add EXPR_EXPORTS while building avt, to workaround expressions pain.
dnl
dnl Gunther H. Weber, Wed Jul 22 13:42:01 PDT 2009
dnl Link to tcmalloc_minimal instead of regular version to avoid additional
dnl dependencies (e.g. unwind) on 64-bit machines.
dnl
dnl --------------------------------------------------------------------------
dnl
......@@ -2448,12 +2452,12 @@ AC_ARG_WITH(google_perftools,
if test "$google_perftools_specified" = "yes"; then
if test "$withval" != "no"; then
TCMALLOC_DIR=`echo $withval | cut -f1 -d' '`
TCMALLOC_LIB="-ltcmalloc"
TCMALLOC_LIB="-ltcmalloc_minimal"
fi
else
if test "$DEFAULT_TCMALLOC_DIR" != "" ; then
TCMALLOC_DIR=$DEFAULT_TCMALLOC_DIR
TCMALLOC_LIB="-ltcmalloc"
TCMALLOC_LIB="-ltcmalloc_minimal"
fi
fi
if test "$TCMALLOC_LIB" != "" ; then
......
......@@ -275,17 +275,21 @@ avtChomboFileFormat::GetTime(void)
//
// Mark C. Miller, Wed Sep 24 11:43:38 PDT 2008
// Modified regular expression to meet specifications in ticket 8737
//
// Gunther H. Weber, Wed Jul 22 11:48:18 PDT 2009
// Modified regular expression to meet new specifications set by Terry
// Ligocki (ANAG/APDEC).
//
// ****************************************************************************
int
avtChomboFileFormat::GetCycleFromFilename(const char *fname) const
{
int ret = avtFileFormat::INVALID_CYCLE;
if (fname == 0 || fname[0] == '\0')
return ret;
return GuessCycle(fname, "<^([a-zA-Z_]*)([0-9]*\\.)?([0-9]*)\\.(2|3)d\\.hdf5$> \\3");
return avtFileFormat::INVALID_CYCLE;
else
return GuessCycle(fname,
"<^.*[^0-9]([0-9][0-9]*)\\.(2|3)[dD]\\.(hdf5|h5)$> \\1");
}
......@@ -1267,6 +1271,10 @@ avtChomboFileFormat::CalculateDomainNesting(void)
// Gunther H. Weber, Wed Jun 10 18:28:24 PDT 2009
// Added ability to handle particle data in Chombo files.
//
// Gunther H. Weber, Wed Jul 22 15:42:27 PDT 2009
// Only set cycle in metadata if it can be determined. Otherwise announce
// that it is not accurate.
//
// ****************************************************************************
void
......@@ -1666,7 +1674,15 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
}
md->SetTime(timestep, dtime);
md->SetCycle(timestep, cycle);
if (cycle != avtFileFormat::INVALID_CYCLE)
{
md->SetCycle(timestep, cycle);
md->SetCycleIsAccurate(true, timestep);
}
else
{
md->SetCycleIsAccurate(false, timestep);
}
}
......
......@@ -184,6 +184,10 @@
# Brad Whitlock, Fri Jun 12 14:34:34 PST 2009
# I changed the links for libGLU in case it has several names.
#
# Gunther H. Weber, Wed Jul 22 13:42:01 PDT 2009
# Link to tcmalloc_minimal instead of regular version to avoid additional
# dependencies (e.g. unwind) on 64-bit machines.
#
##############################################################################
@SET_MAKE@
......@@ -375,8 +379,8 @@ create_gdal_link:
ln -s @GDAL_LIB@ .
create_tcmalloc_link:
$(RM) libtcmalloc.@SHLIB_LIBEXT@*
ln -s @TCMALLOC_DIR@/libtcmalloc.@SHLIB_LIBEXT@* .
$(RM) libtcmalloc_minimal.@SHLIB_LIBEXT@*
ln -s @TCMALLOC_DIR@/libtcmalloc_minimal.@SHLIB_LIBEXT@* .
create_exodus_link:
$(RM) libexoIIv2c.@SHLIB_LIBEXT@
......
......@@ -400,6 +400,10 @@
# to create symbolic links at a later time.
# MERGE CHANGE: Reverted to grep in merge.
#
# Gunther H. Weber, Wed Jul 22 15:56:01 PDT 2009
# Use/copy libtcmalloc_minimal instead of libtcmalloc to avoid dependency
# on libunwind on 64-bit machines.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -1164,8 +1168,8 @@ if ((-e $VisItDir/lib/libgcc_s.so.1) || (-e $VisItDir/lib/libgcc_s.a)) then
endif
# Add support for all the tcmalloc libs ... meaning libtcmalloc.so,
# libtcmalloc.so.0, & libtcmalloc.so.0.0.0.
if (-e $VisItDir/lib/libtcmalloc.so) then
cp $VisItDir/lib/libtcmalloc* $libdir
if (-e $VisItDir/lib/libtcmalloc_minimal.so) then
cp $VisItDir/lib/libtcmalloc_minimal* $libdir
endif
#
......
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