From 65c5e3925d10424b15476112ccac1d0704630316 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 12 Jan 2010 11:07:59 -0500 Subject: [svn-r18105] Description: Minor brush-clearing changes to converge metadata_journaling branch and trunk. Tested on: Mac OS X/32 10.6.2 (amazon) debug & prod (h5committest not required on this branch) --- bin/reconfigure | 22 +++++++++++----------- src/H5AC.c | 10 +++++----- src/H5Atest.c | 2 +- src/H5D.c | 1 - src/H5Ddeprec.c | 1 - src/H5Gpkg.h | 1 - src/H5Gstab.c | 7 +++---- 7 files changed, 20 insertions(+), 24 deletions(-) diff --git a/bin/reconfigure b/bin/reconfigure index 3be337b..65a46bc 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -28,11 +28,11 @@ # of versions that can get confused (not even counting the m4 utility)! # HDF5 currently uses the following versions of the autotools: -AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.61" -AUTOMAKE_VERSION="automake (GNU automake) 1.10.1" -AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.61" -ACLOCAL_VERSION="aclocal (GNU automake) 1.10.1" -LIBTOOL_VERSION="(GNU libtool) 2.2.2" +AUTOCONF_VERSION="autoconf (GNU Autoconf) 2.64" +AUTOMAKE_VERSION="automake (GNU automake) 1.11" +AUTOHEADER_VERSION="autoheader (GNU Autoconf) 2.64" +ACLOCAL_VERSION="aclocal (GNU automake) 1.11" +LIBTOOL_VERSION="(GNU libtool) 2.2.6" # # When upgrading automake's version, don't forget to also update its # helper utilities, especially depcomp. @@ -41,19 +41,19 @@ LIBTOOL_VERSION="(GNU libtool) 2.2.2" # If paths to autotools are not specified by the user, assume tools are # running on kagiso and set paths accordingly. if test -z ${AUTOCONF}; then - AUTOCONF=/home/packages/autoconf/autoconf-2.61/bin/autoconf + AUTOCONF=/mnt/hdf/packages/autoconf/autoconf-2.64/bin/autoconf fi if test -z ${AUTOMAKE}; then - AUTOMAKE=/home/packages/automake/automake-1.10.1/bin/automake-1.10 + AUTOMAKE=/mnt/hdf/packages/automake/automake-1.11/bin/automake-1.11 fi if test -z ${AUTOHEADER}; then - AUTOHEADER=/home/packages/autoconf/autoconf-2.61/bin/autoheader + AUTOHEADER=/mnt/hdf/packages/autoconf/autoconf-2.64/bin/autoheader fi if test -z ${ACLOCAL}; then - ACLOCAL=/home/packages/automake/automake-1.10.1/bin/aclocal-1.10 + ACLOCAL=/mnt/hdf/packages/automake/automake-1.11/bin/aclocal-1.11 fi if test -z ${LIBTOOL}; then - LIBTOOL=/home/packages/libtool/libtool-2.2.2/bin/libtool + LIBTOOL=/mnt/hdf/packages/libtool/libtool-2.2.6a/bin/libtool fi # Check version numbers of all autotools against the "correct" versions @@ -84,7 +84,7 @@ if test -z "${LT_VERS}"; then fi # Use the latest version of M4 -PATH=/home/packages/m4/m4-1.4.7/bin:/home/packages/m4/m4-1.4.7/share:$PATH +PATH=/mnt/hdf/packages/m4/m4-1.4.7/bin:/mnt/hdf/packages/m4/m4-1.4.7/share:$PATH # Make sure that the tools are in the path. AUTOCONF_DIR=`dirname ${AUTOCONF}` diff --git a/src/H5AC.c b/src/H5AC.c index fc4ea4d..59b2e60 100644 --- a/src/H5AC.c +++ b/src/H5AC.c @@ -510,11 +510,11 @@ H5AC_create(const H5F_t *f, FUNC_ENTER_NOAPI(H5AC_create, FAIL) - HDassert ( f ); - HDassert ( NULL == f->shared->cache ); - HDassert ( config_ptr != NULL ) ; - HDassert ( NELMTS(H5AC_entry_type_names) == H5AC_NTYPES); - HDassert ( H5C__MAX_NUM_TYPE_IDS == H5AC_NTYPES); + HDassert(f); + HDassert(NULL == f->shared->cache); + HDassert(config_ptr != NULL); + HDcompile_assert(NELMTS(H5AC_entry_type_names) == H5AC_NTYPES); + HDcompile_assert(H5C__MAX_NUM_TYPE_IDS == H5AC_NTYPES); result = H5AC_validate_config(config_ptr); diff --git a/src/H5Atest.c b/src/H5Atest.c index 1fbaa42..7c4f886 100644 --- a/src/H5Atest.c +++ b/src/H5Atest.c @@ -37,7 +37,7 @@ /***********/ #include "H5private.h" /* Generic Functions */ #include "H5Apkg.h" /* Attributes */ -#include "H5ACprivate.h" /* Metadata cache */ +#include "H5ACprivate.h" /* Metadata cache */ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ #include "H5SMprivate.h" /* Shared object header messages */ diff --git a/src/H5D.c b/src/H5D.c index e00dd2d..d78a1bb 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -28,7 +28,6 @@ /***********/ #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ -#include "H5AC2private.h" /* Metadata cache */ #include "H5Dpkg.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free lists */ diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index dac3090..8f53ec2 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -42,7 +42,6 @@ /***********/ #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ -#include "H5AC2private.h" /* Metadata cache */ #include "H5Dpkg.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* IDs */ diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index 2e1b6af..2089bed 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -227,7 +227,6 @@ typedef struct H5G_bt_it_cpy_t { /* Common information for "by index" lookups in symbol tables */ typedef struct H5G_bt_it_idx_common_t { /* downward */ - H5F_t *f; /* Pointer to file that symbol table is in */ hsize_t idx; /* Index of group member to be queried */ hsize_t num_objs; /* The number of objects having been traversed */ H5G_bt_find_op_t op; /* Operator to call when correct entry is found */ diff --git a/src/H5Gstab.c b/src/H5Gstab.c index fcb573d..2b1476d 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -55,6 +55,7 @@ typedef struct H5G_bt_it_gnbi_t { typedef struct H5G_bt_it_gtbi_t { /* downward */ H5G_bt_it_idx_common_t common; /* Common information for "by index" lookup */ + H5F_t *f; /* Pointer to file that symbol table is in */ hid_t dxpl_id; /* DXPL for operation */ /* upward */ @@ -733,7 +734,6 @@ H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n, } /* end if */ /* Set iteration information */ - udata.common.f = oloc->file; udata.common.idx = n; udata.common.num_objs = 0; udata.common.op = H5G_stab_get_name_by_idx_cb; @@ -956,7 +956,6 @@ H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n, } /* end if */ /* Set iteration information */ - udata.common.f = grp_oloc->file; udata.common.idx = n; udata.common.num_objs = 0; udata.common.op = H5G_stab_lookup_by_idx_cb; @@ -1020,7 +1019,7 @@ H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata) H5O_type_t obj_type; /* Type of object at location */ /* Build temporary object location */ - tmp_oloc.file = udata->common.f; + tmp_oloc.file = udata->f; HDassert(H5F_addr_defined(ent->header)); tmp_oloc.addr = ent->header; @@ -1069,10 +1068,10 @@ H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "unable to determine local heap address") /* Set iteration information */ - udata.common.f = oloc->file; udata.common.idx = idx; udata.common.num_objs = 0; udata.common.op = H5G_stab_get_type_by_idx_cb; + udata.f = oloc->file; udata.dxpl_id = dxpl_id; udata.type = H5G_UNKNOWN; -- cgit v0.12