2003-02-17 23:54:15 +08:00
|
|
|
|
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
|
|
|
|
* Copyright by the Board of Trustees of the University of Illinois. *
|
|
|
|
|
* All rights reserved. *
|
|
|
|
|
* *
|
|
|
|
|
* This file is part of HDF5. The full HDF5 copyright notice, including *
|
|
|
|
|
* terms governing use, modification, and redistribution, is contained in *
|
|
|
|
|
* the files COPYING and Copyright.html. COPYING can be found at the root *
|
|
|
|
|
* of the source code distribution tree; Copyright.html can be found at the *
|
|
|
|
|
* root level of an installed copy of the electronic HDF5 document set and *
|
|
|
|
|
* is linked from the top-level documents page. It can also be found at *
|
|
|
|
|
* http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have *
|
|
|
|
|
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
|
|
|
|
|
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
|
|
|
|
|
1997-07-31 05:17:56 +08:00
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Created: H5G.c
|
|
|
|
|
* Jul 18 1997
|
|
|
|
|
* Robb Matzke <matzke@llnl.gov>
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Symbol table functions. The functions that begin with
|
|
|
|
|
* `H5G_stab_' don't understand the naming system; they operate
|
|
|
|
|
* on a single symbol table at a time.
|
|
|
|
|
*
|
|
|
|
|
* The functions that begin with `H5G_node_' operate on the leaf
|
|
|
|
|
* nodes of a symbol table B-tree. They should be defined in
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* the H5Gnode.c file.
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
|
|
|
|
* The remaining functions know how to traverse the group
|
|
|
|
|
* directed graph.
|
|
|
|
|
*
|
|
|
|
|
* Names: Object names are a slash-separated list of components. If
|
|
|
|
|
* the name begins with a slash then it's absolute, otherwise
|
|
|
|
|
* it's relative ("/foo/bar" is absolute while "foo/bar" is
|
|
|
|
|
* relative). Multiple consecutive slashes are treated as
|
|
|
|
|
* single slashes and trailing slashes are ignored. The special
|
|
|
|
|
* case `/' is the root group. Every file has a root group.
|
|
|
|
|
*
|
|
|
|
|
* API functions that look up names take a location ID and a
|
|
|
|
|
* name. The location ID can be a file ID or a group ID and the
|
|
|
|
|
* name can be relative or absolute.
|
|
|
|
|
*
|
|
|
|
|
* +--------------+----------- +--------------------------------+
|
|
|
|
|
* | Location ID | Name | Meaning |
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | File ID | "/foo/bar" | Find `foo' within `bar' within |
|
|
|
|
|
* | | | the root group of the specified|
|
|
|
|
|
* | | | file. |
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | File ID | "foo/bar" | Find `foo' within `bar' within |
|
|
|
|
|
* | | | the current working group of |
|
|
|
|
|
* | | | the specified file. |
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | File ID | "/" | The root group of the specified|
|
|
|
|
|
* | | | file. |
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | File ID | "." | The current working group of |
|
|
|
|
|
* | | | the specified file. |
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | Group ID | "/foo/bar" | Find `foo' within `bar' within |
|
|
|
|
|
* | | | the root group of the file |
|
|
|
|
|
* | | | containing the specified group.|
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | Group ID | "foo/bar" | File `foo' within `bar' within |
|
|
|
|
|
* | | | the specified group. |
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | Group ID | "/" | The root group of the file |
|
|
|
|
|
* | | | containing the specified group.|
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
|
|
|
|
* | Group ID | "." | The specified group. |
|
|
|
|
|
* +--------------+------------+--------------------------------+
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
|
|
|
|
*
|
1997-08-08 03:23:00 +08:00
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Robb Matzke, 5 Aug 1997
|
|
|
|
|
* Added calls to H5E.
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Robb Matzke, 30 Aug 1997
|
|
|
|
|
* Added `Errors:' field to function prologues.
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, 22 Aug 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-08-29 02:34:12 +08:00
|
|
|
|
*
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2000-10-10 15:43:38 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
#define H5G_PACKAGE /*suppress error message about including H5Gpkg.h */
|
|
|
|
|
#define H5F_PACKAGE /*suppress error about including H5Fpkg */
|
2000-10-10 15:43:38 +08:00
|
|
|
|
|
2004-06-23 23:36:35 +08:00
|
|
|
|
/* Interface initialization */
|
|
|
|
|
#define H5_INTERFACE_INIT_FUNC H5G_init_interface
|
|
|
|
|
|
|
|
|
|
|
1997-07-31 05:17:56 +08:00
|
|
|
|
/* Packages needed by this file... */
|
2003-05-09 04:09:07 +08:00
|
|
|
|
#include "H5private.h" /* Generic Functions */
|
|
|
|
|
#include "H5Aprivate.h" /* Attributes */
|
2003-05-16 03:22:33 +08:00
|
|
|
|
#include "H5Bprivate.h" /* B-link trees */
|
|
|
|
|
#include "H5Dprivate.h" /* Datasets */
|
2003-05-09 04:09:07 +08:00
|
|
|
|
#include "H5Eprivate.h" /* Error handling */
|
|
|
|
|
#include "H5Fpkg.h" /* File access */
|
|
|
|
|
#include "H5FLprivate.h" /* Free Lists */
|
|
|
|
|
#include "H5Gpkg.h" /* Groups */
|
|
|
|
|
#include "H5HLprivate.h" /* Local Heaps */
|
|
|
|
|
#include "H5Iprivate.h" /* IDs */
|
|
|
|
|
#include "H5MMprivate.h" /* Memory management */
|
2005-06-21 02:11:57 +08:00
|
|
|
|
#include "H5Pprivate.h" /* Property lists */
|
1997-08-08 03:23:00 +08:00
|
|
|
|
|
2003-05-16 03:22:33 +08:00
|
|
|
|
/* Local macros */
|
1998-01-28 13:47:19 +08:00
|
|
|
|
#define H5G_INIT_HEAP 8192
|
|
|
|
|
#define H5G_RESERVED_ATOMS 0
|
2003-05-16 03:22:33 +08:00
|
|
|
|
#define H5G_SIZE_HINT 256 /*default root grp size hint */
|
|
|
|
|
#define H5G_NLINKS 16 /*max symlinks to follow per lookup */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* During name lookups (see H5G_namei()) we sometimes want information about
|
|
|
|
|
* a symbolic link or a mount point. The normal operation is to follow the
|
|
|
|
|
* symbolic link or mount point and return information about its target.
|
|
|
|
|
*/
|
|
|
|
|
#define H5G_TARGET_NORMAL 0x0000
|
|
|
|
|
#define H5G_TARGET_SLINK 0x0001
|
|
|
|
|
#define H5G_TARGET_MOUNT 0x0002
|
2005-06-21 02:11:57 +08:00
|
|
|
|
#define H5G_CRT_INTMD_GROUP 0x0004
|
2003-05-09 04:09:07 +08:00
|
|
|
|
|
2003-05-16 03:22:33 +08:00
|
|
|
|
/* Local typedefs */
|
1997-09-22 10:08:54 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Struct only used by change name callback function */
|
|
|
|
|
typedef struct H5G_names_t {
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_entry_t *loc;
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5RS_str_t *src_name;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_entry_t *src_loc;
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5RS_str_t *dst_name;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_entry_t *dst_loc;
|
2002-09-25 22:50:49 +08:00
|
|
|
|
H5G_names_op_t op;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
} H5G_names_t;
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* Enum for H5G_namei actions */
|
|
|
|
|
typedef enum {
|
|
|
|
|
H5G_NAMEI_TRAVERSE, /* Just traverse groups */
|
|
|
|
|
H5G_NAMEI_INSERT /* Insert entry in group */
|
2003-05-16 03:22:33 +08:00
|
|
|
|
} H5G_namei_act_t ;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* This table contains a list of object types, descriptions, and the
|
|
|
|
|
* functions that determine if some object is a particular type. The table
|
|
|
|
|
* is allocated dynamically.
|
|
|
|
|
*/
|
|
|
|
|
typedef struct H5G_typeinfo_t {
|
2003-07-10 03:16:17 +08:00
|
|
|
|
H5G_obj_t type; /*one of the public H5G_* types */
|
2003-05-16 03:22:33 +08:00
|
|
|
|
htri_t (*isa)(H5G_entry_t*, hid_t); /*function to determine type */
|
|
|
|
|
char *desc; /*description of object type */
|
|
|
|
|
} H5G_typeinfo_t;
|
|
|
|
|
|
|
|
|
|
/* Local variables */
|
|
|
|
|
static H5G_typeinfo_t *H5G_type_g = NULL; /*object typing info */
|
|
|
|
|
static size_t H5G_ntypes_g = 0; /*entries in type table */
|
|
|
|
|
static size_t H5G_atypes_g = 0; /*entries allocated */
|
|
|
|
|
static char *H5G_comp_g = NULL; /*component buffer */
|
|
|
|
|
static size_t H5G_comp_alloc_g = 0; /*sizeof component buffer */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
|
2000-08-17 04:13:02 +08:00
|
|
|
|
/* Declare a free list to manage the H5G_t struct */
|
|
|
|
|
H5FL_DEFINE(H5G_t);
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
H5FL_DEFINE(H5G_shared_t);
|
2000-08-17 04:13:02 +08:00
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* Declare extern the PQ free list for the wrapped strings */
|
|
|
|
|
H5FL_BLK_EXTERN(str_buf);
|
|
|
|
|
|
2002-08-29 02:34:12 +08:00
|
|
|
|
/* Private prototypes */
|
2005-08-09 05:03:17 +08:00
|
|
|
|
static herr_t H5G_register_type(H5G_obj_t type, htri_t(*isa)(H5G_entry_t*, hid_t),
|
|
|
|
|
const char *desc);
|
|
|
|
|
static const char * H5G_component(const char *name, size_t *size_p);
|
|
|
|
|
static const char * H5G_basename(const char *name, size_t *size_p);
|
|
|
|
|
static char * H5G_normalize(const char *name);
|
|
|
|
|
static herr_t H5G_namei(const H5G_entry_t *loc_ent, const char *name,
|
|
|
|
|
const char **rest/*out*/, H5G_entry_t *grp_ent/*out*/, H5G_entry_t *obj_ent/*out*/,
|
|
|
|
|
unsigned target, int *nlinks/*out*/, H5G_namei_act_t action,
|
|
|
|
|
H5G_entry_t *ent, hid_t dxpl_id);
|
|
|
|
|
static herr_t H5G_traverse_slink(H5G_entry_t *grp_ent/*in,out*/,
|
|
|
|
|
H5G_entry_t *obj_ent/*in,out*/, int *nlinks/*in,out*/, hid_t dxpl_id);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
static H5G_t *H5G_create(H5G_entry_t *loc, const char *name, size_t size_hint,
|
2005-08-09 05:03:17 +08:00
|
|
|
|
hid_t dxpl_id, hid_t gcpl_id, hid_t gapl_id);
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static htri_t H5G_isa(H5G_entry_t *ent, hid_t dxpl_id);
|
2004-06-23 22:03:22 +08:00
|
|
|
|
static htri_t H5G_link_isa(H5G_entry_t *ent, hid_t dxpl_id);
|
2005-08-09 05:03:17 +08:00
|
|
|
|
static H5G_t * H5G_open_oid(H5G_entry_t *ent, hid_t dxpl_id);
|
|
|
|
|
static H5G_t *H5G_rootof(H5F_t *f);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
static herr_t H5G_link(H5G_entry_t *cur_loc, const char *cur_name,
|
|
|
|
|
H5G_entry_t *new_loc, const char *new_name,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_link_t type, unsigned namei_flags, hid_t dxpl_id);
|
2003-08-22 21:50:01 +08:00
|
|
|
|
static herr_t H5G_get_num_objs(H5G_entry_t *grp, hsize_t *num_objs, hid_t dxpl_id);
|
|
|
|
|
static ssize_t H5G_get_objname_by_idx(H5G_entry_t *loc, hsize_t idx, char* name, size_t size, hid_t dxpl_id);
|
|
|
|
|
static H5G_obj_t H5G_get_objtype_by_idx(H5G_entry_t *loc, hsize_t idx, hid_t dxpl_id);
|
2005-08-09 05:03:17 +08:00
|
|
|
|
static herr_t H5G_linkval(H5G_entry_t *loc, const char *name, size_t size,
|
|
|
|
|
char *buf/*out*/, hid_t dxpl_id);
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t H5G_set_comment(H5G_entry_t *loc, const char *name,
|
|
|
|
|
const char *buf, hid_t dxpl_id);
|
|
|
|
|
static int H5G_get_comment(H5G_entry_t *loc, const char *name,
|
|
|
|
|
size_t bufsize, char *buf, hid_t dxpl_id);
|
2005-08-09 05:03:17 +08:00
|
|
|
|
static herr_t H5G_unlink(H5G_entry_t *loc, const char *name, hid_t dxpl_id);
|
|
|
|
|
static herr_t H5G_move(H5G_entry_t *src_loc, const char *src_name,
|
|
|
|
|
H5G_entry_t *dst_loc, const char *dst_name, hid_t dxpl_it);
|
|
|
|
|
static htri_t H5G_common_path(const H5RS_str_t *fullpath_r,
|
|
|
|
|
const H5RS_str_t *prefix_r);
|
2005-08-21 00:32:55 +08:00
|
|
|
|
static H5RS_str_t *H5G_build_fullpath(const H5RS_str_t *prefix_r, const H5RS_str_t *name_r);
|
2005-08-09 05:03:17 +08:00
|
|
|
|
static int H5G_replace_ent(void *obj_ptr, hid_t obj_id, void *key);
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
1997-10-21 07:14:35 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5Gcreate
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Purpose: Creates a new group relative to LOC_ID and gives it the
|
|
|
|
|
* specified NAME. The group is opened for write access
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* and it's object ID is returned.
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* The optional SIZE_HINT specifies how much file space to
|
|
|
|
|
* reserve to store the names that will appear in this
|
|
|
|
|
* group. If a non-positive value is supplied for the SIZE_HINT
|
|
|
|
|
* then a default size is chosen.
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* See also: H5Gset(), H5Gpush(), H5Gpop()
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
|
|
|
|
* Errors:
|
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Return: Success: The object ID of a new, empty group open for
|
|
|
|
|
* writing. Call H5Gclose() when finished with
|
|
|
|
|
* the group.
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Failure: FAIL
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Wednesday, September 24, 1997
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-01-06 11:07:15 +08:00
|
|
|
|
hid_t
|
1998-08-28 00:48:50 +08:00
|
|
|
|
H5Gcreate(hid_t loc_id, const char *name, size_t size_hint)
|
1997-10-21 07:14:35 +08:00
|
|
|
|
{
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_entry_t *loc = NULL;
|
1998-03-25 07:18:34 +08:00
|
|
|
|
H5G_t *grp = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
hid_t ret_value;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gcreate, FAIL);
|
[svn-r429] Changes since 19980616
----------------------
./html/tracing.html NEW
This entire update is to make it possible for the library to
print the name, arguments, and return value of every API call
without requiring any extra work from developers or app
programmers. This file describes how this all works.
./configure.in
Added the `--enable-tracing' switch. If you use it then the
library will include code to print API function names,
argument names and values, and function return values.
However, you must then turn on the tracing by setting the
HDF5_TRACE environment variable to a file descriptor number.
The default is `--disable-tracing' since enabling it causes a
slight increase in library size and a slowdown resulting from
an extra function call for each API function call (I couldn't
even measure the slowdown :-)
./bin/trace NEW
A perl script that synchronizes the H5TRACE() macro calls in
the *.c files with the function return type and formal
argument names and types. If you use GNU make and gcc then
this will be done automatically, otherwise just invoke this
script with the names of one or more .c files. You could do
it by hand to, but encoding argument types is a little tricky
at first.
./config/commence.in
Added the $(TRACE) macro, which defaults to the no-op.
Added -D_POSIX_SOURCE to the compiler command line.
./src/Makefile.in
Override the default for $(TRACE).
./config/depend.in
Automatically calls $(TRACE) to synchronize the H5TRACE()
macros in any source file that changed. As with makefile
dependencies, one way to force synchronization of all files is
to remove the `.depend' file.
./MANIFEST
Added new files.
./src/H5Eprivate.h
Modified HRETURN_ERROR() and HRETURN() for tracing.
./src/H5.c
./src/H5private.h
This is where the real tracing work really happens, in
H5_trace().
./src/H5A.c
./src/H5D.c
./src/H5G.c
./src/H5P.c
./src/H5S.c
./src/H5Z.c
Added H5TRACE() calls to all API functions. You don't really
need these changes if you don't want to merge your stuff
because they can be generated automatically by going to the
hdf5/src directory and saying ../bin/trace *.c
./src/H5T.c
Added H5TRACE() calls. Other stuff below.
./src/H5E.c
./src/H5Epublic.h
Added H5TRACE() calls. Created a type H5E_auto_t for the
`func' argument of H5Eset_auto() and H5Eget_auto() to make
those arguments easier to parse for tracing. It should also
make it clearer for users that don't know how to read
complicated ANSI data types.
./src/H5F.c
Added H5TRACE() calls. Changed a couple `uintn' argument
types in API functions to `unsigned int' since `uintn' part of
the API. Changed a few "can't" and "cant" error messages to
"unable to".
./src/H5Ipublic.h
Removed H5_DIRECTORY from the H5I_group_t enum. It wasn't
used anywhere.
./src/H5Tconv.c
Removed an unused label.
./src/H5Fistore.c
./src/H5Oattr.c
./src/H5Odtype.c
./src/H5T.c
./test/dsets.c
./test/dtypes.c
Fixed a warning about a variable possibly used before it's
initialized. Added __unused__ to turn off some unused
argument warnings that pop up when debugging is turned off and
optimizations are turned on.
1998-06-18 04:46:29 +08:00
|
|
|
|
H5TRACE3("i","isz",loc_id,name,size_hint);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* Check arguments */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name given");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* Create the group */
|
2005-06-21 02:11:57 +08:00
|
|
|
|
if (NULL == (grp = H5G_create(loc, name, size_hint, H5AC_dxpl_id,
|
|
|
|
|
H5P_GROUP_CREATE_DEFAULT, H5P_DEFAULT)))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group");
|
|
|
|
|
if ((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group");
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
if(ret_value<0) {
|
|
|
|
|
if(grp!=NULL)
|
|
|
|
|
H5G_close(grp);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-01-06 11:07:15 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
2005-06-21 02:11:57 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gcreate_expand
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Creates a new group relative to LOC_ID and gives it the
|
|
|
|
|
* specified NAME, and creation property list GCPL_ID and access
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* property list GAPL_ID.
|
2005-06-21 02:11:57 +08:00
|
|
|
|
*
|
|
|
|
|
* The optional SIZE_HINT specifies how much file space to
|
|
|
|
|
* reserve to store the names that will appear in this
|
|
|
|
|
* group. If a non-positive value is supplied for the SIZE_HINT
|
|
|
|
|
* then a default size is chosen.
|
|
|
|
|
*
|
|
|
|
|
* Given the default setting, H5Gcreate_expand() will have the
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* same function of H5Gcreate()
|
2005-06-21 02:11:57 +08:00
|
|
|
|
*
|
|
|
|
|
* See also: H5Gcreate(), H5Dcreate_expand()
|
|
|
|
|
*
|
|
|
|
|
* Errors:
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: The object ID of a new, empty group open for
|
|
|
|
|
* writing. Call H5Gclose() when finished with
|
|
|
|
|
* the group.
|
|
|
|
|
*
|
|
|
|
|
* Failure: FAIL
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Programmer: Peter Cao
|
|
|
|
|
* May 08, 2005
|
2005-06-21 02:11:57 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
hid_t
|
|
|
|
|
H5Gcreate_expand(hid_t loc_id, const char *name, size_t size_hint, hid_t gcpl_id, hid_t gapl_id)
|
|
|
|
|
{
|
|
|
|
|
H5G_entry_t *loc = NULL;
|
|
|
|
|
H5G_t *grp = NULL;
|
|
|
|
|
hid_t ret_value;
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_API(H5Gcreate_expand, FAIL)
|
|
|
|
|
|
|
|
|
|
/* Check arguments */
|
|
|
|
|
if (NULL==(loc=H5G_loc (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name given")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-06-21 02:11:57 +08:00
|
|
|
|
/* Check group creation property list */
|
|
|
|
|
if(H5P_DEFAULT == gcpl_id)
|
|
|
|
|
gcpl_id = H5P_GROUP_CREATE_DEFAULT;
|
|
|
|
|
else
|
|
|
|
|
if(TRUE != H5P_isa_class(gcpl_id, H5P_GROUP_CREATE))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group create property list")
|
|
|
|
|
|
|
|
|
|
#ifdef LATER
|
|
|
|
|
/* Check the group access property list */
|
|
|
|
|
if(H5P_DEFAULT == gapl_id)
|
|
|
|
|
gapl_id = H5P_GROUP_ACCESS_DEFAULT;
|
|
|
|
|
else
|
|
|
|
|
if(TRUE != H5P_isa_class(gapl_id, H5P_GROUP_ACCESS))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
|
|
|
|
|
#endif /* LATER */
|
|
|
|
|
|
|
|
|
|
if (NULL == (grp = H5G_create(loc, name, size_hint, H5AC_dxpl_id, gcpl_id, gapl_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
|
|
|
|
|
if ((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
if(ret_value<0) {
|
|
|
|
|
if(grp!=NULL)
|
|
|
|
|
H5G_close(grp);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gcreate_expand() */
|
|
|
|
|
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5Gopen
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Opens an existing group for modification. When finished,
|
|
|
|
|
* call H5Gclose() to close it and release resources.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
* Errors:
|
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Return: Success: Object ID of the group.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Failure: FAIL
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Wednesday, December 31, 1997
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
hid_t
|
1998-08-28 00:48:50 +08:00
|
|
|
|
H5Gopen(hid_t loc_id, const char *name)
|
1998-01-06 11:07:15 +08:00
|
|
|
|
{
|
2004-11-23 01:14:11 +08:00
|
|
|
|
hid_t ret_value = FAIL;
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
H5G_t *grp = NULL;
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_entry_t *loc = NULL;
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
H5G_entry_t ent;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gopen, FAIL);
|
[svn-r429] Changes since 19980616
----------------------
./html/tracing.html NEW
This entire update is to make it possible for the library to
print the name, arguments, and return value of every API call
without requiring any extra work from developers or app
programmers. This file describes how this all works.
./configure.in
Added the `--enable-tracing' switch. If you use it then the
library will include code to print API function names,
argument names and values, and function return values.
However, you must then turn on the tracing by setting the
HDF5_TRACE environment variable to a file descriptor number.
The default is `--disable-tracing' since enabling it causes a
slight increase in library size and a slowdown resulting from
an extra function call for each API function call (I couldn't
even measure the slowdown :-)
./bin/trace NEW
A perl script that synchronizes the H5TRACE() macro calls in
the *.c files with the function return type and formal
argument names and types. If you use GNU make and gcc then
this will be done automatically, otherwise just invoke this
script with the names of one or more .c files. You could do
it by hand to, but encoding argument types is a little tricky
at first.
./config/commence.in
Added the $(TRACE) macro, which defaults to the no-op.
Added -D_POSIX_SOURCE to the compiler command line.
./src/Makefile.in
Override the default for $(TRACE).
./config/depend.in
Automatically calls $(TRACE) to synchronize the H5TRACE()
macros in any source file that changed. As with makefile
dependencies, one way to force synchronization of all files is
to remove the `.depend' file.
./MANIFEST
Added new files.
./src/H5Eprivate.h
Modified HRETURN_ERROR() and HRETURN() for tracing.
./src/H5.c
./src/H5private.h
This is where the real tracing work really happens, in
H5_trace().
./src/H5A.c
./src/H5D.c
./src/H5G.c
./src/H5P.c
./src/H5S.c
./src/H5Z.c
Added H5TRACE() calls to all API functions. You don't really
need these changes if you don't want to merge your stuff
because they can be generated automatically by going to the
hdf5/src directory and saying ../bin/trace *.c
./src/H5T.c
Added H5TRACE() calls. Other stuff below.
./src/H5E.c
./src/H5Epublic.h
Added H5TRACE() calls. Created a type H5E_auto_t for the
`func' argument of H5Eset_auto() and H5Eget_auto() to make
those arguments easier to parse for tracing. It should also
make it clearer for users that don't know how to read
complicated ANSI data types.
./src/H5F.c
Added H5TRACE() calls. Changed a couple `uintn' argument
types in API functions to `unsigned int' since `uintn' part of
the API. Changed a few "can't" and "cant" error messages to
"unable to".
./src/H5Ipublic.h
Removed H5_DIRECTORY from the H5I_group_t enum. It wasn't
used anywhere.
./src/H5Tconv.c
Removed an unused label.
./src/H5Fistore.c
./src/H5Oattr.c
./src/H5Odtype.c
./src/H5T.c
./test/dsets.c
./test/dtypes.c
Fixed a warning about a variable possibly used before it's
initialized. Added __unused__ to turn off some unused
argument warnings that pop up when debugging is turned off and
optimizations are turned on.
1998-06-18 04:46:29 +08:00
|
|
|
|
H5TRACE2("i","is",loc_id,name);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc(loc_id)))
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (!name || !*name)
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name");
|
|
|
|
|
|
|
|
|
|
/* Open the parent group, making sure it's a group */
|
2004-12-29 22:26:20 +08:00
|
|
|
|
if (H5G_find(loc, name, NULL, &ent/*out*/, H5AC_dxpl_id) < 0)
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found");
|
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* Open the group */
|
2004-09-29 03:54:12 +08:00
|
|
|
|
if ((grp = H5G_open(&ent, H5AC_dxpl_id))==NULL)
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group");
|
2004-12-29 22:26:20 +08:00
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* Register an atom for the group */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if ((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group");
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
if(ret_value<0) {
|
|
|
|
|
if(grp!=NULL)
|
|
|
|
|
H5G_close(grp);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1997-10-21 07:14:35 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5Gclose
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Closes the specified group. The group ID will no longer be
|
|
|
|
|
* valid for accessing the group.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Wednesday, December 31, 1997
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-08-28 00:48:50 +08:00
|
|
|
|
H5Gclose(hid_t group_id)
|
1998-01-06 11:07:15 +08:00
|
|
|
|
{
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gclose, FAIL);
|
[svn-r529] Changes since 19980722
----------------------
./src/H5.c
Handle hid_t of type H5_TEMPBUF, arguments usually called tbuf_id.
Added array tracing where the array rank is stored in a simple
data space. Just use the name of the data space argument when
declaring the array argument:
herr_t
H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
const hssize_t start[/*space_id*/],
const hsize_t _stride[/*space_id*/],
const hsize_t count[/*space_id*/],
const hsize_t _block[/*space_id*/])
and when the program runs you'll see array values printed:
H5Sselect_hyperslab(space=218103813, op=H5S_SELECT_SET,
start=0xbfffef4c {0}, _stride=NULL,
count=0xbfffef44 {64},
_block=NULL) = SUCCEED;
Added more symbolic data types to the tracing output.
./src/H5A.c
./src/H5Apublic.h
./src/H5D.c
./src/H5Dpublic.h
./src/H5F.c
./src/H5Fpublic.h
./src/H5G.c
./src/H5Gpublic.h
./src/H5P.c
./src/H5Ppublic.h
./src/H5S.c
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Spoint.c
./src/H5Spublic.h
./src/H5Sselect.c
./src/H5Ssimp.c
./src/H5TB.c
./src/H5V.c
Changed some API argument names to be more consistent with
other API functions and to produce better tracing output.
Reformatted some long lines. Indented printf statements.
./tools/h5ls.c
Fixed warnings about unsigned vs. signed comparisons.
1998-07-23 02:45:46 +08:00
|
|
|
|
H5TRACE1("e","i",group_id);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL == H5I_object_verify(group_id,H5I_GROUP))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
|
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Decrement the counter on the group atom. It will be freed if the count
|
1998-01-17 06:23:43 +08:00
|
|
|
|
* reaches zero.
|
|
|
|
|
*/
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (H5I_dec_ref(group_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close group");
|
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-01-06 11:07:15 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1998-03-24 22:53:57 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Giterate
|
|
|
|
|
*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Purpose: Iterates over the entries of a group. The LOC_ID and NAME
|
|
|
|
|
* identify the group over which to iterate and IDX indicates
|
1998-03-24 22:53:57 +08:00
|
|
|
|
* where to start iterating (zero means at the beginning). The
|
|
|
|
|
* OPERATOR is called for each member and the iteration
|
|
|
|
|
* continues until the operator returns non-zero or all members
|
|
|
|
|
* are processed. The operator is passed a group ID for the
|
|
|
|
|
* group being iterated, a member name, and OP_DATA for each
|
|
|
|
|
* member.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: The return value of the first operator that
|
|
|
|
|
* returns non-zero, or zero if all members were
|
|
|
|
|
* processed with no operator returning non-zero.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Failure: Negative if something goes wrong within the
|
|
|
|
|
* library, or the negative value returned by one
|
1998-03-24 22:53:57 +08:00
|
|
|
|
* of the operators.
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, March 23, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
2003-12-06 22:57:06 +08:00
|
|
|
|
H5Giterate(hid_t loc_id, const char *name, int *idx_p,
|
1998-03-24 22:53:57 +08:00
|
|
|
|
H5G_iterate_t op, void *op_data)
|
|
|
|
|
{
|
2005-08-11 04:28:32 +08:00
|
|
|
|
H5O_stab_t stab_mesg; /*info about B-tree */
|
2003-12-06 22:57:06 +08:00
|
|
|
|
int idx;
|
1998-03-24 22:53:57 +08:00
|
|
|
|
H5G_bt_ud2_t udata;
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_t *grp = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Giterate, FAIL);
|
2003-12-06 22:57:06 +08:00
|
|
|
|
H5TRACE5("e","is*Isxx",loc_id,name,idx_p,op,op_data);
|
1998-03-24 22:53:57 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified");
|
2003-12-06 22:57:06 +08:00
|
|
|
|
idx = (idx_p == NULL ? 0 : *idx_p);
|
|
|
|
|
if (!idx_p)
|
|
|
|
|
idx_p = &idx;
|
|
|
|
|
if (idx<0)
|
2004-11-23 01:14:11 +08:00
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified");
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (!op)
|
2004-11-23 01:14:11 +08:00
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no operator specified");
|
1998-03-24 22:53:57 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Open the group on which to operate. We also create a group ID which
|
|
|
|
|
* we can pass to the application-defined operator.
|
|
|
|
|
*/
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
if ((udata.group_id = H5Gopen (loc_id, name)) <0)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group");
|
|
|
|
|
if ((grp=H5I_object(udata.group_id))==NULL) {
|
|
|
|
|
H5Gclose(udata.group_id);
|
|
|
|
|
HGOTO_ERROR (H5E_ATOM, H5E_BADATOM, FAIL, "bad group atom");
|
1998-03-24 22:53:57 +08:00
|
|
|
|
}
|
2004-11-23 01:14:11 +08:00
|
|
|
|
|
2005-08-11 04:28:32 +08:00
|
|
|
|
/* Get the B-tree info */
|
|
|
|
|
if (NULL==H5O_read (&(grp->ent), H5O_STAB_ID, 0, &stab_mesg, H5AC_dxpl_id))
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
|
|
|
|
|
|
1998-03-24 22:53:57 +08:00
|
|
|
|
/* Build udata to pass through H5B_iterate() to H5G_node_iterate() */
|
2003-12-06 22:57:06 +08:00
|
|
|
|
udata.skip = idx;
|
2005-08-11 04:28:32 +08:00
|
|
|
|
udata.stab = &stab_mesg;
|
1998-03-24 22:53:57 +08:00
|
|
|
|
udata.op = op;
|
|
|
|
|
udata.op_data = op_data;
|
|
|
|
|
|
2000-04-06 04:51:27 +08:00
|
|
|
|
/* Set the number of entries looked at to zero */
|
|
|
|
|
udata.final_ent = 0;
|
|
|
|
|
|
1998-03-24 22:53:57 +08:00
|
|
|
|
/* Iterate over the group members */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if ((ret_value = H5B_iterate (H5G_fileof(grp), H5AC_dxpl_id, H5B_SNODE,
|
2005-08-11 04:28:32 +08:00
|
|
|
|
H5G_node_iterate, stab_mesg.btree_addr, &udata))<0)
|
2003-06-23 21:27:02 +08:00
|
|
|
|
HERROR (H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
|
|
|
|
|
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5I_dec_ref (udata.group_id); /*also closes 'grp'*/
|
2003-06-23 21:27:02 +08:00
|
|
|
|
|
|
|
|
|
/* Check for too high of a starting index (ex post facto :-) */
|
|
|
|
|
/* (Skipping exactly as many entries as are in the group is currently an error) */
|
2003-12-06 22:57:06 +08:00
|
|
|
|
if (idx>0 && idx>=udata.final_ent)
|
2003-06-23 21:27:02 +08:00
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified");
|
2000-04-06 04:51:27 +08:00
|
|
|
|
|
|
|
|
|
/* Set the index we stopped at */
|
2003-12-06 22:57:06 +08:00
|
|
|
|
*idx_p=udata.final_ent;
|
2000-04-06 04:51:27 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-03-24 22:53:57 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gget_num_objs
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Purpose: Returns the number of objects in the group. It iterates
|
2002-11-26 01:59:14 +08:00
|
|
|
|
* all B-tree leaves and sum up total number of group members.
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Return: Success: Non-negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Failure: Negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Raymond Lu
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Nov 20, 2002
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_entry_t *loc = NULL; /* Pointer to symbol table entry */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
herr_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gget_num_objs, FAIL);
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5TRACE2("e","i*h",loc_id,num_objs);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID");
|
|
|
|
|
if(H5G_get_type(loc,H5AC_ind_dxpl_id)!=H5G_GROUP)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
|
2002-11-26 01:59:14 +08:00
|
|
|
|
if (!num_objs)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "nil pointer");
|
|
|
|
|
|
|
|
|
|
/* Call private function. */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
ret_value = H5G_get_num_objs(loc, num_objs, H5AC_ind_dxpl_id);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gget_objname_by_idx
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns the name of objects in the group by giving index.
|
|
|
|
|
* If `name' is non-NULL then write up to `size' bytes into that
|
|
|
|
|
* buffer and always return the length of the entry name.
|
|
|
|
|
* Otherwise `size' is ignored and the function does not store the name,
|
|
|
|
|
* just returning the number of characters required to store the name.
|
|
|
|
|
* If an error occurs then the buffer pointed to by `name' (NULL or non-NULL)
|
|
|
|
|
* is unchanged and the function returns a negative value.
|
|
|
|
|
* If a zero is returned for the name's length, then there is no name
|
|
|
|
|
* associated with the ID.
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Return: Success: Non-negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Failure: Negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Raymond Lu
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Nov 20, 2002
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
ssize_t
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_entry_t *loc = NULL; /* Pointer to symbol table entry */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
ssize_t ret_value = FAIL;
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gget_objname_by_idx, FAIL);
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5TRACE4("Zs","ihsz",loc_id,idx,name,size);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID");
|
|
|
|
|
if(H5G_get_type(loc,H5AC_ind_dxpl_id)!=H5G_GROUP)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
/*call private function*/
|
2003-08-22 21:50:01 +08:00
|
|
|
|
ret_value = H5G_get_objname_by_idx(loc, idx, name, size, H5AC_ind_dxpl_id);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gget_objtype_by_idx
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns the type of objects in the group by giving index.
|
|
|
|
|
*
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Return: Success: H5G_GROUP(1), H5G_DATASET(2), H5G_TYPE(3)
|
|
|
|
|
*
|
|
|
|
|
* Failure: H5G_UNKNOWN
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Raymond Lu
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Nov 20, 2002
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-04-25 04:15:42 +08:00
|
|
|
|
H5G_obj_t
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_entry_t *loc = NULL; /* Pointer to symbol table entry */
|
2003-05-10 02:18:21 +08:00
|
|
|
|
H5G_obj_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-05-10 02:18:21 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gget_objtype_by_idx, H5G_UNKNOWN);
|
2003-10-14 23:46:38 +08:00
|
|
|
|
H5TRACE2("Go","ih",loc_id,idx);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc (loc_id)))
|
2003-10-16 04:02:51 +08:00
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location ID");
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if(H5G_get_type(loc,H5AC_ind_dxpl_id)!=H5G_GROUP)
|
2003-10-16 04:02:51 +08:00
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a group");
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
/*call private function*/
|
2003-08-22 21:50:01 +08:00
|
|
|
|
ret_value = H5G_get_objtype_by_idx(loc, idx, H5AC_ind_dxpl_id);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2002-04-27 04:34:46 +08:00
|
|
|
|
* Function: H5Gmove2
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
|
|
|
|
* Purpose: Renames an object within an HDF5 file. The original name SRC
|
|
|
|
|
* is unlinked from the group graph and the new name DST is
|
|
|
|
|
* inserted as an atomic operation. Both names are interpreted
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* relative to SRC_LOC_ID and DST_LOC_ID, which are either a file
|
2002-04-27 04:34:46 +08:00
|
|
|
|
* ID or a group ID.
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 6, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-04-27 04:34:46 +08:00
|
|
|
|
* Raymond Lu
|
|
|
|
|
* Thursday, April 18, 2002
|
|
|
|
|
*
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
2005-08-14 04:53:35 +08:00
|
|
|
|
H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
|
2002-04-27 04:34:46 +08:00
|
|
|
|
const char *dst_name)
|
1998-04-07 23:34:16 +08:00
|
|
|
|
{
|
2002-04-27 04:34:46 +08:00
|
|
|
|
H5G_entry_t *src_loc=NULL;
|
|
|
|
|
H5G_entry_t *dst_loc=NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gmove2, FAIL);
|
2002-04-27 04:34:46 +08:00
|
|
|
|
H5TRACE4("e","isis",src_loc_id,src_name,dst_loc_id,dst_name);
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (src_loc_id != H5G_SAME_LOC && NULL==(src_loc=H5G_loc(src_loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (dst_loc_id != H5G_SAME_LOC && NULL==(dst_loc=H5G_loc(dst_loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (!src_name || !*src_name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified");
|
|
|
|
|
if (!dst_name || !*dst_name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified");
|
1998-09-28 22:20:21 +08:00
|
|
|
|
|
2002-04-27 04:34:46 +08:00
|
|
|
|
if(src_loc_id == H5G_SAME_LOC && dst_loc_id == H5G_SAME_LOC) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not be both H5G_SAME_LOC");
|
|
|
|
|
} else if(src_loc_id == H5G_SAME_LOC) {
|
2002-04-27 04:34:46 +08:00
|
|
|
|
src_loc = dst_loc;
|
|
|
|
|
}
|
|
|
|
|
else if(dst_loc_id == H5G_SAME_LOC) {
|
|
|
|
|
dst_loc = src_loc;
|
|
|
|
|
}
|
2002-08-09 00:52:55 +08:00
|
|
|
|
else if(src_loc->file != dst_loc->file)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_move(src_loc, src_name, dst_loc, dst_name, H5AC_dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to change object name");
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2002-04-27 04:34:46 +08:00
|
|
|
|
* Function: H5Glink2
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
|
|
|
|
* Purpose: Creates a link of the specified type from NEW_NAME to
|
|
|
|
|
* CUR_NAME.
|
|
|
|
|
*
|
|
|
|
|
* If TYPE is H5G_LINK_HARD then CUR_NAME must name an existing
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* object. CUR_NAME and NEW_NAME are interpreted relative to
|
|
|
|
|
* CUR_LOC_ID and NEW_LOC_ID, which is either a file ID or a
|
2002-04-27 04:34:46 +08:00
|
|
|
|
* group ID.
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
|
|
|
|
* If TYPE is H5G_LINK_SOFT then CUR_NAME can be anything and is
|
|
|
|
|
* interpreted at lookup time relative to the group which
|
|
|
|
|
* contains the final component of NEW_NAME. For instance, if
|
|
|
|
|
* CUR_NAME is `./foo' and NEW_NAME is `./x/y/bar' and a request
|
|
|
|
|
* is made for `./x/y/bar' then the actual object looked up is
|
|
|
|
|
* `./x/y/./foo'.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 6, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
2005-08-14 04:53:35 +08:00
|
|
|
|
H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
|
2002-04-27 04:34:46 +08:00
|
|
|
|
hid_t new_loc_id, const char *new_name)
|
1998-04-07 23:34:16 +08:00
|
|
|
|
{
|
2002-04-27 04:34:46 +08:00
|
|
|
|
H5G_entry_t *cur_loc = NULL;
|
|
|
|
|
H5G_entry_t *new_loc = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2002-04-27 04:34:46 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Glink2, FAIL);
|
2002-04-27 04:34:46 +08:00
|
|
|
|
H5TRACE5("e","isGlis",cur_loc_id,cur_name,type,new_loc_id,new_name);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
/* Check arguments */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (cur_loc_id != H5G_SAME_LOC && NULL==(cur_loc=H5G_loc(cur_loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (new_loc_id != H5G_SAME_LOC && NULL==(new_loc=H5G_loc(new_loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (type!=H5G_LINK_HARD && type!=H5G_LINK_SOFT)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "unrecognized link type");
|
|
|
|
|
if (!cur_name || !*cur_name)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified");
|
|
|
|
|
if (!new_name || !*new_name)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified");
|
2002-04-27 04:34:46 +08:00
|
|
|
|
|
|
|
|
|
if(cur_loc_id == H5G_SAME_LOC && new_loc_id == H5G_SAME_LOC) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not be both H5G_SAME_LOC");
|
2002-04-27 04:34:46 +08:00
|
|
|
|
}
|
|
|
|
|
else if(cur_loc_id == H5G_SAME_LOC) {
|
|
|
|
|
cur_loc = new_loc;
|
|
|
|
|
}
|
|
|
|
|
else if(new_loc_id == H5G_SAME_LOC) {
|
|
|
|
|
new_loc = cur_loc;
|
|
|
|
|
}
|
2002-08-09 00:52:55 +08:00
|
|
|
|
else if(cur_loc->file != new_loc->file)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.");
|
2002-04-27 04:34:46 +08:00
|
|
|
|
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_link(cur_loc, cur_name, new_loc, new_name, type, H5G_TARGET_NORMAL, H5AC_dxpl_id) <0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_LINK, FAIL, "unable to create link");
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gunlink
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Removes the specified NAME from the group graph and
|
|
|
|
|
* decrements the link count for the object to which NAME
|
|
|
|
|
* points. If the link count reaches zero then all file-space
|
|
|
|
|
* associated with the object will be reclaimed (but if the
|
|
|
|
|
* object is open, then the reclamation of the file space is
|
|
|
|
|
* delayed until all handles to the object are closed).
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 6, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-09-22 23:27:26 +08:00
|
|
|
|
H5Gunlink(hid_t loc_id, const char *name)
|
1998-04-07 23:34:16 +08:00
|
|
|
|
{
|
1998-09-22 23:27:26 +08:00
|
|
|
|
H5G_entry_t *loc = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gunlink, FAIL);
|
[svn-r429] Changes since 19980616
----------------------
./html/tracing.html NEW
This entire update is to make it possible for the library to
print the name, arguments, and return value of every API call
without requiring any extra work from developers or app
programmers. This file describes how this all works.
./configure.in
Added the `--enable-tracing' switch. If you use it then the
library will include code to print API function names,
argument names and values, and function return values.
However, you must then turn on the tracing by setting the
HDF5_TRACE environment variable to a file descriptor number.
The default is `--disable-tracing' since enabling it causes a
slight increase in library size and a slowdown resulting from
an extra function call for each API function call (I couldn't
even measure the slowdown :-)
./bin/trace NEW
A perl script that synchronizes the H5TRACE() macro calls in
the *.c files with the function return type and formal
argument names and types. If you use GNU make and gcc then
this will be done automatically, otherwise just invoke this
script with the names of one or more .c files. You could do
it by hand to, but encoding argument types is a little tricky
at first.
./config/commence.in
Added the $(TRACE) macro, which defaults to the no-op.
Added -D_POSIX_SOURCE to the compiler command line.
./src/Makefile.in
Override the default for $(TRACE).
./config/depend.in
Automatically calls $(TRACE) to synchronize the H5TRACE()
macros in any source file that changed. As with makefile
dependencies, one way to force synchronization of all files is
to remove the `.depend' file.
./MANIFEST
Added new files.
./src/H5Eprivate.h
Modified HRETURN_ERROR() and HRETURN() for tracing.
./src/H5.c
./src/H5private.h
This is where the real tracing work really happens, in
H5_trace().
./src/H5A.c
./src/H5D.c
./src/H5G.c
./src/H5P.c
./src/H5S.c
./src/H5Z.c
Added H5TRACE() calls to all API functions. You don't really
need these changes if you don't want to merge your stuff
because they can be generated automatically by going to the
hdf5/src directory and saying ../bin/trace *.c
./src/H5T.c
Added H5TRACE() calls. Other stuff below.
./src/H5E.c
./src/H5Epublic.h
Added H5TRACE() calls. Created a type H5E_auto_t for the
`func' argument of H5Eset_auto() and H5Eget_auto() to make
those arguments easier to parse for tracing. It should also
make it clearer for users that don't know how to read
complicated ANSI data types.
./src/H5F.c
Added H5TRACE() calls. Changed a couple `uintn' argument
types in API functions to `unsigned int' since `uintn' part of
the API. Changed a few "can't" and "cant" error messages to
"unable to".
./src/H5Ipublic.h
Removed H5_DIRECTORY from the H5I_group_t enum. It wasn't
used anywhere.
./src/H5Tconv.c
Removed an unused label.
./src/H5Fistore.c
./src/H5Oattr.c
./src/H5Odtype.c
./src/H5T.c
./test/dsets.c
./test/dtypes.c
Fixed a warning about a variable possibly used before it's
initialized. Added __unused__ to turn off some unused
argument warnings that pop up when debugging is turned off and
optimizations are turned on.
1998-06-18 04:46:29 +08:00
|
|
|
|
H5TRACE2("e","is",loc_id,name);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
1998-09-22 23:27:26 +08:00
|
|
|
|
/* Check arguments */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc(loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name");
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
|
|
|
|
/* Unlink */
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_unlink(loc, name, H5AC_dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to unlink object");
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
}
|
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-09-03 05:16:24 +08:00
|
|
|
|
* Function: H5Gget_objinfo
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns information about an object. If FOLLOW_LINK is
|
|
|
|
|
* non-zero then all symbolic links are followed; otherwise all
|
|
|
|
|
* links except the last component of the name are followed.
|
|
|
|
|
*
|
1998-10-27 11:56:31 +08:00
|
|
|
|
* Return: Non-negative on success, with the fields of STATBUF (if
|
|
|
|
|
* non-null) initialized. Negative on failure.
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 13, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-09-03 05:16:24 +08:00
|
|
|
|
H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
|
1998-10-01 04:17:26 +08:00
|
|
|
|
H5G_stat_t *statbuf/*out*/)
|
1998-04-15 00:44:46 +08:00
|
|
|
|
{
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_entry_t *loc = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gget_objinfo, FAIL);
|
1998-07-08 04:13:31 +08:00
|
|
|
|
H5TRACE4("e","isbx",loc_id,name,follow_link,statbuf);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/* Check arguments */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/* Get info */
|
2003-02-11 02:44:22 +08:00
|
|
|
|
if (H5G_get_objinfo (loc, name, follow_link, statbuf, H5AC_ind_dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gget_linkval
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns the value of a symbolic link whose name is NAME. At
|
|
|
|
|
* most SIZE characters (counting the null terminator) are
|
|
|
|
|
* copied to the BUF result buffer.
|
|
|
|
|
*
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
* Return: Success: Non-negative with the link value in BUF.
|
|
|
|
|
*
|
|
|
|
|
* Failure: Negative
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 13, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-08-28 00:48:50 +08:00
|
|
|
|
H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
|
1998-04-15 00:44:46 +08:00
|
|
|
|
{
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_entry_t *loc = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gget_linkval, FAIL);
|
1998-07-08 04:13:31 +08:00
|
|
|
|
H5TRACE4("e","iszx",loc_id,name,size,buf);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/* Check arguments */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/* Get the link value */
|
2003-02-11 02:44:22 +08:00
|
|
|
|
if (H5G_linkval (loc, name, size, buf, H5AC_ind_dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link value");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gset_comment
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Gives the specified object a comment. The COMMENT string
|
|
|
|
|
* should be a null terminated string. An object can have only
|
|
|
|
|
* one comment at a time. Passing NULL for the COMMENT argument
|
|
|
|
|
* will remove the comment property from the object.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, July 20, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-08-28 00:48:50 +08:00
|
|
|
|
H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
|
1998-07-21 05:01:32 +08:00
|
|
|
|
{
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_entry_t *loc = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gset_comment, FAIL);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
H5TRACE3("e","iss",loc_id,name,comment);
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc(loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified");
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_set_comment(loc, name, comment, H5AC_dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to set comment value");
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gget_comment
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Return at most BUFSIZE characters of the comment for the
|
|
|
|
|
* specified object. If BUFSIZE is large enough to hold the
|
|
|
|
|
* entire comment then the comment string will be null
|
|
|
|
|
* terminated, otherwise it will not. If the object does not
|
[svn-r537] Changes since 19980722
----------------------
./src/H5A.c
./src/H5Apublic.h
./test/tattr.c
Switched the order of the second and third argument of
H5Aget_name() to make it consistent with other functions that
take buffers and buffer sizes.
./src/H5G.c
./src/H5Gpublic.h
./src/H5Gprivate.h
The H5Gget_comment() function returns the size of the comment
including the null terminator. If the object has no comment
then zero is returned. If an error occurs then a negative
value is returned.
./MANIFEST
./tools/Makefile.in
./tools/h5tools.h [NEW]
./tools/h5dump.c [NEW]
Created a library for printing values of datasets in a way
that looks nice. It's not done yet, but I needed it for
debugging the contents of files from Jim Reus.
./tools/h5ls.c
Added the `-d' and `--dump' options which cause the contents
of a dataset to be printed. Added `-w N' and `--width=N'
options to control how wide the raw data output should be. If
you want single-column output then say `-w1'.
Printing dataset values can now handle datasets of any integer
or floating point atomic type. As a special case, integers
which are one byte wide are treated a character strings for
now.
Sample output:
$ h5ls --dump --width=60 banana.hdf
ARCHIVE 0:0:0:744 Dataset {52/Inf}
Data:
(0) "U struct complex { double R; double I; };\012V"
(43) " double;\012"
U 0:0:0:2500 Dataset {256/512}
Data: printing of compound data types is not implemented yet
V 0:0:0:3928 Dataset {256/512}
Data:
(0) 0, 0.015625, 0.03125, 0.046875, 0.0625,
(5) 0.078125, 0.09375, 0.109375, 0.125, 0.140625,
(10) 0.15625, 0.171875, 0.1875, 0.203125, 0.21875,
(15) 0.234375, 0.25, 0.265625, 0.28125, 0.296875,
...
1998-07-24 05:19:17 +08:00
|
|
|
|
* have a comment value then no bytes are copied to the BUF
|
|
|
|
|
* buffer.
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*
|
[svn-r537] Changes since 19980722
----------------------
./src/H5A.c
./src/H5Apublic.h
./test/tattr.c
Switched the order of the second and third argument of
H5Aget_name() to make it consistent with other functions that
take buffers and buffer sizes.
./src/H5G.c
./src/H5Gpublic.h
./src/H5Gprivate.h
The H5Gget_comment() function returns the size of the comment
including the null terminator. If the object has no comment
then zero is returned. If an error occurs then a negative
value is returned.
./MANIFEST
./tools/Makefile.in
./tools/h5tools.h [NEW]
./tools/h5dump.c [NEW]
Created a library for printing values of datasets in a way
that looks nice. It's not done yet, but I needed it for
debugging the contents of files from Jim Reus.
./tools/h5ls.c
Added the `-d' and `--dump' options which cause the contents
of a dataset to be printed. Added `-w N' and `--width=N'
options to control how wide the raw data output should be. If
you want single-column output then say `-w1'.
Printing dataset values can now handle datasets of any integer
or floating point atomic type. As a special case, integers
which are one byte wide are treated a character strings for
now.
Sample output:
$ h5ls --dump --width=60 banana.hdf
ARCHIVE 0:0:0:744 Dataset {52/Inf}
Data:
(0) "U struct complex { double R; double I; };\012V"
(43) " double;\012"
U 0:0:0:2500 Dataset {256/512}
Data: printing of compound data types is not implemented yet
V 0:0:0:3928 Dataset {256/512}
Data:
(0) 0, 0.015625, 0.03125, 0.046875, 0.0625,
(5) 0.078125, 0.09375, 0.109375, 0.125, 0.140625,
(10) 0.15625, 0.171875, 0.1875, 0.203125, 0.21875,
(15) 0.234375, 0.25, 0.265625, 0.28125, 0.296875,
...
1998-07-24 05:19:17 +08:00
|
|
|
|
* Return: Success: Number of characters in the comment counting
|
|
|
|
|
* the null terminator. The value returned may
|
|
|
|
|
* be larger than the BUFSIZE argument.
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Failure: Negative
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, July 20, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
[svn-r537] Changes since 19980722
----------------------
./src/H5A.c
./src/H5Apublic.h
./test/tattr.c
Switched the order of the second and third argument of
H5Aget_name() to make it consistent with other functions that
take buffers and buffer sizes.
./src/H5G.c
./src/H5Gpublic.h
./src/H5Gprivate.h
The H5Gget_comment() function returns the size of the comment
including the null terminator. If the object has no comment
then zero is returned. If an error occurs then a negative
value is returned.
./MANIFEST
./tools/Makefile.in
./tools/h5tools.h [NEW]
./tools/h5dump.c [NEW]
Created a library for printing values of datasets in a way
that looks nice. It's not done yet, but I needed it for
debugging the contents of files from Jim Reus.
./tools/h5ls.c
Added the `-d' and `--dump' options which cause the contents
of a dataset to be printed. Added `-w N' and `--width=N'
options to control how wide the raw data output should be. If
you want single-column output then say `-w1'.
Printing dataset values can now handle datasets of any integer
or floating point atomic type. As a special case, integers
which are one byte wide are treated a character strings for
now.
Sample output:
$ h5ls --dump --width=60 banana.hdf
ARCHIVE 0:0:0:744 Dataset {52/Inf}
Data:
(0) "U struct complex { double R; double I; };\012V"
(43) " double;\012"
U 0:0:0:2500 Dataset {256/512}
Data: printing of compound data types is not implemented yet
V 0:0:0:3928 Dataset {256/512}
Data:
(0) 0, 0.015625, 0.03125, 0.046875, 0.0625,
(5) 0.078125, 0.09375, 0.109375, 0.125, 0.140625,
(10) 0.15625, 0.171875, 0.1875, 0.203125, 0.21875,
(15) 0.234375, 0.25, 0.265625, 0.28125, 0.296875,
...
1998-07-24 05:19:17 +08:00
|
|
|
|
int
|
1998-08-28 00:48:50 +08:00
|
|
|
|
H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
|
1998-07-21 05:01:32 +08:00
|
|
|
|
{
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_entry_t *loc = NULL;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
int ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gget_comment, FAIL);
|
[svn-r537] Changes since 19980722
----------------------
./src/H5A.c
./src/H5Apublic.h
./test/tattr.c
Switched the order of the second and third argument of
H5Aget_name() to make it consistent with other functions that
take buffers and buffer sizes.
./src/H5G.c
./src/H5Gpublic.h
./src/H5Gprivate.h
The H5Gget_comment() function returns the size of the comment
including the null terminator. If the object has no comment
then zero is returned. If an error occurs then a negative
value is returned.
./MANIFEST
./tools/Makefile.in
./tools/h5tools.h [NEW]
./tools/h5dump.c [NEW]
Created a library for printing values of datasets in a way
that looks nice. It's not done yet, but I needed it for
debugging the contents of files from Jim Reus.
./tools/h5ls.c
Added the `-d' and `--dump' options which cause the contents
of a dataset to be printed. Added `-w N' and `--width=N'
options to control how wide the raw data output should be. If
you want single-column output then say `-w1'.
Printing dataset values can now handle datasets of any integer
or floating point atomic type. As a special case, integers
which are one byte wide are treated a character strings for
now.
Sample output:
$ h5ls --dump --width=60 banana.hdf
ARCHIVE 0:0:0:744 Dataset {52/Inf}
Data:
(0) "U struct complex { double R; double I; };\012V"
(43) " double;\012"
U 0:0:0:2500 Dataset {256/512}
Data: printing of compound data types is not implemented yet
V 0:0:0:3928 Dataset {256/512}
Data:
(0) 0, 0.015625, 0.03125, 0.046875, 0.0625,
(5) 0.078125, 0.09375, 0.109375, 0.125, 0.140625,
(10) 0.15625, 0.171875, 0.1875, 0.203125, 0.21875,
(15) 0.234375, 0.25, 0.265625, 0.28125, 0.296875,
...
1998-07-24 05:19:17 +08:00
|
|
|
|
H5TRACE4("Is","iszs",loc_id,name,bufsize,buf);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(loc=H5G_loc(loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location");
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified");
|
|
|
|
|
if (bufsize>0 && !buf)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no buffer specified");
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2003-02-11 02:44:22 +08:00
|
|
|
|
if ((ret_value=H5G_get_comment(loc, name, bufsize, buf, H5AC_ind_dxpl_id))<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get comment value");
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
}
|
|
|
|
|
|
1997-10-21 07:14:35 +08:00
|
|
|
|
/*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
* N O A P I F U N C T I O N S B E Y O N D T H I S P O I N T
|
|
|
|
|
*-------------------------------------------------------------------------
|
2005-08-14 04:53:35 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*/
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_init_interface
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Initializes the H5G interface.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, January 5, 1998
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static herr_t
|
1998-01-17 06:23:43 +08:00
|
|
|
|
H5G_init_interface(void)
|
1998-01-06 11:07:15 +08:00
|
|
|
|
{
|
2005-06-21 02:11:57 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
|
|
|
|
H5P_genclass_t *crt_pclass;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2003-12-07 04:38:31 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_init_interface);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* Initialize the atom group for the group IDs */
|
2005-05-08 03:37:48 +08:00
|
|
|
|
if (H5I_register_type(H5I_GROUP, (size_t)H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS,
|
2002-08-09 00:52:55 +08:00
|
|
|
|
(H5I_free_t)H5G_close) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to initialize interface");
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Initialize the type info table. Begin with the most general types and
|
|
|
|
|
* end with the most specific. For instance, any object that has a data
|
2003-08-09 03:12:58 +08:00
|
|
|
|
* type message is a datatype but only some of them are datasets.
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
*/
|
2003-08-09 03:12:58 +08:00
|
|
|
|
H5G_register_type(H5G_TYPE, H5T_isa, "datatype");
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
H5G_register_type(H5G_GROUP, H5G_isa, "group");
|
|
|
|
|
H5G_register_type(H5G_DATASET, H5D_isa, "dataset");
|
2004-06-23 22:03:22 +08:00
|
|
|
|
H5G_register_type(H5G_LINK, H5G_link_isa, "link");
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
|
2005-06-21 02:11:57 +08:00
|
|
|
|
/* ========== group Creation Property Class Initialization ============*/
|
|
|
|
|
assert(H5P_CLS_GROUP_CREATE_g!=-1);
|
|
|
|
|
|
|
|
|
|
/* Get the pointer to group creation class */
|
|
|
|
|
if(NULL == (crt_pclass = H5I_object(H5P_CLS_GROUP_CREATE_g)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class")
|
|
|
|
|
|
|
|
|
|
/* Put group creation property insertion code here when it's needed. */
|
|
|
|
|
/* (See example in H5D_init_interface() ) */
|
|
|
|
|
|
|
|
|
|
/* Only register the default property list if it hasn't been created yet */
|
|
|
|
|
if(H5P_LST_GROUP_CREATE_g==(-1)) {
|
|
|
|
|
/* Register the default group creation property list */
|
|
|
|
|
if((H5P_LST_GROUP_CREATE_g = H5P_create_id(crt_pclass))<0)
|
|
|
|
|
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't insert property into class")
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-01-06 11:07:15 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_term_interface
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Terminates the H5G interface
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1999-03-30 19:38:34 +08:00
|
|
|
|
* Return: Success: Positive if anything is done that might
|
|
|
|
|
* affect other interfaces; zero otherwise.
|
|
|
|
|
*
|
|
|
|
|
* Failure: Negative.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, January 5, 1998
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
2002-03-29 03:27:38 +08:00
|
|
|
|
* Robb Matzke, 2002-03-28
|
|
|
|
|
* Free the global component buffer.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2001-08-15 06:09:56 +08:00
|
|
|
|
int
|
1999-03-30 19:38:34 +08:00
|
|
|
|
H5G_term_interface(void)
|
1998-01-06 11:07:15 +08:00
|
|
|
|
{
|
1998-11-16 23:29:54 +08:00
|
|
|
|
size_t i;
|
2001-08-15 06:09:56 +08:00
|
|
|
|
int n=0;
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2003-12-07 04:38:31 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_term_interface);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2004-06-23 23:36:35 +08:00
|
|
|
|
if (H5_interface_initialize_g) {
|
1999-03-30 19:38:34 +08:00
|
|
|
|
if ((n=H5I_nmembers(H5I_GROUP))) {
|
2004-06-19 00:56:04 +08:00
|
|
|
|
H5I_clear_type(H5I_GROUP, FALSE);
|
1999-03-30 19:38:34 +08:00
|
|
|
|
} else {
|
|
|
|
|
/* Empty the object type table */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
for (i=0; i<H5G_ntypes_g; i++)
|
1999-03-30 19:38:34 +08:00
|
|
|
|
H5MM_xfree(H5G_type_g[i].desc);
|
|
|
|
|
H5G_ntypes_g = H5G_atypes_g = 0;
|
|
|
|
|
H5G_type_g = H5MM_xfree(H5G_type_g);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
1999-03-30 19:38:34 +08:00
|
|
|
|
/* Destroy the group object id group */
|
2004-06-19 00:56:04 +08:00
|
|
|
|
H5I_dec_type_ref(H5I_GROUP);
|
1998-11-21 11:36:51 +08:00
|
|
|
|
|
2002-03-29 03:27:38 +08:00
|
|
|
|
/* Free the global component buffer */
|
|
|
|
|
H5G_comp_g = H5MM_xfree(H5G_comp_g);
|
|
|
|
|
H5G_comp_alloc_g = 0;
|
|
|
|
|
|
1999-03-30 19:38:34 +08:00
|
|
|
|
/* Mark closed */
|
2004-06-23 23:36:35 +08:00
|
|
|
|
H5_interface_initialize_g = 0;
|
1999-03-30 19:38:34 +08:00
|
|
|
|
n = 1; /*H5I*/
|
1998-11-21 11:36:51 +08:00
|
|
|
|
}
|
1998-11-16 23:29:54 +08:00
|
|
|
|
}
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(n);
|
1998-01-06 11:07:15 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_register_type
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Register a new object type so H5G_get_type() can detect it.
|
|
|
|
|
* One should always register a general type before a more
|
2003-08-09 03:12:58 +08:00
|
|
|
|
* specific type. For instance, any object that has a datatype
|
|
|
|
|
* message is a datatype, but only some of those objects are
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
* datasets.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: Non-negative
|
|
|
|
|
*
|
|
|
|
|
* Failure: Negative
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Wednesday, November 4, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-05-16 03:22:33 +08:00
|
|
|
|
static herr_t
|
2003-07-10 03:16:17 +08:00
|
|
|
|
H5G_register_type(H5G_obj_t type, htri_t(*isa)(H5G_entry_t*, hid_t), const char *_desc)
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
{
|
|
|
|
|
char *desc = NULL;
|
|
|
|
|
size_t i;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_register_type);
|
2002-05-29 23:07:55 +08:00
|
|
|
|
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
assert(type>=0);
|
|
|
|
|
assert(isa);
|
|
|
|
|
assert(_desc);
|
|
|
|
|
|
|
|
|
|
/* Copy the description */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(desc=H5MM_strdup(_desc)))
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for object type description");
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If the type is already registered then just update its entry without
|
|
|
|
|
* moving it to the end
|
|
|
|
|
*/
|
|
|
|
|
for (i=0; i<H5G_ntypes_g; i++) {
|
|
|
|
|
if (H5G_type_g[i].type==type) {
|
|
|
|
|
H5G_type_g[i].isa = isa;
|
|
|
|
|
H5MM_xfree(H5G_type_g[i].desc);
|
|
|
|
|
H5G_type_g[i].desc = desc;
|
2001-12-13 02:40:09 +08:00
|
|
|
|
HGOTO_DONE(SUCCEED);
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Increase table size */
|
|
|
|
|
if (H5G_ntypes_g>=H5G_atypes_g) {
|
|
|
|
|
size_t n = MAX(32, 2*H5G_atypes_g);
|
|
|
|
|
H5G_typeinfo_t *x = H5MM_realloc(H5G_type_g,
|
|
|
|
|
n*sizeof(H5G_typeinfo_t));
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (!x)
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for objec type table");
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
H5G_atypes_g = n;
|
|
|
|
|
H5G_type_g = x;
|
|
|
|
|
}
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
/* Add a new entry */
|
|
|
|
|
H5G_type_g[H5G_ntypes_g].type = type;
|
|
|
|
|
H5G_type_g[H5G_ntypes_g].isa = isa;
|
|
|
|
|
H5G_type_g[H5G_ntypes_g].desc = desc; /*already copied*/
|
|
|
|
|
H5G_ntypes_g++;
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
|
|
|
|
if (ret_value<0)
|
|
|
|
|
H5MM_xfree(desc);
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
}
|
|
|
|
|
|
1997-08-13 06:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_component
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Returns the pointer to the first component of the
|
|
|
|
|
* specified name by skipping leading slashes. Returns
|
|
|
|
|
* the size in characters of the component through SIZE_P not
|
|
|
|
|
* counting leading slashes or the null terminator.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1997-09-02 23:38:26 +08:00
|
|
|
|
* Errors:
|
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Return: Success: Ptr into NAME.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Failure: Ptr to the null terminator of NAME.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* matzke@llnl.gov
|
|
|
|
|
* Aug 11 1997
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-03-25 07:18:34 +08:00
|
|
|
|
static const char *
|
1998-01-17 06:23:43 +08:00
|
|
|
|
H5G_component(const char *name, size_t *size_p)
|
1997-08-13 06:44:46 +08:00
|
|
|
|
{
|
2003-12-07 04:38:31 +08:00
|
|
|
|
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_component);
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
assert(name);
|
1997-08-13 06:44:46 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
while ('/' == *name)
|
|
|
|
|
name++;
|
|
|
|
|
if (size_p)
|
|
|
|
|
*size_p = HDstrcspn(name, "/");
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(name);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_basename
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns a pointer to the last component of the specified
|
|
|
|
|
* name. The length of the component is returned through SIZE_P.
|
|
|
|
|
* The base name is followed by zero or more slashes and a null
|
|
|
|
|
* terminator, but SIZE_P does not count the slashes or the null
|
|
|
|
|
* terminator.
|
|
|
|
|
*
|
|
|
|
|
* Note: The base name of the root directory is a single slash.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: Ptr to base name.
|
|
|
|
|
*
|
|
|
|
|
* Failure: Ptr to the null terminator.
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Thursday, September 17, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static const char *
|
|
|
|
|
H5G_basename(const char *name, size_t *size_p)
|
|
|
|
|
{
|
1999-02-25 23:40:27 +08:00
|
|
|
|
size_t i;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-12-07 04:38:31 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_basename);
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
|
|
|
|
/* Find the end of the base name */
|
2001-06-20 05:49:01 +08:00
|
|
|
|
i = HDstrlen(name);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
while (i>0 && '/'==name[i-1])
|
|
|
|
|
--i;
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
|
|
|
|
/* Skip backward over base name */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
while (i>0 && '/'!=name[i-1])
|
|
|
|
|
--i;
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
|
|
|
|
/* Watch out for root special case */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if ('/'==name[i] && size_p)
|
|
|
|
|
*size_p = 1;
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(name+i);
|
1998-09-22 23:27:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2003-08-17 02:54:40 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_normalize
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns a pointer to a new string which has duplicate and
|
|
|
|
|
* trailing slashes removed from it.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: Ptr to normalized name.
|
|
|
|
|
* Failure: NULL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Saturday, August 16, 2003
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static char *
|
|
|
|
|
H5G_normalize(const char *name)
|
|
|
|
|
{
|
|
|
|
|
char *norm; /* Pointer to the normalized string */
|
|
|
|
|
size_t s,d; /* Positions within the strings */
|
|
|
|
|
unsigned last_slash; /* Flag to indicate last character was a slash */
|
|
|
|
|
char *ret_value; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-12-07 04:38:31 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_normalize);
|
2003-08-17 02:54:40 +08:00
|
|
|
|
|
|
|
|
|
/* Sanity check */
|
|
|
|
|
assert(name);
|
|
|
|
|
|
|
|
|
|
/* Duplicate the name, to return */
|
|
|
|
|
if (NULL==(norm=H5MM_strdup(name)))
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for normalized string");
|
|
|
|
|
|
|
|
|
|
/* Walk through the characters, omitting duplicated '/'s */
|
|
|
|
|
s=d=0;
|
|
|
|
|
last_slash=0;
|
|
|
|
|
while(name[s]!='\0') {
|
|
|
|
|
if(name[s]=='/')
|
|
|
|
|
if(last_slash)
|
|
|
|
|
;
|
|
|
|
|
else {
|
|
|
|
|
norm[d++]=name[s];
|
|
|
|
|
last_slash=1;
|
|
|
|
|
} /* end else */
|
|
|
|
|
else {
|
|
|
|
|
norm[d++]=name[s];
|
|
|
|
|
last_slash=0;
|
|
|
|
|
} /* end else */
|
|
|
|
|
s++;
|
|
|
|
|
} /* end while */
|
|
|
|
|
|
|
|
|
|
/* Terminate normalized string */
|
|
|
|
|
norm[d]='\0';
|
|
|
|
|
|
|
|
|
|
/* Check for final '/' on normalized name & eliminate it */
|
|
|
|
|
if(d>1 && last_slash)
|
|
|
|
|
norm[d-1]='\0';
|
|
|
|
|
|
|
|
|
|
/* Set return value */
|
|
|
|
|
ret_value=norm;
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
|
|
|
|
} /* end H5G_normalize() */
|
|
|
|
|
|
1997-08-13 06:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_namei
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Translates a name to a symbol table entry.
|
|
|
|
|
*
|
|
|
|
|
* If the specified name can be fully resolved, then this
|
|
|
|
|
* function returns the symbol table entry for the named object
|
|
|
|
|
* through the OBJ_ENT argument. The symbol table entry for the
|
|
|
|
|
* group containing the named object is returned through the
|
|
|
|
|
* GRP_ENT argument if it is non-null. However, if the name
|
|
|
|
|
* refers to the root object then the GRP_ENT will be
|
|
|
|
|
* initialized with an undefined object header address. The
|
|
|
|
|
* REST argument, if present, will point to the null terminator
|
|
|
|
|
* of NAME.
|
|
|
|
|
*
|
|
|
|
|
* If the specified name cannot be fully resolved, then OBJ_ENT
|
|
|
|
|
* is initialized with the undefined object header address. The
|
|
|
|
|
* REST argument will point into the NAME argument to the start
|
|
|
|
|
* of the component that could not be located. The GRP_ENT will
|
|
|
|
|
* contain the entry for the symbol table that was being
|
|
|
|
|
* searched at the time of the failure and will have an
|
|
|
|
|
* undefined object header address if the search failed at the
|
|
|
|
|
* root object. For instance, if NAME is `/foo/bar/baz' and the
|
|
|
|
|
* root directory exists and contains an entry for `foo', and
|
1998-09-22 23:27:26 +08:00
|
|
|
|
* foo is a group that contains an entry for bar, but bar is not
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* a group, then the results will be that REST points to `baz',
|
1998-09-22 23:27:26 +08:00
|
|
|
|
* OBJ_ENT has an undefined object header address, and GRP_ENT
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* is the symbol table entry for `bar' in `/foo'.
|
|
|
|
|
*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Every file has a root group whose name is `/'. Components of
|
|
|
|
|
* a name are separated from one another by one or more slashes
|
|
|
|
|
* (/). Slashes at the end of a name are ignored. If the name
|
|
|
|
|
* begins with a slash then the search begins at the root group
|
|
|
|
|
* of the file containing LOC_ENT. Otherwise it begins at
|
|
|
|
|
* LOC_ENT. The component `.' is a no-op, but `..' is not
|
|
|
|
|
* understood by this function (unless it appears as an entry in
|
|
|
|
|
* the symbol table).
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
1998-10-15 03:35:08 +08:00
|
|
|
|
* Symbolic links are followed automatically, but if TARGET
|
|
|
|
|
* includes the H5G_TARGET_SLINK bit and the last component of
|
|
|
|
|
* the name is a symbolic link then that link is not followed.
|
|
|
|
|
* The *NLINKS value is decremented each time a link is followed
|
|
|
|
|
* and link traversal fails if the value would become negative.
|
|
|
|
|
* If NLINKS is the null pointer then a default value is used.
|
1998-10-09 01:13:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Mounted files are handled by calling H5F_mountpoint() after
|
|
|
|
|
* each step of the translation. If the input argument to that
|
|
|
|
|
* function is a mount point then the argument shall be replaced
|
|
|
|
|
* with information about the root group of the mounted file.
|
1998-10-15 03:35:08 +08:00
|
|
|
|
* But if TARGET includes the H5G_TARGET_MOUNT bit and the last
|
|
|
|
|
* component of the name is a mount point then H5F_mountpoint()
|
|
|
|
|
* is not called and information about the mount point itself is
|
|
|
|
|
* returned.
|
2005-08-14 04:53:35 +08:00
|
|
|
|
*
|
1997-09-02 23:38:26 +08:00
|
|
|
|
* Errors:
|
|
|
|
|
*
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
* Return: Success: Non-negative if name can be fully resolved.
|
|
|
|
|
* See above for values of REST, GRP_ENT, and
|
1998-04-15 00:44:46 +08:00
|
|
|
|
* OBJ_ENT. NLINKS has been decremented for
|
|
|
|
|
* each symbolic link that was followed.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
* Failure: Negative if the name could not be fully
|
|
|
|
|
* resolved. See above for values of REST,
|
|
|
|
|
* GRP_ENT, and OBJ_ENT.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* matzke@llnl.gov
|
|
|
|
|
* Aug 11 1997
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Robb Matzke, 2002-03-28
|
|
|
|
|
* The component name buffer on the stack has been replaced by
|
|
|
|
|
* a dynamically allocated buffer on the heap in order to
|
|
|
|
|
* remove limitations on the length of a name component.
|
|
|
|
|
* There are two reasons that the buffer pointer is global:
|
|
|
|
|
* (1) We want to be able to reuse the buffer without
|
|
|
|
|
* allocating and freeing it each time this function is
|
|
|
|
|
* called.
|
|
|
|
|
* (2) We need to be able to free it from H5G_term_interface()
|
|
|
|
|
* when the library terminates.
|
|
|
|
|
*
|
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 22 Aug 2002
|
|
|
|
|
* Modified to deep copies of symbol table entries
|
|
|
|
|
* Added `id to name' support.
|
|
|
|
|
*
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
* Quincey Koziol, 2003-01-06
|
|
|
|
|
* Added "action" and "ent" parameters to allow different actions when
|
|
|
|
|
* working on the last component of a name. (Specifically, this allows
|
|
|
|
|
* inserting an entry into a group, instead of trying to look it up)
|
|
|
|
|
*
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-01-06 11:07:15 +08:00
|
|
|
|
static herr_t
|
2005-06-02 10:52:49 +08:00
|
|
|
|
H5G_namei(const H5G_entry_t *loc_ent, const char *name, const char **rest/*out*/,
|
1998-04-15 00:44:46 +08:00
|
|
|
|
H5G_entry_t *grp_ent/*out*/, H5G_entry_t *obj_ent/*out*/,
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
unsigned target, int *nlinks/*out*/, H5G_namei_act_t action,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_entry_t *ent, hid_t dxpl_id)
|
1997-08-13 06:44:46 +08:00
|
|
|
|
{
|
2002-09-25 22:50:49 +08:00
|
|
|
|
H5G_entry_t _grp_ent; /*entry for current group */
|
|
|
|
|
H5G_entry_t _obj_ent; /*entry found */
|
|
|
|
|
size_t nchars; /*component name length */
|
|
|
|
|
int _nlinks = H5G_NLINKS;
|
2002-09-18 23:51:29 +08:00
|
|
|
|
const char *s = NULL;
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
unsigned null_obj; /* Flag to indicate this function was called with obj_ent set to NULL */
|
|
|
|
|
unsigned null_grp; /* Flag to indicate this function was called with grp_ent set to NULL */
|
|
|
|
|
unsigned group_copy = 0; /* Flag to indicate that the group entry is copied */
|
|
|
|
|
unsigned last_comp = 0; /* Flag to indicate that a component is the last component in the name */
|
2004-07-20 08:47:37 +08:00
|
|
|
|
unsigned did_insert = 0; /* Flag to indicate that H5G_stab_insert was called */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-12-07 04:38:31 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_namei);
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Set up "out" parameters */
|
|
|
|
|
if (rest)
|
|
|
|
|
*rest = name;
|
|
|
|
|
if (!grp_ent) {
|
|
|
|
|
grp_ent = &_grp_ent;
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
null_grp = 1;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
} /* end if */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
else
|
|
|
|
|
null_grp = 0;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
if (!obj_ent) {
|
|
|
|
|
obj_ent = &_obj_ent;
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
null_obj = 1;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
} /* end if */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
else
|
|
|
|
|
null_obj = 0;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
if (!nlinks)
|
|
|
|
|
nlinks = &_nlinks;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Check args */
|
|
|
|
|
if (!name || !*name)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "no name given");
|
|
|
|
|
if (!loc_ent)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "no current working group");
|
|
|
|
|
|
1998-03-25 07:18:34 +08:00
|
|
|
|
/*
|
|
|
|
|
* Where does the searching start? For absolute names it starts at the
|
|
|
|
|
* root of the file; for relative names it starts at CWG.
|
|
|
|
|
*/
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Check if we need to get the root group's entry */
|
|
|
|
|
if ('/' == *name) {
|
|
|
|
|
H5G_t *tmp_grp; /* Temporary pointer to root group of file */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
tmp_grp=H5G_rootof(loc_ent->file);
|
|
|
|
|
assert(tmp_grp);
|
|
|
|
|
|
|
|
|
|
/* Set the location entry to the root group's entry*/
|
|
|
|
|
loc_ent=&(tmp_grp->ent);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
/* Deep copy of the symbol table entry */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
if (H5G_ent_copy(obj_ent, loc_ent,H5G_COPY_DEEP)<0)
|
2002-09-25 22:50:49 +08:00
|
|
|
|
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to copy entry");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
1998-09-09 03:15:44 +08:00
|
|
|
|
HDmemset(grp_ent, 0, sizeof(H5G_entry_t));
|
1999-08-11 04:21:32 +08:00
|
|
|
|
grp_ent->header = HADDR_UNDEF;
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* traverse the name */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
while ((name = H5G_component(name, &nchars)) && *name) {
|
|
|
|
|
/* Update the "rest of name" pointer */
|
|
|
|
|
if (rest)
|
|
|
|
|
*rest = name;
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Copy the component name into a null-terminated buffer so
|
|
|
|
|
* we can pass it down to the other symbol table functions.
|
|
|
|
|
*/
|
2002-03-29 03:27:38 +08:00
|
|
|
|
if (nchars+1 > H5G_comp_alloc_g) {
|
|
|
|
|
H5G_comp_alloc_g = MAX3(1024, 2*H5G_comp_alloc_g, nchars+1);
|
|
|
|
|
H5G_comp_g = H5MM_realloc(H5G_comp_g, H5G_comp_alloc_g);
|
|
|
|
|
if (!H5G_comp_g) {
|
|
|
|
|
H5G_comp_alloc_g = 0;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "unable to allocate component buffer");
|
2002-03-29 03:27:38 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
HDmemcpy(H5G_comp_g, name, nchars);
|
|
|
|
|
H5G_comp_g[nchars] = '\0';
|
1998-01-28 13:47:19 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* The special name `.' is a no-op.
|
|
|
|
|
*/
|
2002-03-29 03:27:38 +08:00
|
|
|
|
if ('.' == H5G_comp_g[0] && !H5G_comp_g[1]) {
|
1998-03-25 07:18:34 +08:00
|
|
|
|
name += nchars;
|
1998-01-28 13:47:19 +08:00
|
|
|
|
continue;
|
1998-03-25 07:18:34 +08:00
|
|
|
|
}
|
1998-01-28 13:47:19 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Advance to the next component of the name.
|
|
|
|
|
*/
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* If we've already copied a new entry into the group entry,
|
|
|
|
|
* it needs to be freed before overwriting it with another entry
|
|
|
|
|
*/
|
|
|
|
|
if(group_copy)
|
|
|
|
|
H5G_free_ent_name(grp_ent);
|
|
|
|
|
|
|
|
|
|
/* Transfer "ownership" of the entry's information to the group entry */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_ent_copy(grp_ent,obj_ent,H5G_COPY_SHALLOW);
|
1998-01-28 13:47:19 +08:00
|
|
|
|
HDmemset(obj_ent, 0, sizeof(H5G_entry_t));
|
1999-08-11 04:21:32 +08:00
|
|
|
|
obj_ent->header = HADDR_UNDEF;
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
|
|
|
|
/* Set flag that we've copied a new entry into the group entry */
|
|
|
|
|
group_copy =1;
|
1998-01-28 13:47:19 +08:00
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* Check if this is the last component of the name */
|
|
|
|
|
if(!((s=H5G_component(name+nchars, NULL)) && *s))
|
|
|
|
|
last_comp=1;
|
|
|
|
|
|
|
|
|
|
switch(action) {
|
|
|
|
|
case H5G_NAMEI_TRAVERSE:
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_stab_find(grp_ent, H5G_comp_g, obj_ent/*out*/, dxpl_id )<0) {
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/*
|
|
|
|
|
* Component was not found in the current symbol table, possibly
|
|
|
|
|
* because GRP_ENT isn't a symbol table.
|
|
|
|
|
*/
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "component not found");
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5G_NAMEI_INSERT:
|
|
|
|
|
if(!last_comp) {
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_stab_find(grp_ent, H5G_comp_g, obj_ent/*out*/, dxpl_id )<0) {
|
2005-06-21 02:11:57 +08:00
|
|
|
|
/* If an intermediate group doesn't exist & flag is set, create the group */
|
|
|
|
|
if (target & H5G_CRT_INTMD_GROUP) {
|
|
|
|
|
H5G_entry_t new_ent;
|
|
|
|
|
|
|
|
|
|
/* Reset group entry */
|
|
|
|
|
HDmemset(&new_ent, 0, sizeof(H5G_entry_t));
|
|
|
|
|
|
|
|
|
|
/* Create the group entry */
|
|
|
|
|
if (H5G_stab_create(grp_ent->file, dxpl_id, 0, &new_ent/*out*/) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create grp");
|
|
|
|
|
|
|
|
|
|
/* Insert new group into current group's symbol table */
|
|
|
|
|
if (H5G_stab_insert(grp_ent, H5G_comp_g, &new_ent, dxpl_id))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert intermediate group");
|
|
|
|
|
|
|
|
|
|
/* Close new group entry */
|
|
|
|
|
if (H5O_close(&new_ent) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close");
|
|
|
|
|
|
|
|
|
|
/* Copy newly created group's entry, so we can traverse into it */
|
|
|
|
|
if (H5G_ent_copy(obj_ent, &new_ent, H5G_COPY_NULL)<0)
|
|
|
|
|
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to copy entry");
|
|
|
|
|
|
|
|
|
|
/* Insert the name into the new symbol entry */
|
|
|
|
|
if (H5G_stab_insert_name(grp_ent, obj_ent, H5G_comp_g ) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot insert name");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "component not found");
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
}
|
|
|
|
|
} /* end if */
|
|
|
|
|
else {
|
2004-07-20 08:47:37 +08:00
|
|
|
|
did_insert = 1;
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_stab_insert(grp_ent, H5G_comp_g, ent, dxpl_id) < 0)
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert name");
|
|
|
|
|
HGOTO_DONE(SUCCEED);
|
|
|
|
|
} /* end else */
|
|
|
|
|
break;
|
|
|
|
|
} /* end switch */
|
2002-08-31 05:59:22 +08:00
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
/*
|
|
|
|
|
* If we found a symbolic link then we should follow it. But if this
|
1998-10-15 03:35:08 +08:00
|
|
|
|
* is the last component of the name and the H5G_TARGET_SLINK bit of
|
|
|
|
|
* TARGET is set then we don't follow it.
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*/
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if(H5G_CACHED_SLINK==obj_ent->type &&
|
|
|
|
|
(0==(target & H5G_TARGET_SLINK) || !last_comp)) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if ((*nlinks)-- <= 0)
|
2005-06-02 10:52:49 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_SLINK, FAIL, "too many links");
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_traverse_slink (grp_ent, obj_ent, nlinks, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "symbolic link traversal failed");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
}
|
|
|
|
|
|
1998-10-15 03:35:08 +08:00
|
|
|
|
/*
|
|
|
|
|
* Resolve mount points to the mounted group. Do not do this step if
|
|
|
|
|
* the H5G_TARGET_MOUNT bit of TARGET is set and this is the last
|
|
|
|
|
* component of the name.
|
|
|
|
|
*/
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if (0==(target & H5G_TARGET_MOUNT) || !last_comp)
|
1998-10-15 03:35:08 +08:00
|
|
|
|
H5F_mountpoint(obj_ent/*in,out*/);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
1998-01-28 13:47:19 +08:00
|
|
|
|
/* next component */
|
|
|
|
|
name += nchars;
|
2002-09-25 22:50:49 +08:00
|
|
|
|
} /* end while */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Update the "rest of name" pointer */
|
|
|
|
|
if (rest)
|
|
|
|
|
*rest = name; /*final null */
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2004-07-20 08:47:37 +08:00
|
|
|
|
/* If this was an insert, make sure that the insert function was actually
|
|
|
|
|
* called (this catches no-op names like "." and "/") */
|
2004-11-23 01:14:11 +08:00
|
|
|
|
if(action == H5G_NAMEI_INSERT && !did_insert)
|
2004-07-20 08:47:37 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "group already exists");
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* If we started with a NULL obj_ent, free the entry information */
|
|
|
|
|
if(null_obj)
|
|
|
|
|
H5G_free_ent_name(obj_ent);
|
|
|
|
|
/* If we started with a NULL grp_ent and we copied something into it, free the entry information */
|
|
|
|
|
if(null_grp && group_copy)
|
|
|
|
|
H5G_free_ent_name(grp_ent);
|
2004-07-09 10:06:29 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1997-08-13 06:44:46 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_traverse_slink
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Traverses symbolic link. The link head appears in the group
|
|
|
|
|
* whose entry is GRP_ENT and the link head entry is OBJ_ENT.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Success: Non-negative, OBJ_ENT will contain information
|
1998-04-15 00:44:46 +08:00
|
|
|
|
* about the object to which the link points and
|
|
|
|
|
* GRP_ENT will contain the information about
|
|
|
|
|
* the group in which the link tail appears.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Failure: Negative
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Friday, April 10, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
*
|
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 22 Aug 2002
|
|
|
|
|
* Added `id to name' support.
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
2005-06-24 14:30:29 +08:00
|
|
|
|
* John Mainzer - 6/8/05
|
|
|
|
|
* Modified function to use the new dirtied parmeter of
|
|
|
|
|
* H5AC_unprotect(), which allows management of the is_dirty
|
|
|
|
|
* field of the cache info to be moved into the cache code.
|
|
|
|
|
*
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2002-10-15 04:08:23 +08:00
|
|
|
|
static herr_t
|
1998-04-15 00:44:46 +08:00
|
|
|
|
H5G_traverse_slink (H5G_entry_t *grp_ent/*in,out*/,
|
|
|
|
|
H5G_entry_t *obj_ent/*in,out*/,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
int *nlinks/*in,out*/, hid_t dxpl_id)
|
1998-04-15 00:44:46 +08:00
|
|
|
|
{
|
|
|
|
|
H5O_stab_t stab_mesg; /*info about local heap */
|
|
|
|
|
const char *clv = NULL; /*cached link value */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
char *linkval = NULL; /*the copied link value */
|
|
|
|
|
H5G_entry_t tmp_grp_ent; /* Temporary copy of group entry */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5RS_str_t *tmp_user_path_r=NULL, *tmp_canon_path_r=NULL; /* Temporary pointer to object's user path & canonical path */
|
2003-09-20 04:13:47 +08:00
|
|
|
|
const H5HL_t *heap;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-06-02 10:52:49 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_slink);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Portably initialize the temporary group entry */
|
|
|
|
|
HDmemset(&tmp_grp_ent,0,sizeof(H5G_entry_t));
|
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
/* Get the link value */
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read (grp_ent, H5O_STAB_ID, 0, &stab_mesg, dxpl_id))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address");
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
|
|
|
|
if (NULL == (heap = H5HL_protect(grp_ent->file, dxpl_id, stab_mesg.heap_addr)))
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read protect link value")
|
|
|
|
|
|
|
|
|
|
clv = H5HL_offset_into(grp_ent->file, heap, obj_ent->cache.slink.lval_offset);
|
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
linkval = H5MM_xstrdup (clv);
|
2003-09-19 03:27:27 +08:00
|
|
|
|
assert(linkval);
|
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
if (H5HL_unprotect(grp_ent->file, dxpl_id, heap, stab_mesg.heap_addr, H5AC__NO_FLAGS_SET) < 0)
|
2003-09-19 03:27:27 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read unprotect link value")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Hold the entry's name (& old_name) to restore later */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
tmp_user_path_r=obj_ent->user_path_r;
|
|
|
|
|
obj_ent->user_path_r=NULL;
|
|
|
|
|
tmp_canon_path_r=obj_ent->canon_path_r;
|
|
|
|
|
obj_ent->canon_path_r=NULL;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
|
|
|
|
|
/* Free the names for the group entry */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
H5G_free_ent_name(grp_ent);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Clone the group entry, so we can track the names properly */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_ent_copy(&tmp_grp_ent,grp_ent,H5G_COPY_DEEP);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
/* Traverse the link */
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_namei (&tmp_grp_ent, linkval, NULL, grp_ent, obj_ent, H5G_TARGET_NORMAL, nlinks, H5G_NAMEI_TRAVERSE, NULL, dxpl_id))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to follow symbolic link");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Free the entry's names, we will use the original name for the object */
|
|
|
|
|
H5G_free_ent_name(obj_ent);
|
|
|
|
|
|
|
|
|
|
/* Restore previous name for object */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
obj_ent->user_path_r = tmp_user_path_r;
|
|
|
|
|
tmp_user_path_r=NULL;
|
|
|
|
|
obj_ent->canon_path_r = tmp_canon_path_r;
|
|
|
|
|
tmp_canon_path_r=NULL;
|
2005-08-09 05:03:17 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Error cleanup */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if(tmp_user_path_r)
|
|
|
|
|
H5RS_decr(tmp_user_path_r);
|
|
|
|
|
if(tmp_canon_path_r)
|
|
|
|
|
H5RS_decr(tmp_canon_path_r);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
|
|
|
|
/* Release cloned copy of group entry */
|
|
|
|
|
H5G_free_ent_name(&tmp_grp_ent);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
H5MM_xfree (linkval);
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
}
|
|
|
|
|
|
1997-08-13 06:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_mkroot
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Purpose: Creates a root group in an empty file and opens it. If a
|
|
|
|
|
* root group is already open then this function immediately
|
1998-09-22 23:27:26 +08:00
|
|
|
|
* returns. If ENT is non-null then it's the symbol table
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* entry for an existing group which will be opened as the root
|
|
|
|
|
* group. Otherwise a new root group is created and then
|
|
|
|
|
* opened.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* matzke@llnl.gov
|
|
|
|
|
* Aug 11 1997
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
2002-08-29 02:34:12 +08:00
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 22 Aug 2002
|
|
|
|
|
* Added `id to name' support.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-03-25 07:18:34 +08:00
|
|
|
|
herr_t
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_mkroot (H5F_t *f, hid_t dxpl_id, H5G_entry_t *ent)
|
1997-08-13 06:44:46 +08:00
|
|
|
|
{
|
1998-03-25 07:18:34 +08:00
|
|
|
|
H5G_entry_t new_root; /*new root object */
|
|
|
|
|
H5O_stab_t stab; /*symbol table message */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_mkroot, FAIL);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* check args */
|
|
|
|
|
assert(f);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (f->shared->root_grp)
|
|
|
|
|
HGOTO_DONE(SUCCEED);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2004-07-09 10:06:29 +08:00
|
|
|
|
/* Create information needed for group nodes */
|
|
|
|
|
if(H5G_node_init(f)<0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group node info")
|
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* If there is no root object then create one. The root group always has
|
|
|
|
|
* a hard link count of one since it's pointed to by the boot block.
|
1998-01-17 06:23:43 +08:00
|
|
|
|
*/
|
1998-03-25 07:18:34 +08:00
|
|
|
|
if (!ent) {
|
|
|
|
|
ent = &new_root;
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
HDmemset(ent, 0, sizeof(H5G_entry_t));
|
2005-05-08 03:37:48 +08:00
|
|
|
|
if (H5G_stab_create (f, dxpl_id, (size_t)H5G_SIZE_HINT, ent/*out*/)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "unable to create root group");
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (1 != H5O_link (ent, 1, dxpl_id))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_LINK, FAIL, "internal error (wrong link count)");
|
1998-03-25 07:18:34 +08:00
|
|
|
|
} else {
|
1998-01-28 13:47:19 +08:00
|
|
|
|
/*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Open the root object as a group.
|
1998-01-28 13:47:19 +08:00
|
|
|
|
*/
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (H5O_open (ent)<0)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open root group");
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read (ent, H5O_STAB_ID, 0, &stab, dxpl_id)) {
|
1999-02-21 00:18:51 +08:00
|
|
|
|
H5O_close(ent);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "root object is not a group");
|
1998-03-25 07:18:34 +08:00
|
|
|
|
}
|
2003-02-17 23:54:15 +08:00
|
|
|
|
H5O_reset (H5O_STAB_ID, &stab);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Create the path names for the root group's entry */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
ent->user_path_r=H5RS_create("/");
|
|
|
|
|
assert(ent->user_path_r);
|
|
|
|
|
ent->canon_path_r=H5RS_create("/");
|
|
|
|
|
assert(ent->canon_path_r);
|
2002-10-15 04:08:23 +08:00
|
|
|
|
ent->user_path_hidden=0;
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
1998-03-25 07:18:34 +08:00
|
|
|
|
/*
|
|
|
|
|
* Create the group pointer. Also decrement the open object count so we
|
|
|
|
|
* don't count the root group as an open object. The root group will
|
|
|
|
|
* never be closed.
|
|
|
|
|
*/
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if (NULL==(f->shared->root_grp = H5FL_CALLOC (H5G_t)))
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
|
|
|
|
|
if (NULL==(f->shared->root_grp->shared = H5FL_CALLOC (H5G_shared_t))) {
|
|
|
|
|
H5FL_FREE(H5G_t, f->shared->root_grp);
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
|
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
f->shared->root_grp->ent = *ent;
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
f->shared->root_grp->shared->fo_count = 1;
|
1998-10-15 03:35:08 +08:00
|
|
|
|
assert (1==f->nopen_objs);
|
|
|
|
|
f->nopen_objs = 0;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1997-08-13 06:44:46 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1997-08-13 06:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_create
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Creates a new empty group with the specified name. The name
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* is either an absolute name or is relative to LOC.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1997-09-02 23:38:26 +08:00
|
|
|
|
* Errors:
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Return: Success: A handle for the group. The group is opened
|
|
|
|
|
* and should eventually be close by calling
|
|
|
|
|
* H5G_close().
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Failure: NULL
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* matzke@llnl.gov
|
|
|
|
|
* Aug 11 1997
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static H5G_t *
|
2005-06-21 02:11:57 +08:00
|
|
|
|
H5G_create(H5G_entry_t *loc, const char *name, size_t size_hint,
|
|
|
|
|
hid_t dxpl_id, hid_t gcpl_id, hid_t UNUSED gapl_id)
|
1997-08-13 06:44:46 +08:00
|
|
|
|
{
|
2003-06-19 04:41:28 +08:00
|
|
|
|
H5G_t *grp = NULL; /*new group */
|
2003-08-23 23:55:06 +08:00
|
|
|
|
H5F_t *file = NULL; /* File new group will be in */
|
2005-06-21 02:11:57 +08:00
|
|
|
|
H5P_genplist_t *gc_plist; /* Property list created */
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
unsigned stab_init=0; /* Flag to indicate that the symbol table was created successfully */
|
2003-06-19 04:41:28 +08:00
|
|
|
|
H5G_t *ret_value; /* Return value */
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_create);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* check args */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
assert(loc);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
assert(name && *name);
|
2005-06-21 02:11:57 +08:00
|
|
|
|
assert(gcpl_id != H5P_DEFAULT);
|
|
|
|
|
#ifdef LATER
|
|
|
|
|
assert(gapl_id != H5P_DEFAULT);
|
|
|
|
|
#endif /* LATER */
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* create an open group */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if (NULL==(grp = H5FL_CALLOC(H5G_t)))
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
|
|
|
|
|
if (NULL==(grp->shared = H5FL_CALLOC(H5G_t)))
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
|
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* What file is the group being added to? */
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (NULL==(file=H5G_insertion_file(loc, name, dxpl_id)))
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to locate insertion point");
|
|
|
|
|
|
|
|
|
|
/* Create the group entry */
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_stab_create(file, dxpl_id, size_hint, &(grp->ent)/*out*/) < 0)
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "can't create grp");
|
2003-06-19 04:41:28 +08:00
|
|
|
|
stab_init=1; /* Indicate that the symbol table information is valid */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-06-21 02:11:57 +08:00
|
|
|
|
/* Get the property list */
|
|
|
|
|
if (NULL == (gc_plist = H5I_object(gcpl_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
|
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* insert child name into parent */
|
2005-06-21 02:11:57 +08:00
|
|
|
|
if(H5G_insert(loc,name,&(grp->ent), dxpl_id, gc_plist)<0)
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group");
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
/* Add group to list of open objects in file */
|
|
|
|
|
if(H5FO_insert(grp->ent.file, grp->ent.header, grp->shared)<0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
|
|
|
|
|
|
|
|
|
|
grp->shared->fo_count = 1;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
/* Set return value */
|
|
|
|
|
ret_value=grp;
|
|
|
|
|
|
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
if(ret_value==NULL) {
|
2003-06-19 04:41:28 +08:00
|
|
|
|
/* Check if we need to release the file-oriented symbol table info */
|
|
|
|
|
if(stab_init) {
|
|
|
|
|
if(H5O_close(&(grp->ent))<0)
|
|
|
|
|
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "unable to release object header");
|
|
|
|
|
if(H5O_delete(file, dxpl_id,grp->ent.header)<0)
|
|
|
|
|
HDONE_ERROR(H5E_SYM, H5E_CANTDELETE, NULL, "unable to delete object header");
|
|
|
|
|
} /* end if */
|
2004-11-23 01:14:11 +08:00
|
|
|
|
if(grp!=NULL) {
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
if(grp->shared != NULL)
|
|
|
|
|
H5FL_FREE(H5G_shared_t, grp->shared);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
H5FL_FREE(H5G_t,grp);
|
2004-11-23 01:14:11 +08:00
|
|
|
|
}
|
2002-08-09 00:52:55 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-01-06 11:07:15 +08:00
|
|
|
|
}
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_isa
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Determines if an object has the requisite messages for being
|
|
|
|
|
* a group.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: TRUE if the required group messages are
|
|
|
|
|
* present; FALSE otherwise.
|
|
|
|
|
*
|
|
|
|
|
* Failure: FAIL if the existence of certain messages
|
|
|
|
|
* cannot be determined.
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, November 2, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static htri_t
|
|
|
|
|
H5G_isa(H5G_entry_t *ent, hid_t dxpl_id)
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
{
|
2002-08-09 00:52:55 +08:00
|
|
|
|
htri_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2004-06-23 23:36:35 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_isa);
|
2002-05-29 23:07:55 +08:00
|
|
|
|
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
assert(ent);
|
|
|
|
|
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if ((ret_value=H5O_exists(ent, H5O_STAB_ID, 0, dxpl_id))<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header");
|
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
}
|
2004-06-23 22:03:22 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_link_isa
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Determines if an object has the requisite form for being
|
|
|
|
|
* a soft link.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: TRUE if the symbol table entry is of type
|
|
|
|
|
* H5G_LINK; FALSE otherwise.
|
|
|
|
|
*
|
|
|
|
|
* Failure: Shouldn't fail.
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Wednesday, June 23, 2004
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static htri_t
|
|
|
|
|
H5G_link_isa(H5G_entry_t *ent, hid_t UNUSED dxpl_id)
|
|
|
|
|
{
|
|
|
|
|
htri_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2004-06-23 22:03:22 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_isa);
|
|
|
|
|
|
|
|
|
|
assert(ent);
|
|
|
|
|
|
|
|
|
|
if(ent->type == H5G_CACHED_SLINK)
|
|
|
|
|
ret_value=TRUE;
|
|
|
|
|
else
|
|
|
|
|
ret_value=FALSE;
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
|
|
|
|
} /* end H5G_link_isa() */
|
|
|
|
|
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_open
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Opens an existing group. The group should eventually be
|
|
|
|
|
* closed by calling H5G_close().
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Return: Success: Ptr to a new group.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Failure: NULL
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, January 5, 1998
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
1999-03-18 08:07:50 +08:00
|
|
|
|
* Modified to call H5G_open_oid - QAK - 3/17/99
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-02-27 02:05:27 +08:00
|
|
|
|
H5G_t *
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
H5G_open(H5G_entry_t *ent, hid_t dxpl_id)
|
1998-01-06 11:07:15 +08:00
|
|
|
|
{
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
H5G_t *grp = NULL;
|
|
|
|
|
H5G_shared_t *shared_fo=NULL;
|
|
|
|
|
H5G_t *ret_value=NULL;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_open, NULL);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
assert(ent);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
/* Check if group was already open */
|
|
|
|
|
if((shared_fo=H5FO_opened(ent->file, ent->header))==NULL) {
|
|
|
|
|
|
|
|
|
|
/* Clear any errors from H5FO_opened() */
|
|
|
|
|
H5E_clear_stack(NULL);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
/* Open the group object */
|
|
|
|
|
if ((grp=H5G_open_oid(ent, dxpl_id)) ==NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "not found");
|
|
|
|
|
|
|
|
|
|
/* Add group to list of open objects in file */
|
|
|
|
|
if(H5FO_insert(grp->ent.file, grp->ent.header, grp->shared)<0)
|
|
|
|
|
{
|
|
|
|
|
H5FL_FREE(H5G_shared_t, grp->shared);
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-21 22:48:26 +08:00
|
|
|
|
/* Set open object count */
|
|
|
|
|
grp->shared->fo_count = 1;
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if(NULL == (grp = H5FL_CALLOC(H5G_t)))
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for group")
|
|
|
|
|
|
|
|
|
|
/* Shallow copy (take ownership) of the group entry object */
|
|
|
|
|
if(H5G_ent_copy(&(grp->ent), ent, H5G_COPY_SHALLOW)<0)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTCOPY, NULL, "can't copy group entry")
|
|
|
|
|
|
2005-07-21 22:48:26 +08:00
|
|
|
|
/* Point to shared group info */
|
|
|
|
|
grp->shared = shared_fo;
|
|
|
|
|
|
|
|
|
|
/* Increment shared reference count */
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
shared_fo->fo_count++;
|
|
|
|
|
}
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
/* Set return value */
|
1999-03-18 08:07:50 +08:00
|
|
|
|
ret_value = grp;
|
|
|
|
|
|
|
|
|
|
done:
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (!ret_value && grp)
|
2000-08-17 04:13:02 +08:00
|
|
|
|
H5FL_FREE(H5G_t,grp);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1999-03-18 08:07:50 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_open_oid
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Opens an existing group. The group should eventually be
|
|
|
|
|
* closed by calling H5G_close().
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: Ptr to a new group.
|
|
|
|
|
*
|
|
|
|
|
* Failure: NULL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Wednesday, March 17, 1999
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
2002-08-29 02:34:12 +08:00
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 22 Aug 2002
|
|
|
|
|
* Added a deep copy of the symbol table entry
|
1999-03-18 08:07:50 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
static H5G_t *
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_open_oid(H5G_entry_t *ent, hid_t dxpl_id)
|
1999-03-18 08:07:50 +08:00
|
|
|
|
{
|
|
|
|
|
H5G_t *grp = NULL;
|
|
|
|
|
H5G_t *ret_value = NULL;
|
|
|
|
|
H5O_stab_t mesg;
|
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_open_oid);
|
1999-03-18 08:07:50 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
|
|
|
|
assert(ent);
|
|
|
|
|
|
|
|
|
|
/* Open the object, making sure it's a group */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if (NULL==(grp = H5FL_CALLOC(H5G_t)))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
|
2005-06-18 10:53:53 +08:00
|
|
|
|
if (NULL==(grp->shared = H5FL_CALLOC(H5G_shared_t)))
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
|
1999-03-18 08:07:50 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Copy over (take ownership) of the group entry object */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_ent_copy(&(grp->ent),ent,H5G_COPY_SHALLOW);
|
1999-03-18 08:07:50 +08:00
|
|
|
|
|
|
|
|
|
/* Grab the object header */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (H5O_open(&(grp->ent)) < 0)
|
1999-03-18 08:07:50 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open group");
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read (&(grp->ent), H5O_STAB_ID, 0, &mesg, dxpl_id)) {
|
1999-03-18 08:07:50 +08:00
|
|
|
|
H5O_close(&(grp->ent));
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTOPENOBJ, NULL, "not a group");
|
1998-02-27 02:05:27 +08:00
|
|
|
|
}
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
/* Set return value */
|
1998-01-17 06:23:43 +08:00
|
|
|
|
ret_value = grp;
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
if (!ret_value && grp) {
|
|
|
|
|
if(grp->shared)
|
|
|
|
|
H5FL_FREE(H5G_shared_t, grp->shared);
|
2000-08-17 04:13:02 +08:00
|
|
|
|
H5FL_FREE(H5G_t,grp);
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
}
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1999-04-16 03:57:50 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_close
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Purpose: Closes the specified group.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, January 5, 1998
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-01-17 06:23:43 +08:00
|
|
|
|
H5G_close(H5G_t *grp)
|
1998-01-06 11:07:15 +08:00
|
|
|
|
{
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_close, FAIL);
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* Check args */
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
assert(grp && grp->shared);
|
|
|
|
|
assert(grp->shared->fo_count > 0);
|
|
|
|
|
|
|
|
|
|
--grp->shared->fo_count;
|
|
|
|
|
|
|
|
|
|
if (0 == grp->shared->fo_count) {
|
|
|
|
|
assert (grp!=H5G_rootof(H5G_fileof(grp)));
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
/* Remove the dataset from the list of opened objects in the file */
|
|
|
|
|
if(H5FO_delete(grp->ent.file, H5AC_dxpl_id, grp->ent.header)<0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't remove group from list of open objects")
|
|
|
|
|
if (H5O_close(&(grp->ent)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close");
|
|
|
|
|
H5FL_FREE (H5G_shared_t, grp->shared);
|
1998-05-02 05:16:06 +08:00
|
|
|
|
} else {
|
2005-07-21 22:48:26 +08:00
|
|
|
|
/* If this group is a mount point and the mount point is the last open
|
|
|
|
|
* reference to the group, then attempt to close down the file hierarchy
|
|
|
|
|
*/
|
|
|
|
|
if(grp->shared->mounted && grp->shared->fo_count == 1) {
|
|
|
|
|
/* Attempt to close down the file hierarchy */
|
|
|
|
|
if(H5F_try_close(grp->ent.file) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problem attempting file close")
|
|
|
|
|
} /* end if */
|
2005-07-06 05:58:50 +08:00
|
|
|
|
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
if(H5G_free_ent_name(&(grp->ent))<0)
|
|
|
|
|
{
|
|
|
|
|
H5FL_FREE (H5G_t,grp);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't free group entry name");
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
}
|
1998-01-17 06:23:43 +08:00
|
|
|
|
}
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
H5FL_FREE (H5G_t,grp);
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2005-07-21 22:48:26 +08:00
|
|
|
|
} /* end H5G_close() */
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_free
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Free memory used by an H5G_t struct (and its H5G_shared_t).
|
|
|
|
|
* Does not close the group or decrement the reference count.
|
|
|
|
|
* Used to free memory used by the root group.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: Non-negative
|
|
|
|
|
* Failure: Negative
|
|
|
|
|
*
|
|
|
|
|
* Programmer: James Laird
|
|
|
|
|
* Tuesday, September 7, 2004
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_free(H5G_t *grp)
|
|
|
|
|
{
|
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2004-12-29 22:26:20 +08:00
|
|
|
|
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_free, FAIL);
|
|
|
|
|
|
|
|
|
|
assert(grp && grp->shared);
|
|
|
|
|
|
|
|
|
|
H5FL_FREE(H5G_shared_t, grp->shared);
|
|
|
|
|
H5FL_FREE(H5G_t, grp);
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-01-06 11:07:15 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1997-09-20 00:36:59 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-10-14 01:17:50 +08:00
|
|
|
|
* Function: H5G_rootof
|
1997-09-20 00:36:59 +08:00
|
|
|
|
*
|
1998-10-15 03:35:08 +08:00
|
|
|
|
* Purpose: Return a pointer to the root group of the file. If the file
|
|
|
|
|
* is part of a virtual file then the root group of the virtual
|
|
|
|
|
* file is returned.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-10-15 03:35:08 +08:00
|
|
|
|
* Return: Success: Ptr to the root group of the file. Do not
|
|
|
|
|
* free the pointer -- it points directly into
|
|
|
|
|
* the file struct.
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-10-15 03:35:08 +08:00
|
|
|
|
* Failure: NULL
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
1998-10-14 01:17:50 +08:00
|
|
|
|
* Tuesday, October 13, 1998
|
1997-10-21 07:14:35 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-05-16 03:22:33 +08:00
|
|
|
|
static H5G_t *
|
1998-10-14 01:17:50 +08:00
|
|
|
|
H5G_rootof(H5F_t *f)
|
1997-10-21 07:14:35 +08:00
|
|
|
|
{
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_rootof);
|
2002-08-10 04:48:23 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
while (f->mtab.parent)
|
|
|
|
|
f = f->mtab.parent;
|
2002-08-10 04:48:23 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(f->shared->root_grp);
|
1997-08-13 06:44:46 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1997-08-13 06:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_insert
|
1997-08-13 23:36:47 +08:00
|
|
|
|
*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Purpose: Inserts a symbol table entry into the group graph.
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*
|
1997-10-21 07:14:35 +08:00
|
|
|
|
* Errors:
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Friday, September 19, 1997
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
2005-06-21 02:11:57 +08:00
|
|
|
|
* Peter Cao
|
|
|
|
|
* May 09, 2005
|
|
|
|
|
* Add flag 'crt_intmd_group' to support creating missing groups
|
|
|
|
|
*
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-01-06 11:07:15 +08:00
|
|
|
|
herr_t
|
2005-06-21 02:11:57 +08:00
|
|
|
|
H5G_insert(H5G_entry_t *loc, const char *name, H5G_entry_t *ent, hid_t dxpl_id, H5P_genplist_t *oc_plist)
|
1997-08-13 06:44:46 +08:00
|
|
|
|
{
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-06-21 02:11:57 +08:00
|
|
|
|
unsigned target=H5G_TARGET_NORMAL;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_insert, FAIL);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* Check args. */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
assert (loc);
|
|
|
|
|
assert (name && *name);
|
|
|
|
|
assert (ent);
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2005-06-21 02:11:57 +08:00
|
|
|
|
/* Check for intermediate group creation flag present */
|
|
|
|
|
if(oc_plist != NULL) {
|
|
|
|
|
unsigned crt_intmd_group;
|
|
|
|
|
|
|
|
|
|
if(H5P_get(oc_plist, H5G_CRT_INTERMEDIATE_GROUP_NAME, &crt_intmd_group) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for creating missing groups");
|
|
|
|
|
|
|
|
|
|
if (crt_intmd_group > 0)
|
|
|
|
|
target |= H5G_CRT_INTMD_GROUP;
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/*
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
* Lookup and insert the name -- it shouldn't exist yet.
|
1998-01-17 06:23:43 +08:00
|
|
|
|
*/
|
2005-06-21 02:11:57 +08:00
|
|
|
|
if (H5G_namei(loc, name, NULL, NULL, NULL, target, NULL, H5G_NAMEI_INSERT, ent, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "already exists");
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/*
|
1998-09-22 23:27:26 +08:00
|
|
|
|
* Insert the object into a symbol table.
|
1998-01-17 06:23:43 +08:00
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5O_link(ent, 1, dxpl_id) < 0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_LINK, FAIL, "unable to increment hard link count");
|
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1997-07-31 05:17:56 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1997-07-31 05:17:56 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Function: H5G_find
|
|
|
|
|
*
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* Purpose: Finds an object with the specified NAME at location LOC. On
|
|
|
|
|
* successful return, GRP_ENT (if non-null) will be initialized
|
|
|
|
|
* with the symbol table information for the group in which the
|
|
|
|
|
* object appears (it will have an undefined object header
|
|
|
|
|
* address if the object is the root object) and OBJ_ENT will be
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* initialized with the symbol table entry for the object
|
|
|
|
|
* (OBJ_ENT is optional when the caller is interested only in
|
1998-03-25 07:18:34 +08:00
|
|
|
|
* the existence of the object).
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
1997-09-02 23:38:26 +08:00
|
|
|
|
* Errors:
|
|
|
|
|
*
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
* Return: Success: Non-negative, see above for values of GRP_ENT
|
|
|
|
|
* and OBJ_ENT.
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Failure: Negative
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* matzke@llnl.gov
|
|
|
|
|
* Aug 12 1997
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_find(H5G_entry_t *loc, const char *name,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_entry_t *grp_ent/*out*/, H5G_entry_t *obj_ent/*out*/, hid_t dxpl_id)
|
1997-07-31 05:17:56 +08:00
|
|
|
|
{
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_find, FAIL);
|
1997-08-08 03:23:00 +08:00
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* check args */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
assert (loc);
|
|
|
|
|
assert (name && *name);
|
1997-08-08 03:23:00 +08:00
|
|
|
|
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_namei(loc, name, NULL, grp_ent, obj_ent, H5G_TARGET_NORMAL, NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
|
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1997-07-31 05:17:56 +08:00
|
|
|
|
}
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_entof
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns a pointer to the entry for a group.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: Ptr to group entry
|
|
|
|
|
*
|
|
|
|
|
* Failure: NULL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Tuesday, March 24, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
H5G_entry_t *
|
|
|
|
|
H5G_entof (H5G_t *grp)
|
|
|
|
|
{
|
2003-12-07 04:38:31 +08:00
|
|
|
|
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_entof);
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(grp ? &(grp->ent) : NULL);
|
1998-03-25 07:18:34 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_fileof
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns the file to which the specified group belongs.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: File pointer.
|
|
|
|
|
*
|
|
|
|
|
* Failure: NULL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Tuesday, March 24, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
H5F_t *
|
|
|
|
|
H5G_fileof (H5G_t *grp)
|
|
|
|
|
{
|
2003-12-07 04:38:31 +08:00
|
|
|
|
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_fileof);
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
1998-03-25 07:18:34 +08:00
|
|
|
|
assert (grp);
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(grp->ent.file);
|
1998-03-25 07:18:34 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_loc
|
|
|
|
|
*
|
1998-08-31 21:46:47 +08:00
|
|
|
|
* Purpose: Given an object ID return a symbol table entry for the
|
|
|
|
|
* object.
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
|
|
|
|
* Return: Success: Group pointer.
|
|
|
|
|
*
|
|
|
|
|
* Failure: NULL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Tuesday, March 24, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_entry_t *
|
1998-03-25 07:18:34 +08:00
|
|
|
|
H5G_loc (hid_t loc_id)
|
|
|
|
|
{
|
|
|
|
|
H5F_t *f;
|
2002-08-10 04:48:23 +08:00
|
|
|
|
H5G_entry_t *ret_value=NULL;
|
1998-08-31 21:46:47 +08:00
|
|
|
|
H5G_t *group=NULL;
|
|
|
|
|
H5T_t *dt=NULL;
|
|
|
|
|
H5D_t *dset=NULL;
|
|
|
|
|
H5A_t *attr=NULL;
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_loc, NULL);
|
1998-08-31 21:46:47 +08:00
|
|
|
|
|
1998-10-06 07:41:30 +08:00
|
|
|
|
switch (H5I_get_type(loc_id)) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
case H5I_FILE:
|
|
|
|
|
if (NULL==(f=H5I_object (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, NULL, "invalid file ID");
|
|
|
|
|
if (NULL==(ret_value=H5G_entof(H5G_rootof(f))))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry for root group");
|
2005-06-02 05:20:10 +08:00
|
|
|
|
|
|
|
|
|
/* Patch up root group's symbol table entry to reflect this file */
|
2005-07-21 22:48:26 +08:00
|
|
|
|
/* (Since the root group info is only stored once for files which
|
|
|
|
|
* share an underlying low-level file)
|
|
|
|
|
*/
|
2005-06-02 05:20:10 +08:00
|
|
|
|
/* (but only for non-mounted files) */
|
|
|
|
|
if(!f->mtab.parent)
|
|
|
|
|
ret_value->file = f;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5I_GENPROP_CLS:
|
|
|
|
|
case H5I_GENPROP_LST:
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of property list");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-07-26 10:55:47 +08:00
|
|
|
|
case H5I_ERROR_CLASS:
|
|
|
|
|
case H5I_ERROR_MSG:
|
|
|
|
|
case H5I_ERROR_STACK:
|
2003-08-09 03:12:58 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of error class, message or stack");
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
case H5I_GROUP:
|
|
|
|
|
if (NULL==(group=H5I_object (loc_id)))
|
|
|
|
|
HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, NULL, "invalid group ID");
|
|
|
|
|
if (NULL==(ret_value=H5G_entof(group)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of group");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5I_DATATYPE:
|
|
|
|
|
if (NULL==(dt=H5I_object(loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid type ID");
|
|
|
|
|
if (NULL==(ret_value=H5T_entof(dt)))
|
2003-08-09 03:12:58 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of datatype");
|
2002-08-09 00:52:55 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5I_DATASPACE:
|
2003-08-09 03:12:58 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of dataspace");
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
case H5I_DATASET:
|
|
|
|
|
if (NULL==(dset=H5I_object(loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid data ID");
|
|
|
|
|
if (NULL==(ret_value=H5D_entof(dset)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of dataset");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5I_ATTR:
|
|
|
|
|
if (NULL==(attr=H5I_object(loc_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid attribute ID");
|
|
|
|
|
if (NULL==(ret_value=H5A_entof(attr)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of attribute");
|
|
|
|
|
break;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-08-09 03:12:58 +08:00
|
|
|
|
case H5I_REFERENCE:
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get symbol table entry of reference");
|
|
|
|
|
|
2004-06-23 23:36:35 +08:00
|
|
|
|
default:
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid object ID");
|
1998-03-25 07:18:34 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-03-25 07:18:34 +08:00
|
|
|
|
}
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_link
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Creates a link from NEW_NAME to CUR_NAME. See H5Glink() for
|
|
|
|
|
* full documentation.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 6, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
1998-04-07 23:34:16 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
2002-04-27 04:34:46 +08:00
|
|
|
|
H5G_link (H5G_entry_t *cur_loc, const char *cur_name, H5G_entry_t *new_loc,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
const char *new_name, H5G_link_t type, unsigned namei_flags, hid_t dxpl_id)
|
1998-04-07 23:34:16 +08:00
|
|
|
|
{
|
1998-04-15 00:44:46 +08:00
|
|
|
|
H5G_entry_t cur_obj; /*entry for the link tail */
|
2003-08-17 02:54:40 +08:00
|
|
|
|
unsigned cur_obj_init=0; /* Flag to indicate that the current object is initialized */
|
1998-04-15 00:44:46 +08:00
|
|
|
|
H5G_entry_t grp_ent; /*ent for grp containing link hd*/
|
|
|
|
|
H5O_stab_t stab_mesg; /*symbol table message */
|
|
|
|
|
const char *rest = NULL; /*last component of new name */
|
2003-08-17 02:54:40 +08:00
|
|
|
|
char *norm_cur_name = NULL; /* Pointer to normalized current name */
|
|
|
|
|
char *norm_new_name = NULL; /* Pointer to normalized current name */
|
1998-04-15 00:44:46 +08:00
|
|
|
|
size_t nchars; /*characters in component */
|
|
|
|
|
size_t offset; /*offset to sym-link value */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_link);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2002-04-27 04:34:46 +08:00
|
|
|
|
assert (cur_loc);
|
|
|
|
|
assert (new_loc);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
assert (cur_name && *cur_name);
|
|
|
|
|
assert (new_name && *new_name);
|
|
|
|
|
|
2003-08-17 02:54:40 +08:00
|
|
|
|
/* Get normalized copies of the current and new names */
|
|
|
|
|
if((norm_cur_name=H5G_normalize(cur_name))==NULL)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name");
|
|
|
|
|
if((norm_new_name=H5G_normalize(new_name))==NULL)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name");
|
|
|
|
|
|
1998-04-07 23:34:16 +08:00
|
|
|
|
switch (type) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
case H5G_LINK_SOFT:
|
|
|
|
|
/*
|
|
|
|
|
* Lookup the the new_name so we can get the group which will contain
|
|
|
|
|
* the new entry. The entry shouldn't exist yet.
|
|
|
|
|
*/
|
2005-08-14 04:53:35 +08:00
|
|
|
|
if (H5G_namei(new_loc, norm_new_name, &rest, &grp_ent, NULL,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_TARGET_NORMAL, NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)>=0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_EXISTS, FAIL, "already exists");
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack (NULL); /*it's okay that we didn't find it*/
|
2002-08-09 00:52:55 +08:00
|
|
|
|
rest = H5G_component (rest, &nchars);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* There should be one component left. Make sure it's null
|
|
|
|
|
* terminated and that `rest' points to it.
|
|
|
|
|
*/
|
2005-04-21 14:55:42 +08:00
|
|
|
|
assert(!rest[nchars]);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
/*
|
|
|
|
|
* Add the link-value to the local heap for the symbol table which
|
|
|
|
|
* will contain the link.
|
|
|
|
|
*/
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read (&grp_ent, H5O_STAB_ID, 0, &stab_mesg, dxpl_id))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "unable to determine local heap address");
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if ((size_t)(-1)==(offset=H5HL_insert (grp_ent.file, dxpl_id,
|
2003-08-17 02:54:40 +08:00
|
|
|
|
stab_mesg.heap_addr, HDstrlen(norm_cur_name)+1, norm_cur_name)))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "unable to write link value to local heap");
|
2003-02-17 23:54:15 +08:00
|
|
|
|
H5O_reset (H5O_STAB_ID, &stab_mesg);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Create a symbol table entry for the link. The object header is
|
|
|
|
|
* undefined and the cache contains the link-value offset.
|
|
|
|
|
*/
|
|
|
|
|
HDmemset (&cur_obj, 0, sizeof cur_obj);
|
|
|
|
|
cur_obj.header = HADDR_UNDEF;
|
|
|
|
|
cur_obj.file = grp_ent.file;
|
|
|
|
|
cur_obj.type = H5G_CACHED_SLINK;
|
|
|
|
|
cur_obj.cache.slink.lval_offset = offset;
|
2003-08-17 02:54:40 +08:00
|
|
|
|
cur_obj_init=1; /* Indicate that the cur_obj struct is initialized */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Insert the link head in the symbol table. This shouldn't ever
|
|
|
|
|
* fail because we've already checked that the link head doesn't
|
|
|
|
|
* exist and the file is writable (because the local heap is
|
|
|
|
|
* writable). But if it does, the only side effect is that the local
|
|
|
|
|
* heap has some extra garbage in it.
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_stab_insert (&grp_ent, rest, &cur_obj, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "unable to create new name/link for object");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5G_LINK_HARD:
|
2003-08-17 02:54:40 +08:00
|
|
|
|
if (H5G_namei(cur_loc, norm_cur_name, NULL, NULL, &cur_obj, namei_flags, NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "source object not found");
|
2003-08-17 02:54:40 +08:00
|
|
|
|
cur_obj_init=1; /* Indicate that the cur_obj struct is initialized */
|
2005-06-21 02:11:57 +08:00
|
|
|
|
if (H5G_insert (new_loc, norm_new_name, &cur_obj, dxpl_id, 0)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "unable to create new name/link for object");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type");
|
1998-04-07 23:34:16 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Free the group's ID to name buffer, if creating a soft link */
|
|
|
|
|
if(type == H5G_LINK_SOFT)
|
|
|
|
|
H5G_free_ent_name(&grp_ent);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Free the ID to name buffer */
|
2003-08-17 02:54:40 +08:00
|
|
|
|
if(cur_obj_init)
|
|
|
|
|
H5G_free_ent_name(&cur_obj);
|
|
|
|
|
|
|
|
|
|
/* Free the normalized path names */
|
|
|
|
|
if(norm_cur_name)
|
|
|
|
|
H5MM_xfree(norm_cur_name);
|
|
|
|
|
if(norm_new_name)
|
|
|
|
|
H5MM_xfree(norm_new_name);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
}
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_get_type
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns the type of object pointed to by `ent'.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: An object type defined in H5Gpublic.h
|
|
|
|
|
*
|
|
|
|
|
* Failure: H5G_UNKNOWN
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Wednesday, November 4, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-07-10 03:16:17 +08:00
|
|
|
|
H5G_obj_t
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_get_type(H5G_entry_t *ent, hid_t dxpl_id)
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
{
|
|
|
|
|
htri_t isa;
|
|
|
|
|
size_t i;
|
2003-07-10 03:16:17 +08:00
|
|
|
|
H5G_obj_t ret_value=H5G_UNKNOWN; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_get_type, H5G_UNKNOWN);
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
|
|
|
|
|
for (i=H5G_ntypes_g; i>0; --i) {
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if ((isa=(H5G_type_g[i-1].isa)(ent, dxpl_id))<0) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
} else if (isa) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_DONE(H5G_type_g[i-1].type);
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (0==i)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
|
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
}
|
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
1998-09-03 05:16:24 +08:00
|
|
|
|
* Function: H5G_get_objinfo
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns information about an object.
|
|
|
|
|
*
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
* Return: Success: Non-negative with info about the object
|
|
|
|
|
* returned through STATBUF if it isn't the null
|
|
|
|
|
* pointer.
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Failure: Negative
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 13, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
2005-06-24 14:30:29 +08:00
|
|
|
|
* John Mainzer - 6/8/05
|
|
|
|
|
* Modified function to use the new dirtied parmeter of
|
|
|
|
|
* H5AC_unprotect(), which allows management of the is_dirty
|
|
|
|
|
* field of the cache info to be moved into the cache code.
|
|
|
|
|
*
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-09-03 05:16:24 +08:00
|
|
|
|
H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_stat_t *statbuf/*out*/, hid_t dxpl_id)
|
1998-04-15 00:44:46 +08:00
|
|
|
|
{
|
|
|
|
|
H5G_entry_t grp_ent, obj_ent;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_get_objinfo, FAIL);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
assert (loc);
|
|
|
|
|
assert (name && *name);
|
|
|
|
|
if (statbuf) HDmemset (statbuf, 0, sizeof *statbuf);
|
|
|
|
|
|
|
|
|
|
/* Find the object's symbol table entry */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if (H5G_namei(loc, name, NULL, &grp_ent/*out*/, &obj_ent/*out*/,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
(unsigned)(follow_link?H5G_TARGET_NORMAL:H5G_TARGET_SLINK), NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to stat object");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Initialize the stat buf. Symbolic links aren't normal objects and
|
1998-07-01 05:30:28 +08:00
|
|
|
|
* therefore don't have much of the normal info. However, the link value
|
1998-04-15 00:44:46 +08:00
|
|
|
|
* length is specific to symbolic links.
|
|
|
|
|
*/
|
|
|
|
|
if (statbuf) {
|
1998-08-15 05:05:16 +08:00
|
|
|
|
if (H5G_CACHED_SLINK==obj_ent.type) {
|
2005-08-09 05:03:17 +08:00
|
|
|
|
H5O_stab_t stab_mesg; /* Symbol table message info */
|
|
|
|
|
const H5HL_t *heap; /* Pointer to local heap for group */
|
|
|
|
|
const char *s; /* Pointer to link value */
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
1998-08-15 05:05:16 +08:00
|
|
|
|
/* Named object is a symbolic link */
|
2003-09-19 03:27:27 +08:00
|
|
|
|
if (NULL == H5O_read(&grp_ent, H5O_STAB_ID, 0, &stab_mesg, dxpl_id))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read symbolic link value")
|
|
|
|
|
|
|
|
|
|
if (NULL == (heap = H5HL_protect(grp_ent.file, dxpl_id, stab_mesg.heap_addr)))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read protect link value")
|
|
|
|
|
|
|
|
|
|
s = H5HL_offset_into(grp_ent.file, heap, obj_ent.cache.slink.lval_offset);
|
|
|
|
|
|
|
|
|
|
statbuf->linklen = HDstrlen(s) + 1; /*count the null terminator*/
|
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
if (H5HL_unprotect(grp_ent.file, dxpl_id, heap, stab_mesg.heap_addr, H5AC__NO_FLAGS_SET) < 0)
|
2003-09-19 03:27:27 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read unprotect link value")
|
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
/* Set object type */
|
1998-08-15 05:05:16 +08:00
|
|
|
|
statbuf->type = H5G_LINK;
|
|
|
|
|
} else {
|
|
|
|
|
/* Some other type of object */
|
2003-08-09 03:12:58 +08:00
|
|
|
|
statbuf->objno = obj_ent.header;
|
2003-02-11 01:26:09 +08:00
|
|
|
|
statbuf->nlink = H5O_link (&obj_ent, 0, dxpl_id);
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read(&obj_ent, H5O_MTIME_ID, 0, &(statbuf->mtime), dxpl_id)) {
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack(NULL);
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read(&obj_ent, H5O_MTIME_NEW_ID, 0, &(statbuf->mtime), dxpl_id)) {
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack(NULL);
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
statbuf->mtime = 0;
|
|
|
|
|
}
|
2002-03-29 03:27:38 +08:00
|
|
|
|
}
|
2005-08-09 05:03:17 +08:00
|
|
|
|
/* Get object type */
|
2003-02-11 01:26:09 +08:00
|
|
|
|
statbuf->type = H5G_get_type(&obj_ent, dxpl_id);
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack(NULL); /*clear errors resulting from checking type*/
|
2003-10-07 23:27:19 +08:00
|
|
|
|
|
|
|
|
|
/* Get object header information */
|
|
|
|
|
if(H5O_get_info(&obj_ent, &(statbuf->ohdr), dxpl_id)<0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object header information")
|
2002-03-29 03:27:38 +08:00
|
|
|
|
}
|
2002-03-28 04:25:03 +08:00
|
|
|
|
|
|
|
|
|
/* Common code to retrieve the file's fileno */
|
2003-08-09 03:12:58 +08:00
|
|
|
|
if(H5F_get_fileno(obj_ent.file,&statbuf->fileno)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_FILE, H5E_BADVALUE, FAIL, "unable to read fileno");
|
2005-08-09 05:03:17 +08:00
|
|
|
|
} /* end if */
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Free the ID to name buffers */
|
2002-09-18 23:51:29 +08:00
|
|
|
|
H5G_free_ent_name(&grp_ent);
|
|
|
|
|
H5G_free_ent_name(&obj_ent);
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_get_num_objs
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Purpose: Private function for H5Gget_num_objs. Returns the number
|
|
|
|
|
* of objects in the group. It iterates all B-tree leaves
|
2002-11-26 01:59:14 +08:00
|
|
|
|
* and sum up total number of group members.
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Return: Success: Non-negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Failure: Negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Raymond Lu
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Nov 20, 2002
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-08-14 04:53:35 +08:00
|
|
|
|
static herr_t
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_get_num_objs(H5G_entry_t *loc, hsize_t *num_objs, hid_t dxpl_id)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2005-07-31 02:53:01 +08:00
|
|
|
|
H5O_stab_t stab_mesg; /*info about B-tree */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
herr_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_get_num_objs);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
2003-08-22 21:50:01 +08:00
|
|
|
|
/* Sanity check */
|
|
|
|
|
assert(loc);
|
|
|
|
|
assert(num_objs);
|
|
|
|
|
|
|
|
|
|
/* Reset the number of objects in the group */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*num_objs = 0;
|
2003-08-22 21:50:01 +08:00
|
|
|
|
|
2005-07-31 02:53:01 +08:00
|
|
|
|
/* Get the B-tree info */
|
|
|
|
|
if (NULL==H5O_read (loc, H5O_STAB_ID, 0, &stab_mesg, dxpl_id))
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address");
|
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
/* Iterate over the group members */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if ((ret_value = H5B_iterate (loc->file, dxpl_id, H5B_SNODE,
|
2005-07-31 02:53:01 +08:00
|
|
|
|
H5G_node_sumup, stab_mesg.btree_addr, num_objs))<0)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
HERROR (H5E_SYM, H5E_CANTINIT, "iteration operator failed");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
done:
|
2005-08-14 04:53:35 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_get_objname_by_idx
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Private function for H5Gget_objname_by_idx.
|
|
|
|
|
* Returns the name of objects in the group by giving index.
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Return: Success: Non-negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Failure: Negative
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Raymond Lu
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Nov 20, 2002
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-08-14 04:53:35 +08:00
|
|
|
|
static ssize_t
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_get_objname_by_idx(H5G_entry_t *loc, hsize_t idx, char* name, size_t size, hid_t dxpl_id)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2005-07-31 02:53:01 +08:00
|
|
|
|
H5O_stab_t stab_mesg; /*info about local heap & B-tree */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_bt_ud3_t udata; /* Iteration information */
|
|
|
|
|
ssize_t ret_value; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_get_objname_by_idx);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
2003-08-22 21:50:01 +08:00
|
|
|
|
/* Sanity check */
|
|
|
|
|
assert(loc);
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
|
|
|
|
/* Get the B-tree & local heap info */
|
|
|
|
|
if (NULL==H5O_read (loc, H5O_STAB_ID, 0, &stab_mesg, dxpl_id))
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address");
|
2003-08-22 21:50:01 +08:00
|
|
|
|
|
|
|
|
|
/* Set iteration information */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
udata.idx = idx;
|
|
|
|
|
udata.num_objs = 0;
|
2005-07-31 02:53:01 +08:00
|
|
|
|
udata.mesg = &stab_mesg;
|
2002-11-26 01:59:14 +08:00
|
|
|
|
udata.name = NULL;
|
|
|
|
|
|
|
|
|
|
/* Iterate over the group members */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if ((ret_value = H5B_iterate (loc->file, dxpl_id, H5B_SNODE,
|
2005-07-31 02:53:01 +08:00
|
|
|
|
H5G_node_name, stab_mesg.btree_addr, &udata))<0)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2004-09-23 04:01:27 +08:00
|
|
|
|
/* If we don't know the name now, we almost certainly went out of bounds */
|
|
|
|
|
if(udata.name==NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "index out of bound");
|
|
|
|
|
|
2003-08-27 02:35:37 +08:00
|
|
|
|
/* Get the length of the name */
|
2003-05-10 02:18:21 +08:00
|
|
|
|
ret_value = (ssize_t)HDstrlen(udata.name);
|
2003-08-27 02:35:37 +08:00
|
|
|
|
|
|
|
|
|
/* Copy the name into the user's buffer, if given */
|
|
|
|
|
if(name) {
|
|
|
|
|
HDstrncpy(name, udata.name, MIN((size_t)(ret_value+1),size));
|
2002-12-02 21:12:17 +08:00
|
|
|
|
if((size_t)ret_value >= size)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
name[size-1]='\0';
|
2003-08-27 02:35:37 +08:00
|
|
|
|
} /* end if */
|
2002-12-02 21:12:17 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
done:
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* Free the duplicated name */
|
|
|
|
|
if(udata.name!=NULL)
|
|
|
|
|
H5MM_xfree(udata.name);
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_get_objtype_by_idx
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Private function for H5Gget_objtype_by_idx.
|
|
|
|
|
* Returns the type of objects in the group by giving index.
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Return: Success: H5G_GROUP(1), H5G_DATASET(2), H5G_TYPE(3)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Failure: UNKNOWN
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Raymond Lu
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Nov 20, 2002
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-08-14 04:53:35 +08:00
|
|
|
|
static H5G_obj_t
|
2003-08-22 21:50:01 +08:00
|
|
|
|
H5G_get_objtype_by_idx(H5G_entry_t *loc, hsize_t idx, hid_t dxpl_id)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2005-07-31 02:53:01 +08:00
|
|
|
|
H5O_stab_t stab_mesg; /*info about local heap & B-tree */
|
|
|
|
|
H5G_bt_ud3_t udata; /* User data for B-tree callback */
|
|
|
|
|
H5G_obj_t ret_value; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_get_objtype_by_idx);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-08-22 21:50:01 +08:00
|
|
|
|
/* Sanity check */
|
|
|
|
|
assert(loc);
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
|
|
|
|
/* Get the B-tree & local heap info */
|
|
|
|
|
if (NULL==H5O_read (loc, H5O_STAB_ID, 0, &stab_mesg, dxpl_id))
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address");
|
2003-08-22 21:50:01 +08:00
|
|
|
|
|
|
|
|
|
/* Set iteration information */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
udata.idx = idx;
|
|
|
|
|
udata.num_objs = 0;
|
2005-07-31 02:53:01 +08:00
|
|
|
|
udata.mesg = &stab_mesg;
|
2004-09-23 04:01:27 +08:00
|
|
|
|
udata.type = H5G_UNKNOWN;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
/* Iterate over the group members */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
if (H5B_iterate (loc->file, dxpl_id, H5B_SNODE,
|
2005-07-31 02:53:01 +08:00
|
|
|
|
H5G_node_type, stab_mesg.btree_addr, &udata)<0)
|
2003-10-16 04:02:51 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "iteration operator failed");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2004-09-23 04:01:27 +08:00
|
|
|
|
/* If we don't know the type now, we almost certainly went out of bounds */
|
|
|
|
|
if(udata.type==H5G_UNKNOWN)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "index out of bound");
|
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
ret_value = udata.type;
|
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-11-26 01:59:14 +08:00
|
|
|
|
}
|
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_linkval
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns the value of a symbolic link.
|
|
|
|
|
*
|
[svn-r876] Changes since 19981102
----------------------
./bin/snapshot
Made same fix as for the release script yesterday.
./src/H5D.c
./src/H5Dprivate.h
./src/H5G.c
./src/H5Gprivate.h
./src/H5Gpublic.h
./src/H5O.c
./src/H5Oprivate.h
./src/H5RA.c
./src/H5RAprivate.h
./src/H5T.c
./src/H5Tprivate.h
Improved object type checking. Instead of determining the
object type by trying to open each of the possible types, we
keep a table of associations between object type number (like
H5G_GROUP, H5G_DATASET, H5D_TYPE, and H5D_RAGGED) and an `isa'
function that returns true if the object header has the right
messages to make the object a particular type. This mechanism
also allows specialization of object types by permitting an
object to satisfy more than one `isa' function.
Added `isa' functions for groups, datasets, ragged arrays, and
committed data types.
./src/H5config.h.in
Added HAVE_STAT_ST_BLOCKS. I thought this had already been
added, but apparently not.
./tools/h5ls.c
Removed system include files since they're already included by
H5private.h and since I wasn't including them portably anyway.
By default, 1-byte integer types are printed as integer values
instead of ASCII characters. However, the `-s' or `--string'
command-line switch causes the data to be interpretted as
ASCII. String data types are always printed as character
data.
Ragged arrays are now identified as ragged arrays and h5ls
doesn't descend into the group automatically. This uses the
new object type specialization stuff.
./tools/h5tools.c
./tools/h5tools.h
Added the ability to print 1-byte integer types as either
ASCII or numeric data instead of always ASCII. The default is
to print as numeric data.
1998-11-06 04:28:34 +08:00
|
|
|
|
* Return: Success: Non-negative, with at most SIZE bytes of the
|
|
|
|
|
* link value copied into the BUF buffer. If the
|
1998-04-15 00:44:46 +08:00
|
|
|
|
* link value is larger than SIZE characters
|
|
|
|
|
* counting the null terminator then the BUF
|
|
|
|
|
* result will not be null terminated.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Failure: Negative
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 13, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
2005-06-24 14:30:29 +08:00
|
|
|
|
* John Mainzer - 6/8/05
|
|
|
|
|
* Modified function to use the new dirtied parmeter of
|
|
|
|
|
* H5AC_unprotect(), which allows management of the is_dirty
|
|
|
|
|
* field of the cache info to be moved into the cache code.
|
|
|
|
|
*
|
1998-04-15 00:44:46 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_linkval (H5G_entry_t *loc, const char *name, size_t size, char *buf/*out*/, hid_t dxpl_id)
|
1998-04-15 00:44:46 +08:00
|
|
|
|
{
|
|
|
|
|
const char *s = NULL;
|
|
|
|
|
H5G_entry_t grp_ent, obj_ent;
|
|
|
|
|
H5O_stab_t stab_mesg;
|
2003-09-20 04:13:47 +08:00
|
|
|
|
const H5HL_t *heap;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_linkval);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Get the symbol table entry for the link head and the symbol table
|
|
|
|
|
* entry for the group in which the link head appears.
|
|
|
|
|
*/
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if (H5G_namei(loc, name, NULL, &grp_ent/*out*/, &obj_ent/*out*/,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_TARGET_SLINK, NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "symbolic link was not found");
|
|
|
|
|
if (H5G_CACHED_SLINK!=obj_ent.type)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "object is not a symbolic link");
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Get the address of the local heap for the link value and a pointer
|
|
|
|
|
* into that local heap.
|
|
|
|
|
*/
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read (&grp_ent, H5O_STAB_ID, 0, &stab_mesg, dxpl_id))
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "unable to determine local heap address");
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
|
|
|
|
if (NULL == (heap = H5HL_protect(grp_ent.file, dxpl_id, stab_mesg.heap_addr)))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read protect link value")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-09-19 03:27:27 +08:00
|
|
|
|
s = H5HL_offset_into(grp_ent.file, heap, obj_ent.cache.slink.lval_offset);
|
|
|
|
|
|
1998-04-15 00:44:46 +08:00
|
|
|
|
/* Copy to output buffer */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (size>0 && buf)
|
1998-09-09 03:15:44 +08:00
|
|
|
|
HDstrncpy (buf, s, size);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
if (H5HL_unprotect(grp_ent.file, dxpl_id, heap, stab_mesg.heap_addr, H5AC__NO_FLAGS_SET) < 0)
|
2003-09-19 03:27:27 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read unprotect link value")
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Free the ID to name buffers */
|
2002-09-18 23:51:29 +08:00
|
|
|
|
H5G_free_ent_name(&grp_ent);
|
|
|
|
|
H5G_free_ent_name(&obj_ent);
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-04-15 00:44:46 +08:00
|
|
|
|
}
|
|
|
|
|
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_set_comment
|
|
|
|
|
*
|
|
|
|
|
* Purpose: (Re)sets the comment for an object.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, July 20, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf, hid_t dxpl_id)
|
1998-07-21 05:01:32 +08:00
|
|
|
|
{
|
|
|
|
|
H5G_entry_t obj_ent;
|
|
|
|
|
H5O_name_t comment;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_set_comment);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
|
|
|
|
/* Get the symbol table entry for the object */
|
1998-10-15 03:35:08 +08:00
|
|
|
|
if (H5G_namei(loc, name, NULL, NULL, &obj_ent/*out*/, H5G_TARGET_NORMAL,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
|
|
|
|
/* Remove the previous comment message if any */
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (H5O_remove(&obj_ent, H5O_NAME_ID, 0, dxpl_id)<0)
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack(NULL);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
|
|
|
|
/* Add the new message */
|
|
|
|
|
if (buf && *buf) {
|
|
|
|
|
comment.s = H5MM_xstrdup(buf);
|
2004-11-23 01:14:11 +08:00
|
|
|
|
if (H5O_modify(&obj_ent, H5O_NAME_ID, H5O_NEW_MESG, 0, H5O_UPDATE_TIME, &comment, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to set comment object header message");
|
2003-02-17 23:54:15 +08:00
|
|
|
|
H5O_reset(H5O_NAME_ID, &comment);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Free the ID to name buffer */
|
2002-09-18 23:51:29 +08:00
|
|
|
|
H5G_free_ent_name(&obj_ent);
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_get_comment
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Get the comment value for an object.
|
|
|
|
|
*
|
[svn-r537] Changes since 19980722
----------------------
./src/H5A.c
./src/H5Apublic.h
./test/tattr.c
Switched the order of the second and third argument of
H5Aget_name() to make it consistent with other functions that
take buffers and buffer sizes.
./src/H5G.c
./src/H5Gpublic.h
./src/H5Gprivate.h
The H5Gget_comment() function returns the size of the comment
including the null terminator. If the object has no comment
then zero is returned. If an error occurs then a negative
value is returned.
./MANIFEST
./tools/Makefile.in
./tools/h5tools.h [NEW]
./tools/h5dump.c [NEW]
Created a library for printing values of datasets in a way
that looks nice. It's not done yet, but I needed it for
debugging the contents of files from Jim Reus.
./tools/h5ls.c
Added the `-d' and `--dump' options which cause the contents
of a dataset to be printed. Added `-w N' and `--width=N'
options to control how wide the raw data output should be. If
you want single-column output then say `-w1'.
Printing dataset values can now handle datasets of any integer
or floating point atomic type. As a special case, integers
which are one byte wide are treated a character strings for
now.
Sample output:
$ h5ls --dump --width=60 banana.hdf
ARCHIVE 0:0:0:744 Dataset {52/Inf}
Data:
(0) "U struct complex { double R; double I; };\012V"
(43) " double;\012"
U 0:0:0:2500 Dataset {256/512}
Data: printing of compound data types is not implemented yet
V 0:0:0:3928 Dataset {256/512}
Data:
(0) 0, 0.015625, 0.03125, 0.046875, 0.0625,
(5) 0.078125, 0.09375, 0.109375, 0.125, 0.140625,
(10) 0.15625, 0.171875, 0.1875, 0.203125, 0.21875,
(15) 0.234375, 0.25, 0.265625, 0.28125, 0.296875,
...
1998-07-24 05:19:17 +08:00
|
|
|
|
* Return: Success: Number of bytes in the comment including the
|
|
|
|
|
* null terminator. Zero if the object has no
|
|
|
|
|
* comment.
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Failure: Negative
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, July 20, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
1998-07-21 05:01:32 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static int
|
|
|
|
|
H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, char *buf, hid_t dxpl_id)
|
1998-07-21 05:01:32 +08:00
|
|
|
|
{
|
|
|
|
|
H5O_name_t comment;
|
|
|
|
|
H5G_entry_t obj_ent;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
int ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_get_comment);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
|
|
|
|
/* Get the symbol table entry for the object */
|
1998-10-15 03:35:08 +08:00
|
|
|
|
if (H5G_namei(loc, name, NULL, NULL, &obj_ent/*out*/, H5G_TARGET_NORMAL,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
|
|
|
|
/* Get the message */
|
|
|
|
|
comment.s = NULL;
|
2003-02-17 23:54:15 +08:00
|
|
|
|
if (NULL==H5O_read(&obj_ent, H5O_NAME_ID, 0, &comment, dxpl_id)) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (buf && bufsize>0)
|
|
|
|
|
buf[0] = '\0';
|
|
|
|
|
ret_value = 0;
|
1998-07-21 05:01:32 +08:00
|
|
|
|
} else {
|
2002-10-30 00:37:49 +08:00
|
|
|
|
if(buf && bufsize)
|
|
|
|
|
HDstrncpy(buf, comment.s, bufsize);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
ret_value = (int)HDstrlen(comment.s);
|
2003-02-17 23:54:15 +08:00
|
|
|
|
H5O_reset(H5O_NAME_ID, &comment);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Free the ID to name buffer */
|
2002-09-18 23:51:29 +08:00
|
|
|
|
H5G_free_ent_name(&obj_ent);
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-07-21 05:01:32 +08:00
|
|
|
|
}
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_unlink
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Unlink a name from a group.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-09-22 23:27:26 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Thursday, September 17, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
1998-09-22 23:27:26 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_unlink(H5G_entry_t *loc, const char *name, hid_t dxpl_id)
|
1998-09-22 23:27:26 +08:00
|
|
|
|
{
|
|
|
|
|
H5G_entry_t grp_ent, obj_ent;
|
|
|
|
|
size_t len;
|
|
|
|
|
const char *base=NULL;
|
2003-08-17 02:54:40 +08:00
|
|
|
|
char *norm_name = NULL; /* Pointer to normalized name */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
H5G_stat_t statbuf; /* Info about object to unlink */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_unlink);
|
|
|
|
|
|
|
|
|
|
/* Sanity check */
|
1998-09-22 23:27:26 +08:00
|
|
|
|
assert(loc);
|
|
|
|
|
assert(name && *name);
|
|
|
|
|
|
2003-08-17 02:54:40 +08:00
|
|
|
|
/* Get normalized copy of the name */
|
|
|
|
|
if((norm_name=H5G_normalize(name))==NULL)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name");
|
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Reset the group entries to known values in a portable way */
|
|
|
|
|
HDmemset(&grp_ent,0,sizeof(H5G_entry_t));
|
|
|
|
|
HDmemset(&obj_ent,0,sizeof(H5G_entry_t));
|
|
|
|
|
|
|
|
|
|
/* Get object type before unlink */
|
2003-08-17 02:54:40 +08:00
|
|
|
|
if (H5G_get_objinfo(loc, norm_name, FALSE, &statbuf, dxpl_id)<0)
|
2002-09-25 22:50:49 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
|
|
|
|
|
|
1998-09-22 23:27:26 +08:00
|
|
|
|
/* Get the entry for the group that contains the object to be unlinked */
|
2003-08-17 02:54:40 +08:00
|
|
|
|
if (H5G_namei(loc, norm_name, NULL, &grp_ent, &obj_ent,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_TARGET_SLINK|H5G_TARGET_MOUNT, NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
|
|
|
|
|
if (!H5F_addr_defined(grp_ent.header))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "no containing group specified");
|
2003-08-17 02:54:40 +08:00
|
|
|
|
if (NULL==(base=H5G_basename(norm_name, &len)) || '/'==*base)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "problems obtaining object base name");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
1998-09-22 23:27:26 +08:00
|
|
|
|
/* Remove the name from the symbol table */
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_stab_remove(&grp_ent, base, dxpl_id)<0)
|
2003-04-14 12:49:26 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to unlink name from symbol table");
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Search the open IDs and replace names for unlinked object */
|
2005-08-21 00:32:55 +08:00
|
|
|
|
if (H5G_replace_name(statbuf.type, &obj_ent, NULL, NULL, NULL, NULL, OP_UNLINK )<0)
|
2003-04-14 12:49:26 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to replace name");
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
done:
|
|
|
|
|
/* Free the ID to name buffers */
|
2002-09-18 23:51:29 +08:00
|
|
|
|
H5G_free_ent_name(&grp_ent);
|
|
|
|
|
H5G_free_ent_name(&obj_ent);
|
|
|
|
|
|
2003-08-17 02:54:40 +08:00
|
|
|
|
/* Free the normalized path name */
|
|
|
|
|
if(norm_name)
|
|
|
|
|
H5MM_xfree(norm_name);
|
|
|
|
|
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-09-22 23:27:26 +08:00
|
|
|
|
}
|
1998-09-28 22:20:21 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_move
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Atomically rename an object.
|
|
|
|
|
*
|
1998-10-27 05:18:54 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-09-28 22:20:21 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Friday, September 25, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-08-29 02:34:12 +08:00
|
|
|
|
* Raymond Lu
|
|
|
|
|
* Thursday, April 18, 2002
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 22 Aug 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-04-27 04:34:46 +08:00
|
|
|
|
*
|
1998-09-28 22:20:21 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
2005-08-14 04:53:35 +08:00
|
|
|
|
H5G_move(H5G_entry_t *src_loc, const char *src_name, H5G_entry_t *dst_loc,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
const char *dst_name, hid_t dxpl_id)
|
1998-09-28 22:20:21 +08:00
|
|
|
|
{
|
1998-10-01 04:17:26 +08:00
|
|
|
|
H5G_stat_t sb;
|
|
|
|
|
char *linkval=NULL;
|
|
|
|
|
size_t lv_size=32;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_entry_t obj_ent; /* Object entry for object being moved */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5RS_str_t *src_name_r; /* Ref-counted version of src name */
|
|
|
|
|
H5RS_str_t *dst_name_r; /* Ref-counted version of dest name */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-08-09 05:03:17 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_move);
|
|
|
|
|
|
|
|
|
|
/* Sanity check */
|
2002-04-27 04:34:46 +08:00
|
|
|
|
assert(src_loc);
|
|
|
|
|
assert(dst_loc);
|
1998-09-28 22:20:21 +08:00
|
|
|
|
assert(src_name && *src_name);
|
|
|
|
|
assert(dst_name && *dst_name);
|
|
|
|
|
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_get_objinfo(src_loc, src_name, FALSE, &sb, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
|
1998-10-01 04:17:26 +08:00
|
|
|
|
if (H5G_LINK==sb.type) {
|
|
|
|
|
/*
|
|
|
|
|
* When renaming a symbolic link we rename the link but don't change
|
|
|
|
|
* the value of the link.
|
|
|
|
|
*/
|
|
|
|
|
do {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if (NULL==(linkval=H5MM_realloc(linkval, 2*lv_size)))
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate space for symbolic link value");
|
1998-10-01 04:17:26 +08:00
|
|
|
|
linkval[lv_size-1] = '\0';
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_linkval(src_loc, src_name, lv_size, linkval, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read symbolic link value");
|
1998-10-01 04:17:26 +08:00
|
|
|
|
} while (linkval[lv_size-1]);
|
2002-04-27 04:34:46 +08:00
|
|
|
|
if (H5G_link(src_loc, linkval, dst_loc, dst_name, H5G_LINK_SOFT,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_TARGET_NORMAL, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to rename symbolic link");
|
1998-10-01 04:17:26 +08:00
|
|
|
|
H5MM_xfree(linkval);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
1998-10-01 04:17:26 +08:00
|
|
|
|
} else {
|
|
|
|
|
/*
|
|
|
|
|
* Rename the object.
|
|
|
|
|
*/
|
2002-04-27 04:34:46 +08:00
|
|
|
|
if (H5G_link(src_loc, src_name, dst_loc, dst_name, H5G_LINK_HARD,
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_TARGET_MOUNT, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to register new name for object");
|
1998-10-01 04:17:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Search the open ID list and replace names for the move operation
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* This has to be done here because H5G_link and H5G_unlink have
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* internal object entries, and do not modify the entries list
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_namei(src_loc, src_name, NULL, NULL, &obj_ent, H5G_TARGET_NORMAL|H5G_TARGET_SLINK, NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id))
|
2002-10-15 04:08:23 +08:00
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to follow symbolic link");
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
src_name_r=H5RS_wrap(src_name);
|
|
|
|
|
assert(src_name_r);
|
|
|
|
|
dst_name_r=H5RS_wrap(dst_name);
|
|
|
|
|
assert(dst_name_r);
|
|
|
|
|
if (H5G_replace_name(sb.type, &obj_ent, src_name_r, src_loc, dst_name_r, dst_loc, OP_MOVE )<0)
|
2002-09-25 22:50:49 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to replace name ");
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5RS_decr(src_name_r);
|
|
|
|
|
H5RS_decr(dst_name_r);
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5G_free_ent_name(&obj_ent);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
1998-10-01 04:17:26 +08:00
|
|
|
|
/* Remove the old name */
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_unlink(src_loc, src_name, dxpl_id)<0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to deregister old object name");
|
1998-09-28 22:20:21 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-09-28 22:20:21 +08:00
|
|
|
|
}
|
1998-10-15 03:35:08 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_insertion_file
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Given a location and name that specifies a not-yet-existing
|
|
|
|
|
* object return the file into which the object is about to be
|
|
|
|
|
* inserted.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: File pointer
|
|
|
|
|
*
|
|
|
|
|
* Failure: NULL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Wednesday, October 14, 1998
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
|
|
|
|
|
* Added `id to name' support.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
1998-10-15 03:35:08 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
H5F_t *
|
2003-02-11 01:26:09 +08:00
|
|
|
|
H5G_insertion_file(H5G_entry_t *loc, const char *name, hid_t dxpl_id)
|
1998-10-15 03:35:08 +08:00
|
|
|
|
{
|
2002-08-09 00:52:55 +08:00
|
|
|
|
H5F_t *ret_value; /* Return value */
|
1998-10-15 03:35:08 +08:00
|
|
|
|
|
2002-05-29 23:07:55 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_insertion_file, NULL);
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
|
1998-10-15 03:35:08 +08:00
|
|
|
|
assert(loc);
|
|
|
|
|
assert(name && *name);
|
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* Check if the location the object will be inserted into is part of a
|
|
|
|
|
* file mounting chain (either a parent or a child) and perform a more
|
|
|
|
|
* rigorous determination of the location's file (which traverses into
|
|
|
|
|
* mounted files, etc.).
|
1998-10-15 03:35:08 +08:00
|
|
|
|
*/
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if(H5F_has_mount(loc->file) || H5F_is_mount(loc->file)) {
|
|
|
|
|
const char *rest;
|
|
|
|
|
H5G_entry_t grp_ent;
|
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Look up the name to get the containing group and to make sure the name
|
|
|
|
|
* doesn't already exist.
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
if (H5G_namei(loc, name, &rest, &grp_ent, NULL, H5G_TARGET_NORMAL, NULL, H5G_NAMEI_TRAVERSE, NULL, dxpl_id)>=0) {
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5G_free_ent_name(&grp_ent);
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, NULL, "name already exists");
|
|
|
|
|
} /* end if */
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack(NULL);
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
|
|
|
|
|
/* Make sure only the last component wasn't resolved */
|
|
|
|
|
rest = H5G_component(rest, &size);
|
|
|
|
|
assert(*rest && size>0);
|
|
|
|
|
rest = H5G_component(rest+size, NULL);
|
|
|
|
|
if (*rest) {
|
|
|
|
|
H5G_free_ent_name(&grp_ent);
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "insertion point not found");
|
|
|
|
|
} /* end if */
|
1998-10-15 03:35:08 +08:00
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* Set return value */
|
|
|
|
|
ret_value=grp_ent.file;
|
1998-10-15 03:35:08 +08:00
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
/* Free the ID to name buffer */
|
|
|
|
|
H5G_free_ent_name(&grp_ent);
|
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
|
|
|
|
/* Use the location's file */
|
|
|
|
|
ret_value=loc->file;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
1998-10-15 03:35:08 +08:00
|
|
|
|
}
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
2002-09-18 23:51:29 +08:00
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_free_grp_name
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Free the 'ID to name' buffers.
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
|
|
|
|
|
*
|
|
|
|
|
* Date: August 22, 2002
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Comments: Used now only on the root group close, in H5F_close()
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_free_grp_name(H5G_t *grp)
|
|
|
|
|
{
|
2002-09-25 22:50:49 +08:00
|
|
|
|
H5G_entry_t *ent; /* Group object's entry */
|
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_free_grp_name, FAIL);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Check args */
|
[svn-r9329]
Purpose:
Feature
Description:
Datatypes and groups now use H5FO "file object" code that was previously
only used by datasets. These objects will hold a file open if the file
is closed but they have not yet been closed. If these objects are unlinked
then relinked, they will not be destroyed. If they are opened twice (even
by two different names), both IDs will "see" changes made to the object
using the other ID.
When an object is opened using two different names (e.g., if a dataset was
opened under one name, then mounted and opened under its new name), calling
H5Iget_name() on a given hid_t will return the name used to open that hid_t,
not the current name of the object (this is a feature, and a change from the
previous behavior of datasets).
Solution:
Used H5FO code that was already in place for datasets. Broke H5D_t's, H5T_t's,
and H5G_t's into a "shared" struct and a private struct. The shared structs
(H5D_shared_t, etc.) hold the object's information and are used by all IDs
that point to a given object in the file. The private structs are pointed
to by the hid_t and contain the object's group entry information (including its
name) and a pointer to the shared struct for that object.
This changed the naming of structs throughout the library (e.g., datatype->size
is now datatype->shared->size). I added an updated H5Tinit.c to windows.zip.
Platforms tested:
Visual Studio 7, sleipnir, arabica, verbena
Misc. update:
2004-09-29 03:04:19 +08:00
|
|
|
|
assert(grp && grp->shared);
|
|
|
|
|
assert(grp->shared->fo_count > 0);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Get the entry for the group */
|
|
|
|
|
if (NULL==( ent = H5G_entof(grp)))
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_CANTINIT, FAIL, "cannot get entry");
|
|
|
|
|
|
|
|
|
|
/* Free the entry */
|
|
|
|
|
H5G_free_ent_name(ent);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
2002-09-18 23:51:29 +08:00
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_free_ent_name
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Free the 'ID to name' buffers.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
|
|
|
|
|
*
|
|
|
|
|
* Date: August 22, 2002
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Comments:
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_free_ent_name(H5G_entry_t *ent)
|
|
|
|
|
{
|
2002-09-25 22:50:49 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_free_ent_name, FAIL);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Check args */
|
|
|
|
|
assert(ent);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if(ent->user_path_r) {
|
|
|
|
|
H5RS_decr(ent->user_path_r);
|
|
|
|
|
ent->user_path_r=NULL;
|
|
|
|
|
} /* end if */
|
|
|
|
|
if(ent->canon_path_r) {
|
|
|
|
|
H5RS_decr(ent->canon_path_r);
|
|
|
|
|
ent->canon_path_r=NULL;
|
|
|
|
|
} /* end if */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-18 23:51:29 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
}
|
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
2002-08-29 02:34:12 +08:00
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_replace_name
|
|
|
|
|
*
|
2002-09-25 22:50:49 +08:00
|
|
|
|
* Purpose: Search the list of open IDs and replace names according to a
|
|
|
|
|
* particular operation. The operation occured on the LOC
|
|
|
|
|
* entry, which had SRC_NAME previously. The new name (if there
|
2002-10-15 04:08:23 +08:00
|
|
|
|
* is one) is DST_NAME. Additional entry location information
|
|
|
|
|
* (currently only needed for the 'move' operation) is passed
|
|
|
|
|
* in SRC_LOC and DST_LOC.
|
2002-08-29 02:34:12 +08:00
|
|
|
|
*
|
|
|
|
|
* Return: Success: 0, Failure: -1
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
|
|
|
|
|
*
|
|
|
|
|
* Date: June 11, 2002
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Comments:
|
2002-08-29 02:34:12 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2002-09-25 22:50:49 +08:00
|
|
|
|
herr_t
|
2004-12-29 22:26:20 +08:00
|
|
|
|
H5G_replace_name(H5G_obj_t type, H5G_entry_t *loc,
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5RS_str_t *src_name, H5G_entry_t *src_loc,
|
|
|
|
|
H5RS_str_t *dst_name, H5G_entry_t *dst_loc, H5G_names_op_t op )
|
2002-09-25 22:50:49 +08:00
|
|
|
|
{
|
|
|
|
|
H5G_names_t names; /* Structure to hold operation information for callback */
|
|
|
|
|
unsigned search_group=0; /* Flag to indicate that groups are to be searched */
|
|
|
|
|
unsigned search_dataset=0; /* Flag to indicate that datasets are to be searched */
|
|
|
|
|
unsigned search_datatype=0; /* Flag to indicate that datatypes are to be searched */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
herr_t ret_value = SUCCEED;
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
|
|
|
|
FUNC_ENTER_NOAPI(H5G_replace_name, FAIL);
|
|
|
|
|
|
|
|
|
|
/* Set up common information for callback */
|
|
|
|
|
names.src_name=src_name;
|
|
|
|
|
names.dst_name=dst_name;
|
|
|
|
|
names.loc=loc;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
names.src_loc=src_loc;
|
|
|
|
|
names.dst_loc=dst_loc;
|
2002-09-25 22:50:49 +08:00
|
|
|
|
names.op=op;
|
|
|
|
|
|
|
|
|
|
/* Determine which types of IDs need to be operated on */
|
|
|
|
|
switch(type) {
|
|
|
|
|
/* Object is a group */
|
|
|
|
|
case H5G_GROUP:
|
|
|
|
|
/* Search and replace names through group IDs */
|
|
|
|
|
search_group=1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Object is a dataset */
|
|
|
|
|
case H5G_DATASET:
|
|
|
|
|
/* Search and replace names through dataset IDs */
|
|
|
|
|
search_dataset=1;
|
|
|
|
|
break;
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
2003-08-09 03:12:58 +08:00
|
|
|
|
/* Object is a named datatype */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
case H5G_TYPE:
|
|
|
|
|
/* Search and replace names through datatype IDs */
|
|
|
|
|
search_datatype=1;
|
|
|
|
|
break;
|
2002-09-04 23:50:12 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
case H5G_UNKNOWN: /* We pass H5G_UNKNOWN as object type when we need to search all IDs */
|
|
|
|
|
case H5G_LINK: /* Symbolic links might resolve to any object, so we need to search all IDs */
|
|
|
|
|
/* Check if we will need to search groups */
|
|
|
|
|
if(H5I_nmembers(H5I_GROUP)>0)
|
|
|
|
|
search_group=1;
|
2002-09-04 23:50:12 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Check if we will need to search datasets */
|
|
|
|
|
if(H5I_nmembers(H5I_DATASET)>0)
|
|
|
|
|
search_dataset=1;
|
|
|
|
|
|
|
|
|
|
/* Check if we will need to search datatypes */
|
|
|
|
|
if(H5I_nmembers(H5I_DATATYPE)>0)
|
|
|
|
|
search_datatype=1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
HGOTO_ERROR (H5E_DATATYPE, H5E_BADTYPE, FAIL, "not valid object type");
|
|
|
|
|
} /* end switch */
|
|
|
|
|
|
|
|
|
|
/* Search through group IDs */
|
|
|
|
|
if(search_group)
|
|
|
|
|
H5I_search(H5I_GROUP, H5G_replace_ent, &names);
|
|
|
|
|
|
|
|
|
|
/* Search through dataset IDs */
|
|
|
|
|
if(search_dataset)
|
|
|
|
|
H5I_search(H5I_DATASET, H5G_replace_ent, &names);
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Search through datatype IDs */
|
|
|
|
|
if(search_datatype)
|
|
|
|
|
H5I_search(H5I_DATATYPE, H5G_replace_ent, &names);
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
2005-08-14 04:53:35 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
}
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_common_path
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Determine if one path is a valid prefix of another path
|
|
|
|
|
*
|
|
|
|
|
* Return: TRUE for valid prefix, FALSE for not a valid prefix, FAIL
|
|
|
|
|
* on error
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
|
|
|
|
|
*
|
|
|
|
|
* Date: September 24, 2002
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Comments:
|
2002-09-25 22:50:49 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static htri_t
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r)
|
2002-09-25 22:50:49 +08:00
|
|
|
|
{
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
const char *fullpath; /* Pointer to actual fullpath string */
|
|
|
|
|
const char *prefix; /* Pointer to actual prefix string */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
size_t nchars1,nchars2; /* Number of characters in components */
|
|
|
|
|
htri_t ret_value=FALSE; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-12-07 04:38:31 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_common_path);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Get component of each name */
|
2003-02-25 04:19:01 +08:00
|
|
|
|
fullpath=H5RS_get_str(fullpath_r);
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
assert(fullpath);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
fullpath=H5G_component(fullpath,&nchars1);
|
|
|
|
|
assert(fullpath);
|
2003-02-25 04:19:01 +08:00
|
|
|
|
prefix=H5RS_get_str(prefix_r);
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
assert(prefix);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
prefix=H5G_component(prefix,&nchars2);
|
|
|
|
|
assert(prefix);
|
|
|
|
|
|
|
|
|
|
/* Check if we have a real string for each component */
|
|
|
|
|
while(*fullpath && *prefix) {
|
|
|
|
|
/* Check that the components we found are the same length */
|
|
|
|
|
if(nchars1==nchars2) {
|
|
|
|
|
/* Check that the two components are equal */
|
|
|
|
|
if(HDstrncmp(fullpath,prefix,nchars1)==0) {
|
|
|
|
|
/* Advance the pointers in the names */
|
|
|
|
|
fullpath+=nchars1;
|
|
|
|
|
prefix+=nchars2;
|
|
|
|
|
|
|
|
|
|
/* Get next component of each name */
|
|
|
|
|
fullpath=H5G_component(fullpath,&nchars1);
|
|
|
|
|
assert(fullpath);
|
|
|
|
|
prefix=H5G_component(prefix,&nchars2);
|
|
|
|
|
assert(prefix);
|
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
|
|
|
|
HGOTO_DONE(FALSE);
|
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
|
|
|
|
HGOTO_DONE(FALSE);
|
|
|
|
|
} /* end while */
|
|
|
|
|
|
|
|
|
|
/* If we reached the end of the prefix path to check, it must be a valid prefix */
|
|
|
|
|
if(*prefix=='\0')
|
|
|
|
|
ret_value=TRUE;
|
2002-08-29 02:34:12 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
done:
|
2003-01-11 04:26:02 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
}
|
|
|
|
|
|
2005-08-21 00:32:55 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_build_fullpath
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Build a full path from a prefix & base pair of reference counted
|
|
|
|
|
* strings
|
|
|
|
|
*
|
|
|
|
|
* Return: Pointer to reference counted string on success, NULL on error
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol, koziol@ncsa.uiuc.edu
|
|
|
|
|
*
|
|
|
|
|
* Date: August 19, 2005
|
|
|
|
|
*
|
|
|
|
|
* Comments:
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static H5RS_str_t *
|
|
|
|
|
H5G_build_fullpath(const H5RS_str_t *prefix_r, const H5RS_str_t *name_r)
|
|
|
|
|
{
|
|
|
|
|
const char *prefix; /* Pointer to raw string of prefix */
|
|
|
|
|
const char *name; /* Pointer to raw string of name */
|
|
|
|
|
char *full_path; /* Full user path built */
|
|
|
|
|
size_t path_len; /* Length of the path */
|
|
|
|
|
unsigned need_sep; /* Flag to indicate if separator is needed */
|
|
|
|
|
H5RS_str_t *ret_value; /* Return value */
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_build_fullpath)
|
|
|
|
|
|
|
|
|
|
/* Get the pointer to the prefix */
|
|
|
|
|
prefix=H5RS_get_str(prefix_r);
|
|
|
|
|
|
|
|
|
|
/* Get the length of the prefix */
|
|
|
|
|
path_len=HDstrlen(prefix);
|
|
|
|
|
|
|
|
|
|
/* Determine if there is a trailing separator in the name */
|
|
|
|
|
if(prefix[path_len-1]=='/')
|
|
|
|
|
need_sep=0;
|
|
|
|
|
else
|
|
|
|
|
need_sep=1;
|
|
|
|
|
|
|
|
|
|
/* Get the pointer to the raw src user path */
|
|
|
|
|
name=H5RS_get_str(name_r);
|
|
|
|
|
|
|
|
|
|
/* Add in the length needed for the '/' separator and the relative path */
|
|
|
|
|
path_len+=HDstrlen(name)+need_sep;
|
|
|
|
|
|
|
|
|
|
/* Allocate space for the path */
|
|
|
|
|
if(NULL==(full_path = H5FL_BLK_MALLOC(str_buf,path_len+1)))
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
|
|
|
|
|
|
|
|
|
|
/* Build full path */
|
|
|
|
|
HDstrcpy(full_path,prefix);
|
|
|
|
|
if(need_sep)
|
|
|
|
|
HDstrcat(full_path,"/");
|
|
|
|
|
HDstrcat(full_path,name);
|
|
|
|
|
|
|
|
|
|
/* Create reference counted string for path */
|
|
|
|
|
ret_value=H5RS_own(full_path);
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_build_fullpath() */
|
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
2002-08-29 02:34:12 +08:00
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_replace_ent
|
|
|
|
|
*
|
|
|
|
|
* Purpose: H5I_search callback function to replace group entry names
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: 0, Failure: -1
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
|
|
|
|
|
*
|
|
|
|
|
* Date: June 5, 2002
|
|
|
|
|
*
|
2005-08-14 04:53:35 +08:00
|
|
|
|
* Comments:
|
2002-08-29 02:34:12 +08:00
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-06-20 23:19:18 +08:00
|
|
|
|
static int
|
|
|
|
|
H5G_replace_ent(void *obj_ptr, hid_t obj_id, void *key)
|
2002-09-25 22:50:49 +08:00
|
|
|
|
{
|
|
|
|
|
const H5G_names_t *names = (const H5G_names_t *)key; /* Get operation's information */
|
|
|
|
|
H5G_entry_t *ent = NULL; /* Group entry for object that the ID refers to */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
H5F_t *top_ent_file; /* Top file in entry's mounted file chain */
|
|
|
|
|
H5F_t *top_loc_file; /* Top file in location's mounted file chain */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2003-12-07 04:38:31 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_replace_ent);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
assert(obj_ptr);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
/* Get the symbol table entry */
|
2003-05-16 03:22:33 +08:00
|
|
|
|
switch(H5I_get_type(obj_id)) {
|
2002-09-25 22:50:49 +08:00
|
|
|
|
case H5I_GROUP:
|
|
|
|
|
ent = H5G_entof((H5G_t*)obj_ptr);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5I_DATASET:
|
|
|
|
|
ent = H5D_entof((H5D_t*)obj_ptr);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5I_DATATYPE:
|
|
|
|
|
/* Avoid non-named datatypes */
|
|
|
|
|
if(!H5T_is_named((H5T_t*)obj_ptr))
|
|
|
|
|
HGOTO_DONE(SUCCEED); /* Do not exit search over IDs */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
ent = H5T_entof((H5T_t*)obj_ptr);
|
|
|
|
|
break;
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
default:
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unknown data object");
|
|
|
|
|
} /* end switch */
|
|
|
|
|
assert(ent);
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-09-25 22:50:49 +08:00
|
|
|
|
switch(names->op) {
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* OP_MOUNT
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
case OP_MOUNT:
|
2005-06-08 13:22:28 +08:00
|
|
|
|
if(ent->user_path_r) {
|
|
|
|
|
if(ent->file->mtab.parent && H5RS_cmp(ent->user_path_r,ent->canon_path_r)) {
|
|
|
|
|
/* Find the "top" file in the chain of mounted files */
|
|
|
|
|
top_ent_file=ent->file->mtab.parent;
|
|
|
|
|
while(top_ent_file->mtab.parent!=NULL)
|
|
|
|
|
top_ent_file=top_ent_file->mtab.parent;
|
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
|
|
|
|
top_ent_file=ent->file;
|
|
|
|
|
|
|
|
|
|
/* Check for entry being in correct file (or mounted file) */
|
|
|
|
|
if(top_ent_file->shared == names->loc->file->shared) {
|
|
|
|
|
/* Check if the source is along the entry's path */
|
|
|
|
|
/* (But not actually the entry itself) */
|
|
|
|
|
if(H5G_common_path(ent->user_path_r,names->src_name) &&
|
|
|
|
|
H5RS_cmp(ent->user_path_r,names->src_name)!=0) {
|
|
|
|
|
/* Hide the user path */
|
|
|
|
|
ent->user_path_hidden++;
|
|
|
|
|
} /* end if */
|
|
|
|
|
} /* end if */
|
|
|
|
|
} /* end if */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* OP_UNMOUNT
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
case OP_UNMOUNT:
|
2005-06-08 13:22:28 +08:00
|
|
|
|
if(ent->user_path_r) {
|
|
|
|
|
if(ent->file->mtab.parent) {
|
|
|
|
|
/* Find the "top" file in the chain of mounted files for the entry */
|
|
|
|
|
top_ent_file=ent->file->mtab.parent;
|
|
|
|
|
while(top_ent_file->mtab.parent!=NULL)
|
|
|
|
|
top_ent_file=top_ent_file->mtab.parent;
|
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
|
|
|
|
top_ent_file=ent->file;
|
|
|
|
|
|
|
|
|
|
if(names->loc->file->mtab.parent) {
|
|
|
|
|
/* Find the "top" file in the chain of mounted files for the location */
|
|
|
|
|
top_loc_file=names->loc->file->mtab.parent;
|
|
|
|
|
while(top_loc_file->mtab.parent!=NULL)
|
|
|
|
|
top_loc_file=top_loc_file->mtab.parent;
|
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
|
|
|
|
top_loc_file=names->loc->file;
|
|
|
|
|
|
|
|
|
|
/* If the ID's entry is not in the file we operated on, skip it */
|
|
|
|
|
if(top_ent_file->shared == top_loc_file->shared) {
|
|
|
|
|
if(ent->user_path_hidden) {
|
|
|
|
|
if(H5G_common_path(ent->user_path_r,names->src_name)) {
|
|
|
|
|
/* Un-hide the user path */
|
|
|
|
|
ent->user_path_hidden--;
|
|
|
|
|
} /* end if */
|
|
|
|
|
} /* end if */
|
|
|
|
|
else {
|
|
|
|
|
if(H5G_common_path(ent->user_path_r,names->src_name)) {
|
|
|
|
|
/* Free user path */
|
|
|
|
|
H5RS_decr(ent->user_path_r);
|
|
|
|
|
ent->user_path_r=NULL;
|
|
|
|
|
} /* end if */
|
|
|
|
|
} /* end else */
|
|
|
|
|
} /* end if */
|
|
|
|
|
} /* end if */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* OP_UNLINK
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
case OP_UNLINK:
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* If the ID's entry is not in the file we operated on, skip it */
|
2005-08-21 00:32:55 +08:00
|
|
|
|
if(ent->file->shared == names->loc->file->shared &&
|
|
|
|
|
names->loc->canon_path_r && ent->canon_path_r && ent->user_path_r) {
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Check if we are referring to the same object */
|
|
|
|
|
if(H5F_addr_eq(ent->header, names->loc->header)) {
|
|
|
|
|
/* Check if the object was opened with the same canonical path as the one being moved */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if(H5RS_cmp(ent->canon_path_r,names->loc->canon_path_r)==0) {
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Free user path */
|
2005-06-08 13:22:28 +08:00
|
|
|
|
H5RS_decr(ent->user_path_r);
|
|
|
|
|
ent->user_path_r=NULL;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
} /* end if */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
else {
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Check if the location being unlinked is in the canonical path for the current object */
|
[svn-r6252] Purpose:
Lots of performance improvements & a couple new internal API interfaces.
Description:
Performance Improvements:
- Cached file offset & length sizes in shared file struct, to avoid
constantly looking them up in the FCPL.
- Generic property improvements:
- Added "revision" number to generic property classes to speed
up comparisons.
- Changed method of storing properties from using a hash-table
to the TBBT routines in the library.
- Share the propery names between classes and the lists derived
from them.
- Removed redundant 'def_value' buffer from each property.
- Switching code to use a "copy on write" strategy for
properties in each list, where the properties in each list
are shared with the properties in the class, until a
property's value is changed in a list.
- Fixed error in layout code which was allocating too many buffers.
- Redefined public macros of the form (H5open()/H5check, <variable>)
internally to only be (<variable>), avoiding innumerable useless
calls to H5open() and H5check_version().
- Reuse already zeroed buffers in H5F_contig_fill instead of
constantly re-zeroing them.
- Don't write fill values if writing entire dataset.
- Use gettimeofday() system call instead of time() system when
checking the modification time of a dataset.
- Added reference counted string API and use it for tracking the
names of objects opening in a file (for the ID->name code).
- Removed redundant H5P_get() calls in B-tree routines.
- Redefine H5T datatype macros internally to the library, to avoid
calling H5check redundantly.
- Keep dataspace information for dataset locally instead of reading
from disk each time. Added new module to track open objects
in a file, to allow this (which will be useful eventually for
some FPH5 metadata caching issues).
- Remove H5AC_find macro which was inlining metadata cache lookups,
and call function instead.
- Remove redundant memset() calls from H5G_namei() routine.
- Remove redundant checking of object type when locating objects
in metadata cache and rely on the address only.
- Create default dataset object to use when default dataset creation
property list is used to create datasets, bypassing querying
for all the property list values.
- Use default I/O vector size when performing raw data with the
default dataset transfer property list, instead of querying for
I/O vector size.
- Remove H5P_DEFAULT internally to the library, replacing it with
more specific default property list based on the type of
property list needed.
- Remove redundant memset() calls in object header message (H5O*)
routines.
- Remove redunant memset() calls in data I/O routines.
- Split free-list allocation routines into malloc() and calloc()-
like routines, instead of one combined routine.
- Remove lots of indirection in H5O*() routines.
- Simplify metadata cache entry comparison routine (used when
flushing entire cache out).
- Only enable metadata cache statistics when H5AC_DEBUG is turned
on, instead of always tracking them.
- Simplify address comparison macro (H5F_addr_eq).
- Remove redundant metadata cache entry protections during dataset
creation by protecting the object header once and making all
the modifications necessary for the dataset creation before
unprotecting it.
- Reduce # of "number of element in extent" computations performed
by computing and storing the value during dataspace creation.
- Simplify checking for group location's file information, when file
has not been involving in file-mounting operations.
- Use binary encoding for modification time, instead of ASCII.
- Hoist H5HL_peek calls (to get information in a local heap)
out of loops in many group routine.
- Use static variable for iterators of selections, instead of
dynamically allocation them each time.
- Lookup & insert new entries in one step, avoiding traversing
group's B-tree twice.
- Fixed memory leak in H5Gget_objname_idx() routine (tangential to
performance improvements, but fixed along the way).
- Use free-list for reference counted strings.
- Don't bother copying object names into cached group entries,
since they are re-created when an object is opened.
The benchmark I used to measure these results created several thousand
small (2K) datasets in a file and wrote out the data for them. This is
Elena's "regular.c" benchmark.
These changes resulted in approximately ~4.3x speedup of the
development branch when compared to the previous code in the
development branch and ~1.4x speedup compared to the release
branch.
Additionally, these changes reduce the total memory used (code and
data) by the development branch by ~800KB, bringing the development
branch back into the same ballpark as the release branch.
I'll send out a more detailed description of the benchmark results
as a followup note.
New internal API routines:
Added "reference counted strings" API for tracking strings that get
used by multiple owners without duplicating the strings.
Added "ternary search tree" API for text->object mappings.
Platforms tested:
Tested h5committest {arabica (fortran), eirene (fortran, C++)
modi4 (parallel, fortran)}
Other platforms/configurations tested?
FreeBSD 4.7 (sleipnir) serial & parallel
Solaris 2.6 (baldric) serial
2003-01-10 01:20:03 +08:00
|
|
|
|
if(H5G_common_path(ent->canon_path_r,names->loc->canon_path_r)) {
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* Free user path */
|
2005-06-08 13:22:28 +08:00
|
|
|
|
H5RS_decr(ent->user_path_r);
|
|
|
|
|
ent->user_path_r=NULL;
|
2002-10-15 04:08:23 +08:00
|
|
|
|
} /* end if */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
} /* end else */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
} /* end if */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* OP_MOVE
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
case OP_MOVE: /* H5Gmove case, check for relative names case */
|
2002-10-15 04:08:23 +08:00
|
|
|
|
/* If the ID's entry is not in the file we operated on, skip it */
|
|
|
|
|
if(ent->file->shared == names->loc->file->shared) {
|
2005-06-08 13:22:28 +08:00
|
|
|
|
if(ent->user_path_r && names->loc->user_path_r &&
|
|
|
|
|
names->src_loc->user_path_r && names->dst_loc->user_path_r) {
|
|
|
|
|
H5RS_str_t *src_path_r; /* Full user path of source name */
|
|
|
|
|
H5RS_str_t *dst_path_r; /* Full user path of destination name */
|
|
|
|
|
H5RS_str_t *canon_src_path_r; /* Copy of canonical part of source path */
|
|
|
|
|
H5RS_str_t *canon_dst_path_r; /* Copy of canonical part of destination path */
|
|
|
|
|
|
|
|
|
|
/* Sanity check */
|
|
|
|
|
HDassert(names->src_name);
|
|
|
|
|
HDassert(names->dst_name);
|
|
|
|
|
|
|
|
|
|
/* Make certain that the source and destination names are full (not relative) paths */
|
|
|
|
|
if(*(H5RS_get_str(names->src_name))!='/') {
|
2005-08-21 00:32:55 +08:00
|
|
|
|
/* Create reference counted string for full src path */
|
|
|
|
|
if((src_path_r = H5G_build_fullpath(names->src_loc->user_path_r, names->src_name)) == NULL)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_PATH, FAIL, "can't build source path name")
|
2005-06-08 13:22:28 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
2005-08-21 00:32:55 +08:00
|
|
|
|
src_path_r=H5RS_dup(names->src_name);
|
2005-06-08 13:22:28 +08:00
|
|
|
|
if(*(H5RS_get_str(names->dst_name))!='/') {
|
2005-08-21 00:32:55 +08:00
|
|
|
|
/* Create reference counted string for full dst path */
|
|
|
|
|
if((dst_path_r = H5G_build_fullpath(names->dst_loc->user_path_r, names->dst_name)) == NULL)
|
|
|
|
|
HGOTO_ERROR (H5E_SYM, H5E_PATH, FAIL, "can't build destination path name")
|
2005-06-08 13:22:28 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
2005-08-21 00:32:55 +08:00
|
|
|
|
dst_path_r=H5RS_dup(names->dst_name);
|
2005-06-08 13:22:28 +08:00
|
|
|
|
|
|
|
|
|
/* Get the canonical parts of the source and destination names */
|
|
|
|
|
|
|
|
|
|
/* Check if the object being moved was accessed through a mounted file */
|
|
|
|
|
if(H5RS_cmp(names->loc->user_path_r,names->loc->canon_path_r)!=0) {
|
|
|
|
|
size_t non_canon_name_len; /* Length of non-canonical part of name */
|
|
|
|
|
|
|
|
|
|
/* Get current string lengths */
|
|
|
|
|
non_canon_name_len=H5RS_len(names->loc->user_path_r)-H5RS_len(names->loc->canon_path_r);
|
|
|
|
|
|
|
|
|
|
canon_src_path_r=H5RS_create(H5RS_get_str(src_path_r)+non_canon_name_len);
|
|
|
|
|
canon_dst_path_r=H5RS_create(H5RS_get_str(dst_path_r)+non_canon_name_len);
|
|
|
|
|
} /* end if */
|
|
|
|
|
else {
|
|
|
|
|
canon_src_path_r=H5RS_dup(src_path_r);
|
|
|
|
|
canon_dst_path_r=H5RS_dup(dst_path_r);
|
|
|
|
|
} /* end else */
|
|
|
|
|
|
|
|
|
|
/* Check if the link being changed in the file is along the canonical path for this object */
|
|
|
|
|
if(H5G_common_path(ent->canon_path_r,canon_src_path_r)) {
|
|
|
|
|
size_t user_dst_len; /* Length of destination user path */
|
|
|
|
|
size_t canon_dst_len; /* Length of destination canonical path */
|
|
|
|
|
const char *old_user_path; /* Pointer to previous user path */
|
|
|
|
|
char *new_user_path; /* Pointer to new user path */
|
|
|
|
|
char *new_canon_path; /* Pointer to new canonical path */
|
|
|
|
|
const char *tail_path; /* Pointer to "tail" of path */
|
|
|
|
|
size_t tail_len; /* Pointer to "tail" of path */
|
|
|
|
|
char *src_canon_prefix; /* Pointer to source canonical path prefix of component which is moving */
|
|
|
|
|
size_t src_canon_prefix_len;/* Length of the source canonical path prefix */
|
|
|
|
|
char *dst_canon_prefix; /* Pointer to destination canonical path prefix of component which is moving */
|
|
|
|
|
size_t dst_canon_prefix_len;/* Length of the destination canonical path prefix */
|
|
|
|
|
char *user_prefix; /* Pointer to user path prefix of component which is moving */
|
|
|
|
|
size_t user_prefix_len; /* Length of the user path prefix */
|
|
|
|
|
char *src_comp; /* The source name of the component which is actually changing */
|
|
|
|
|
char *dst_comp; /* The destination name of the component which is actually changing */
|
|
|
|
|
const char *canon_src_path; /* pointer to canonical part of source path */
|
|
|
|
|
const char *canon_dst_path; /* pointer to canonical part of destination path */
|
|
|
|
|
|
|
|
|
|
/* Get the pointers to the raw strings */
|
|
|
|
|
canon_src_path=H5RS_get_str(canon_src_path_r);
|
|
|
|
|
canon_dst_path=H5RS_get_str(canon_dst_path_r);
|
|
|
|
|
|
|
|
|
|
/* Get the source & destination components */
|
|
|
|
|
src_comp=HDstrrchr(canon_src_path,'/');
|
|
|
|
|
assert(src_comp);
|
|
|
|
|
dst_comp=HDstrrchr(canon_dst_path,'/');
|
|
|
|
|
assert(dst_comp);
|
|
|
|
|
|
|
|
|
|
/* Find the canonical prefixes for the entry */
|
|
|
|
|
src_canon_prefix_len=HDstrlen(canon_src_path)-HDstrlen(src_comp);
|
|
|
|
|
if(NULL==(src_canon_prefix = H5MM_malloc(src_canon_prefix_len+1)))
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
|
|
|
|
|
HDstrncpy(src_canon_prefix,canon_src_path,src_canon_prefix_len);
|
|
|
|
|
src_canon_prefix[src_canon_prefix_len]='\0';
|
|
|
|
|
|
|
|
|
|
dst_canon_prefix_len=HDstrlen(canon_dst_path)-HDstrlen(dst_comp);
|
|
|
|
|
if(NULL==(dst_canon_prefix = H5MM_malloc(dst_canon_prefix_len+1)))
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
|
|
|
|
|
HDstrncpy(dst_canon_prefix,canon_dst_path,dst_canon_prefix_len);
|
|
|
|
|
dst_canon_prefix[dst_canon_prefix_len]='\0';
|
|
|
|
|
|
|
|
|
|
/* Hold this for later use */
|
|
|
|
|
old_user_path=H5RS_get_str(ent->user_path_r);
|
|
|
|
|
|
|
|
|
|
/* Find the user prefix for the entry */
|
|
|
|
|
user_prefix_len=HDstrlen(old_user_path)-H5RS_len(ent->canon_path_r);
|
|
|
|
|
if(NULL==(user_prefix = H5MM_malloc(user_prefix_len+1)))
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
|
|
|
|
|
HDstrncpy(user_prefix,old_user_path,user_prefix_len);
|
|
|
|
|
user_prefix[user_prefix_len]='\0';
|
|
|
|
|
|
|
|
|
|
/* Set the tail path info */
|
|
|
|
|
tail_path=old_user_path+user_prefix_len+src_canon_prefix_len+HDstrlen(src_comp);
|
|
|
|
|
tail_len=HDstrlen(tail_path);
|
|
|
|
|
|
|
|
|
|
/* Get the length of the destination paths */
|
|
|
|
|
user_dst_len=user_prefix_len+dst_canon_prefix_len+HDstrlen(dst_comp)+tail_len;
|
|
|
|
|
canon_dst_len=dst_canon_prefix_len+HDstrlen(dst_comp)+tail_len;
|
|
|
|
|
|
|
|
|
|
/* Allocate space for the new user path */
|
|
|
|
|
if(NULL==(new_user_path = H5FL_BLK_MALLOC(str_buf,user_dst_len+1)))
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-06-08 13:22:28 +08:00
|
|
|
|
/* Allocate space for the new canonical path */
|
|
|
|
|
if(NULL==(new_canon_path = H5FL_BLK_MALLOC(str_buf,canon_dst_len+1)))
|
|
|
|
|
HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed");
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-06-08 13:22:28 +08:00
|
|
|
|
/* Create the new names */
|
|
|
|
|
HDstrcpy(new_user_path,user_prefix);
|
|
|
|
|
HDstrcat(new_user_path,dst_canon_prefix);
|
|
|
|
|
HDstrcat(new_user_path,dst_comp);
|
|
|
|
|
HDstrcat(new_user_path,tail_path);
|
|
|
|
|
HDstrcpy(new_canon_path,dst_canon_prefix);
|
|
|
|
|
HDstrcat(new_canon_path,dst_comp);
|
|
|
|
|
HDstrcat(new_canon_path,tail_path);
|
|
|
|
|
|
|
|
|
|
/* Release the old user & canonical paths */
|
|
|
|
|
H5RS_decr(ent->user_path_r);
|
|
|
|
|
H5RS_decr(ent->canon_path_r);
|
|
|
|
|
|
|
|
|
|
/* Take ownership of the new user & canonical paths */
|
|
|
|
|
ent->user_path_r=H5RS_own(new_user_path);
|
|
|
|
|
ent->canon_path_r=H5RS_own(new_canon_path);
|
|
|
|
|
|
|
|
|
|
/* Free the extra paths allocated */
|
|
|
|
|
H5MM_xfree(src_canon_prefix);
|
|
|
|
|
H5MM_xfree(dst_canon_prefix);
|
|
|
|
|
H5MM_xfree(user_prefix);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Free the extra paths allocated */
|
|
|
|
|
H5RS_decr(src_path_r);
|
|
|
|
|
H5RS_decr(dst_path_r);
|
|
|
|
|
H5RS_decr(canon_src_path_r);
|
|
|
|
|
H5RS_decr(canon_dst_path_r);
|
|
|
|
|
} /* end if */
|
|
|
|
|
else {
|
|
|
|
|
/* Release the old user path */
|
|
|
|
|
if(ent->user_path_r) {
|
|
|
|
|
H5RS_decr(ent->user_path_r);
|
|
|
|
|
ent->user_path_r = NULL;
|
|
|
|
|
} /* end if */
|
|
|
|
|
} /* end else */
|
2002-09-25 22:50:49 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid call");
|
|
|
|
|
} /* end switch */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-08-29 02:34:12 +08:00
|
|
|
|
done:
|
2005-08-14 04:53:35 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value);
|
2002-08-29 02:34:12 +08:00
|
|
|
|
}
|
|
|
|
|
|
2005-07-06 05:58:50 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_get_shared_count
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Queries the group object's "shared count"
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Tuesday, July 5, 2005
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_get_shared_count(H5G_t *grp)
|
|
|
|
|
{
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_get_shared_count);
|
|
|
|
|
|
|
|
|
|
/* Check args */
|
2005-07-21 22:48:26 +08:00
|
|
|
|
HDassert(grp && grp->shared);
|
2005-07-06 05:58:50 +08:00
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(grp->shared->fo_count);
|
|
|
|
|
} /* end H5G_get_shared_count() */
|
|
|
|
|
|
2005-07-21 22:48:26 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_mount
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Sets the 'mounted' flag for a group
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Tuesday, July 19, 2005
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_mount(H5G_t *grp)
|
|
|
|
|
{
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_mount);
|
|
|
|
|
|
|
|
|
|
/* Check args */
|
|
|
|
|
HDassert(grp && grp->shared);
|
|
|
|
|
HDassert(grp->shared->mounted == FALSE);
|
|
|
|
|
|
|
|
|
|
/* Set the 'mounted' flag */
|
|
|
|
|
grp->shared->mounted = TRUE;
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(SUCCEED);
|
|
|
|
|
} /* end H5G_mount() */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_unmount
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Resets the 'mounted' flag for a group
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Tuesday, July 19, 2005
|
|
|
|
|
*
|
|
|
|
|
* Modifications:
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_unmount(H5G_t *grp)
|
|
|
|
|
{
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_unmount);
|
|
|
|
|
|
|
|
|
|
/* Check args */
|
|
|
|
|
HDassert(grp && grp->shared);
|
|
|
|
|
HDassert(grp->shared->mounted == TRUE);
|
|
|
|
|
|
|
|
|
|
/* Reset the 'mounted' flag */
|
|
|
|
|
grp->shared->mounted = FALSE;
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(SUCCEED);
|
|
|
|
|
} /* end H5G_unmount() */
|
|
|
|
|
|