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
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2000-10-10 15:43:38 +08:00
|
|
|
|
|
2005-09-12 22:29:54 +08:00
|
|
|
|
#define H5F_PACKAGE /*suppress error about including H5Fpkg */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
#define H5G_PACKAGE /*suppress error about including H5Gpkg */
|
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 "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
|
|
|
|
|
|
|
|
|
/* Local typedefs */
|
1997-09-22 10:08:54 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* User data for path traversal routine for "insertion file" routine */
|
|
|
|
|
typedef struct {
|
|
|
|
|
H5F_t *file; /* Pointer to the file for insertion */
|
|
|
|
|
} H5G_trav_ud1_t;
|
|
|
|
|
|
|
|
|
|
/* User data for path traversal routine for moving a link */
|
|
|
|
|
typedef struct {
|
|
|
|
|
H5G_obj_t type; /* Type of object being moved */
|
|
|
|
|
const char *dst_name; /* Destination name for moving object */
|
|
|
|
|
H5G_loc_t *dst_loc; /* Destination location for moving object */
|
|
|
|
|
} H5G_trav_ud2_t;
|
|
|
|
|
|
|
|
|
|
/* User data for path traversal callback to creating link */
|
|
|
|
|
typedef struct {
|
|
|
|
|
H5F_t *file; /* Pointer to the file */
|
|
|
|
|
hid_t dxpl_id; /* Dataset transfer property list */
|
|
|
|
|
H5O_link_t *lnk; /* Pointer to link information to insert */
|
|
|
|
|
} H5G_trav_ud3_t;
|
|
|
|
|
|
|
|
|
|
/* User data for path traversal routine for getting object info */
|
|
|
|
|
typedef struct {
|
|
|
|
|
H5G_stat_t *statbuf; /* Stat buffer about object */
|
|
|
|
|
hbool_t follow_link; /* Whether we are following a link or not */
|
|
|
|
|
hid_t dxpl_id; /* Dataset transfer property list */
|
|
|
|
|
} H5G_trav_ud4_t;
|
|
|
|
|
|
|
|
|
|
/* User data for path traversal routine for getting soft link value */
|
|
|
|
|
typedef struct {
|
|
|
|
|
size_t size; /* Size of user buffer */
|
|
|
|
|
char *buf; /* User buffer */
|
|
|
|
|
} H5G_trav_ud5_t;
|
|
|
|
|
|
|
|
|
|
/* User data for path traversal routine for removing link (i.e. unlink) */
|
|
|
|
|
typedef struct {
|
|
|
|
|
hid_t dxpl_id; /* Dataset transfer property list */
|
|
|
|
|
} H5G_trav_ud6_t;
|
|
|
|
|
|
|
|
|
|
/* User data for path traversal routine for inserting object */
|
|
|
|
|
typedef struct {
|
|
|
|
|
H5G_loc_t *obj_loc; /* Object location */
|
|
|
|
|
hid_t dxpl_id; /* Dataset transfer property list */
|
|
|
|
|
} H5G_trav_ud7_t;
|
2003-05-16 03:22:33 +08:00
|
|
|
|
|
2005-11-07 11:13:53 +08:00
|
|
|
|
/* Package variables */
|
|
|
|
|
|
2003-05-16 03:22:33 +08:00
|
|
|
|
/* Local variables */
|
[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
|
|
|
|
|
2002-08-29 02:34:12 +08:00
|
|
|
|
/* Private prototypes */
|
2005-08-09 05:03:17 +08:00
|
|
|
|
static char * H5G_normalize(const char *name);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static H5G_t *H5G_create(H5G_loc_t *loc, const char *name, hid_t dxpl_id,
|
2005-09-12 22:29:54 +08:00
|
|
|
|
hid_t gcpl_id, hid_t gapl_id);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t H5G_open_oid(H5G_t *grp, hid_t dxpl_id);
|
|
|
|
|
static herr_t H5G_insert_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
|
|
|
|
|
const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/);
|
|
|
|
|
static herr_t H5G_get_objinfo_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
|
|
|
|
|
const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/);
|
2005-12-26 13:28:18 +08:00
|
|
|
|
static herr_t H5G_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
|
|
|
|
|
const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/);
|
|
|
|
|
static herr_t H5G_link_real(H5G_loc_t *link_loc, const char *link_name,
|
|
|
|
|
H5F_t *file, H5O_link_t *lnk, hid_t dxpl_id);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t H5G_link(H5G_loc_t *cur_loc, const char *cur_name,
|
2005-12-26 13:28:18 +08:00
|
|
|
|
H5G_loc_t *link_loc, const char *link_name, H5G_link_t type,
|
2005-11-15 10:55:39 +08:00
|
|
|
|
unsigned traverse_flags, hid_t dxpl_id);
|
|
|
|
|
static herr_t H5G_linkval_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
|
|
|
|
|
const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/);
|
|
|
|
|
static herr_t H5G_linkval(H5G_loc_t *loc, const char *name, size_t size,
|
2005-08-21 03:28:40 +08:00
|
|
|
|
char *buf/*out*/, hid_t dxpl_id);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t H5G_set_comment(H5G_loc_t *loc, const char *name,
|
2005-08-21 03:28:40 +08:00
|
|
|
|
const char *buf, hid_t dxpl_id);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static int H5G_get_comment(H5G_loc_t *loc, const char *name,
|
2005-08-21 03:28:40 +08:00
|
|
|
|
size_t bufsize, char *buf, hid_t dxpl_id);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t H5G_unlink_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
|
|
|
|
|
const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/);
|
|
|
|
|
static herr_t H5G_unlink(H5G_loc_t *loc, const char *name, hid_t dxpl_id);
|
|
|
|
|
static herr_t H5G_move_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
|
|
|
|
|
const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/);
|
|
|
|
|
static herr_t H5G_move(H5G_loc_t *src_loc, const char *src_name,
|
|
|
|
|
H5G_loc_t *dst_loc, const char *dst_name, hid_t dxpl_id);
|
|
|
|
|
static herr_t H5G_insertion_file_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
|
|
|
|
|
const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/);
|
|
|
|
|
static herr_t H5G_copy(H5G_loc_t *src_loc, H5G_loc_t *dst_loc,
|
2005-11-07 11:13:53 +08:00
|
|
|
|
const char *name_dst, hid_t plist_id);
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
|
|
|
|
H5G_t *grp = NULL;
|
|
|
|
|
hid_t tmp_gcpl = (-1); /* Temporary group creation property list */
|
|
|
|
|
hid_t ret_value;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
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-09-12 22:29:54 +08:00
|
|
|
|
/* Check if we need to create a non-standard GCPL */
|
|
|
|
|
if(size_hint > 0) {
|
|
|
|
|
H5P_genplist_t *gc_plist; /* Property list created */
|
|
|
|
|
H5O_ginfo_t ginfo; /* Group info property */
|
|
|
|
|
|
|
|
|
|
/* Get the default property list */
|
|
|
|
|
if(NULL == (gc_plist = H5I_object(H5P_GROUP_CREATE_DEFAULT)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
|
|
|
|
|
|
|
|
|
|
/* Make a copy of the default property list */
|
|
|
|
|
if((tmp_gcpl = H5P_copy_plist(gc_plist)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to copy the creation property list")
|
|
|
|
|
|
|
|
|
|
/* Get the copy of the property list */
|
|
|
|
|
if(NULL == (gc_plist = H5I_object(H5P_GROUP_CREATE_DEFAULT)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
|
|
|
|
|
|
|
|
|
|
/* Get the group info property */
|
|
|
|
|
if(H5P_get(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
|
|
|
|
|
|
|
|
|
|
/* Set the non-default local heap size hint */
|
|
|
|
|
ginfo.lheap_size_hint = size_hint;
|
|
|
|
|
if(H5P_set(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set group info")
|
2005-09-12 22:29:54 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
else
|
|
|
|
|
tmp_gcpl = H5P_GROUP_CREATE_DEFAULT;
|
|
|
|
|
|
1998-01-17 06:23:43 +08:00
|
|
|
|
/* Create the group */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(NULL == (grp = H5G_create(&loc, name, H5AC_dxpl_id, tmp_gcpl, H5P_DEFAULT)))
|
|
|
|
|
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")
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-09-12 22:29:54 +08:00
|
|
|
|
if(tmp_gcpl > 0 && tmp_gcpl != H5P_GROUP_CREATE_DEFAULT)
|
|
|
|
|
if(H5I_dec_ref(tmp_gcpl) < 0)
|
|
|
|
|
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release property list")
|
|
|
|
|
|
|
|
|
|
if(ret_value < 0) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
if(grp!=NULL)
|
|
|
|
|
H5G_close(grp);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gcreate() */
|
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
|
2005-09-12 22:29:54 +08:00
|
|
|
|
H5Gcreate_expand(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t gapl_id)
|
2005-06-21 02:11:57 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
|
|
|
|
H5G_t *grp = NULL;
|
|
|
|
|
hid_t ret_value;
|
2005-06-21 02:11:57 +08:00
|
|
|
|
|
|
|
|
|
FUNC_ENTER_API(H5Gcreate_expand, FAIL)
|
2005-11-18 23:55:22 +08:00
|
|
|
|
H5TRACE4("i","isii",loc_id,name,gcpl_id,gapl_id);
|
2005-06-21 02:11:57 +08:00
|
|
|
|
|
|
|
|
|
/* Check arguments */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
|
|
|
|
|
if(!name || !*name)
|
2005-06-21 02:11:57 +08:00
|
|
|
|
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 */
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(NULL == (grp = H5G_create(&loc, name, H5AC_dxpl_id, gcpl_id, gapl_id)))
|
2005-06-21 02:11:57 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
|
2005-06-21 02:11:57 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
|
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(ret_value < 0) {
|
2005-06-21 02:11:57 +08:00
|
|
|
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
[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;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
|
|
|
|
H5G_loc_t grp_loc; /* Location used to open group */
|
|
|
|
|
H5G_name_t grp_path; /* Opened object group hier. path */
|
|
|
|
|
H5O_loc_t grp_oloc; /* Opened object object location */
|
|
|
|
|
hbool_t ent_found = FALSE; /* Entry at 'name' found */
|
|
|
|
|
hid_t ret_value = FAIL;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
|
|
|
|
|
if(!name || !*name)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
|
|
|
|
|
|
|
|
|
|
/* Set up opened group location to fill in */
|
|
|
|
|
grp_loc.oloc = &grp_oloc;
|
|
|
|
|
grp_loc.path = &grp_path;
|
|
|
|
|
H5G_loc_reset(&grp_loc);
|
[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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Find the group object */
|
|
|
|
|
if(H5G_loc_find(&loc, name, &grp_loc/*out*/, H5AC_dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
|
|
|
|
|
ent_found = TRUE;
|
|
|
|
|
|
|
|
|
|
/* Check that the object found is the correct type */
|
|
|
|
|
if(H5O_obj_type(&grp_oloc, H5AC_dxpl_id) != H5G_GROUP)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "not a group")
|
[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
|
|
|
|
/* Open the group */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((grp = H5G_open(&grp_loc, H5AC_dxpl_id)) == NULL)
|
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(ret_value < 0) {
|
|
|
|
|
if(grp != NULL)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
H5G_close(grp);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
else {
|
|
|
|
|
if(ent_found)
|
|
|
|
|
H5G_name_free(&grp_path);
|
|
|
|
|
} /* end else */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* H5Gopen() */
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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-11-15 10:55:39 +08:00
|
|
|
|
int last_obj; /* Index of last object looked at */
|
|
|
|
|
int idx; /* Internal location to hold index */
|
|
|
|
|
herr_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +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);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(idx < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
|
|
|
|
|
if(!op)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no operator specified")
|
2005-08-11 04:28:32 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set number of objects looked at to zero */
|
|
|
|
|
last_obj = 0;
|
1998-03-24 22:53:57 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Call private function. */
|
|
|
|
|
if((ret_value = H5G_obj_iterate(loc_id, name, idx, &last_obj, op, op_data, H5AC_ind_dxpl_id)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group iteration failed")
|
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) */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(idx > 0 && idx >= last_obj)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
|
2000-04-06 04:51:27 +08:00
|
|
|
|
|
|
|
|
|
/* Set the index we stopped at */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(idx_p)
|
|
|
|
|
*idx_p=last_obj;
|
2000-04-06 04:51:27 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Giterate() */
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc; /* Location of object */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
herr_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
|
|
|
|
|
if(H5O_obj_type(loc.oloc, H5AC_ind_dxpl_id) != H5G_GROUP)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
|
|
|
|
|
if(!num_objs)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "nil pointer")
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
/* Call private function. */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((ret_value = H5G_obj_count(loc.oloc, num_objs, H5AC_ind_dxpl_id)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "can't determine ")
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gget_num_objs() */
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc; /* Object location */
|
|
|
|
|
ssize_t ret_value;
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
|
|
|
|
|
if(H5O_obj_type(loc.oloc, H5AC_ind_dxpl_id) != H5G_GROUP)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Call internal function*/
|
|
|
|
|
if((ret_value = H5G_obj_get_name_by_idx(loc.oloc, idx, name, size, H5AC_ind_dxpl_id)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "can't get object name")
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gget_objname_by_idx() */
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc; /* Object location */
|
2003-05-10 02:18:21 +08:00
|
|
|
|
H5G_obj_t ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location ID")
|
|
|
|
|
if(H5O_obj_type(loc.oloc, H5AC_ind_dxpl_id) != H5G_GROUP)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a group")
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Call internal function*/
|
|
|
|
|
if((ret_value = H5G_obj_get_type_by_idx(loc.oloc, idx, H5AC_ind_dxpl_id)) == H5G_UNKNOWN)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "can't get object type")
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gget_objtype_by_idx() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t src_loc, *src_loc_p;
|
|
|
|
|
H5G_loc_t dst_loc, *dst_loc_p;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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);
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(src_loc_id != H5G_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
|
|
|
|
|
if(dst_loc_id != H5G_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
|
|
|
|
|
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")
|
|
|
|
|
|
|
|
|
|
/* Set up src & dst location pointers */
|
|
|
|
|
src_loc_p = &src_loc;
|
|
|
|
|
dst_loc_p = &dst_loc;
|
|
|
|
|
if(src_loc_id == H5G_SAME_LOC && dst_loc_id == H5G_SAME_LOC)
|
|
|
|
|
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)
|
|
|
|
|
src_loc_p = dst_loc_p;
|
|
|
|
|
else if(dst_loc_id == H5G_SAME_LOC)
|
|
|
|
|
dst_loc_p = src_loc_p;
|
|
|
|
|
else if(src_loc_p->oloc->file != dst_loc_p->oloc->file)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.")
|
|
|
|
|
|
|
|
|
|
if(H5G_move(src_loc_p, src_name, dst_loc_p, dst_name, H5AC_dxpl_id) < 0)
|
|
|
|
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gmove2() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t cur_loc, *cur_loc_p;
|
|
|
|
|
H5G_loc_t new_loc, *new_loc_p;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2002-04-27 04:34:46 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(cur_loc_id != H5G_SAME_LOC && H5G_loc(cur_loc_id, &cur_loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
|
|
|
|
|
if(new_loc_id != H5G_SAME_LOC && H5G_loc(new_loc_id, &new_loc) < 0)
|
|
|
|
|
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")
|
|
|
|
|
|
|
|
|
|
/* Set up current & new location pointers */
|
|
|
|
|
cur_loc_p = &cur_loc;
|
|
|
|
|
new_loc_p = &new_loc;
|
|
|
|
|
if(cur_loc_id == H5G_SAME_LOC && new_loc_id == H5G_SAME_LOC)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not be both H5G_SAME_LOC")
|
|
|
|
|
else if(cur_loc_id == H5G_SAME_LOC)
|
|
|
|
|
cur_loc_p = new_loc_p;
|
|
|
|
|
else if(new_loc_id == H5G_SAME_LOC)
|
|
|
|
|
new_loc_p = cur_loc_p;
|
|
|
|
|
else if(cur_loc_p->oloc->file != new_loc_p->oloc->file)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.")
|
|
|
|
|
|
|
|
|
|
if(H5G_link(cur_loc_p, cur_name, new_loc_p, new_name, type, H5G_TARGET_NORMAL, H5AC_dxpl_id) < 0)
|
|
|
|
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Glink2() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
herr_t ret_value=SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_unlink(&loc, name, H5AC_dxpl_id) < 0)
|
|
|
|
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gunlink() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_get_objinfo(&loc, name, follow_link, statbuf, H5AC_ind_dxpl_id) < 0)
|
|
|
|
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gget_objinfo() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc))
|
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_linkval(&loc, name, size, buf, H5AC_ind_dxpl_id) < 0)
|
|
|
|
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gget_linkval() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_API(H5Gset_comment, FAIL)
|
1998-07-21 05:01:32 +08:00
|
|
|
|
H5TRACE3("e","iss",loc_id,name,comment);
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_set_comment(&loc, name, comment, H5AC_dxpl_id) < 0)
|
|
|
|
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gset_comment() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
[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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t loc;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
int ret_value;
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(loc_id, &loc) < 0)
|
|
|
|
|
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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((ret_value = H5G_get_comment(&loc, name, bufsize, buf, H5AC_ind_dxpl_id)) < 0)
|
|
|
|
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gget_comment() */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gget_create_plist
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Returns a copy of the group creation property list.
|
|
|
|
|
*
|
|
|
|
|
* Return: Success: ID for a copy of the group creation
|
|
|
|
|
* property list. The property list ID should be
|
|
|
|
|
* released by calling H5Pclose().
|
|
|
|
|
*
|
|
|
|
|
* Failure: FAIL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Tuesday, October 25, 2005
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
hid_t
|
|
|
|
|
H5Gget_create_plist(hid_t group_id)
|
|
|
|
|
{
|
|
|
|
|
htri_t ginfo_exists = 0;
|
|
|
|
|
H5G_t *grp = NULL;
|
|
|
|
|
H5P_genplist_t *gcpl_plist;
|
|
|
|
|
H5P_genplist_t *new_plist;
|
|
|
|
|
hid_t new_gcpl_id = FAIL;
|
|
|
|
|
hid_t ret_value = FAIL;
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_API(H5Gget_create_plist, FAIL)
|
2005-11-18 23:55:22 +08:00
|
|
|
|
H5TRACE1("i","i",group_id);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
|
|
|
|
if(NULL == (grp = H5I_object_verify(group_id, H5I_GROUP)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
|
|
|
|
|
|
|
|
|
|
/* Copy the default group creation property list */
|
|
|
|
|
if(NULL == (gcpl_plist = H5I_object(H5P_LST_GROUP_CREATE_g)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get default group creation property list")
|
|
|
|
|
if((new_gcpl_id = H5P_copy_plist(gcpl_plist)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to copy the creation property list")
|
|
|
|
|
if(NULL == (new_plist = H5I_object(new_gcpl_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
|
|
|
|
|
|
|
|
|
|
/* Check for the group having a group info message */
|
|
|
|
|
if((ginfo_exists = H5O_exists(&(grp->oloc), H5O_GINFO_ID, 0, H5AC_dxpl_id)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
|
|
|
|
|
if(ginfo_exists) {
|
|
|
|
|
H5O_ginfo_t ginfo; /* Group info message */
|
|
|
|
|
|
|
|
|
|
/* Read the group info */
|
|
|
|
|
if(NULL == H5O_read(&(grp->oloc), H5O_GINFO_ID, 0, &ginfo, H5AC_dxpl_id))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get group info")
|
|
|
|
|
|
|
|
|
|
/* Set the group info for the property list */
|
|
|
|
|
if(H5P_set(new_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set group info")
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
/* Set the return value */
|
|
|
|
|
ret_value = new_gcpl_id;
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
if(ret_value < 0) {
|
|
|
|
|
if(new_gcpl_id > 0)
|
|
|
|
|
(void)H5I_dec_ref(new_gcpl_id);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gget_create_plist() */
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2005-11-07 11:13:53 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5Gcopy
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Copy an object to destination location
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Peter Cao
|
|
|
|
|
* June 4, 2005
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5Gcopy(hid_t src_id, hid_t dst_id, const char *name_dst, hid_t plist_id)
|
2005-11-07 11:13:53 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_t src_loc; /* Source object group location */
|
|
|
|
|
H5G_loc_t dst_loc; /* Destination group location */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-11-07 11:13:53 +08:00
|
|
|
|
|
|
|
|
|
FUNC_ENTER_API(H5Gcopy, FAIL)
|
2005-11-18 23:55:22 +08:00
|
|
|
|
H5TRACE4("e","iisi",src_id,dst_id,name_dst,plist_id);
|
2005-11-07 11:13:53 +08:00
|
|
|
|
|
|
|
|
|
/* Check arguments */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_loc(src_id, &src_loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
|
|
|
|
|
if(H5G_loc(dst_id, &dst_loc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
|
2005-11-07 11:13:53 +08:00
|
|
|
|
if(!name_dst || !*name_dst)
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
|
|
|
|
|
|
|
|
|
|
/* Get correct property list */
|
|
|
|
|
/* XXX: This is a kludge, to use the datatype creation property list - QAK */
|
|
|
|
|
if(H5P_DEFAULT == plist_id)
|
|
|
|
|
plist_id = H5P_DATATYPE_CREATE_DEFAULT;
|
|
|
|
|
else
|
|
|
|
|
if(TRUE != H5P_isa_class(plist_id, H5P_DATATYPE_CREATE))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not object create property list")
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_copy(&src_loc, &dst_loc, name_dst, plist_id) < 0)
|
2005-11-07 11:13:53 +08:00
|
|
|
|
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_API(ret_value)
|
|
|
|
|
} /* end H5Gcopy() */
|
|
|
|
|
|
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
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Notes: The group creation properties are registered in the property
|
|
|
|
|
* list interface initialization routine (H5P_init_interface)
|
|
|
|
|
* so that the file creation property class can inherit from it
|
|
|
|
|
* correctly. (Which allows the file creation property list to
|
|
|
|
|
* control the group creation properties of the root group of
|
|
|
|
|
* a file) QAK - 24/10/2005
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
H5P_genclass_t *crt_pclass;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
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
|
|
|
|
|
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")
|
|
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
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
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
int n = 0;
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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) {
|
2005-11-15 10:55:39 +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 {
|
|
|
|
|
/* 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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_traverse_term_interface();
|
2002-03-29 03:27:38 +08:00
|
|
|
|
|
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*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end else */
|
|
|
|
|
} /* end if */
|
[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-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(n)
|
|
|
|
|
} /* end H5G_term_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
|
|
|
|
|
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
|
|
|
|
*
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(name)
|
|
|
|
|
} /* end H5G_component() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_mkroot
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +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
|
|
|
|
|
* returns. If ENT is non-null then it's the symbol table
|
|
|
|
|
* 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
|
|
|
|
*
|
2005-11-15 10:55:39 +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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t
|
|
|
|
|
H5G_mkroot(H5F_t *f, hid_t dxpl_id, H5G_loc_t *loc)
|
1997-08-13 06:44:46 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5O_loc_t new_root_oloc; /* New root object location */
|
|
|
|
|
H5G_name_t new_root_path; /* New root path */
|
|
|
|
|
H5G_loc_t new_root_loc; /* New root location information */
|
|
|
|
|
H5G_loc_t root_loc; /* Root location information */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_mkroot, FAIL)
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* check args */
|
|
|
|
|
HDassert(f);
|
|
|
|
|
if(f->shared->root_grp)
|
|
|
|
|
HGOTO_DONE(SUCCEED)
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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")
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
1998-03-25 07:18:34 +08:00
|
|
|
|
/*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* If there is no root object then create one. The root group always starts
|
|
|
|
|
* with a hard link count of one since it's pointed to by the boot block.
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if (loc == NULL) {
|
|
|
|
|
H5P_genplist_t *fc_plist; /* File creation property list */
|
|
|
|
|
H5O_ginfo_t ginfo; /* Group info parameters */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Get the file creation property list */
|
|
|
|
|
/* (Which is a sub-class of the group creation property class) */
|
|
|
|
|
if(NULL == (fc_plist = H5I_object(f->shared->fcpl_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Get the group info property */
|
|
|
|
|
if(H5P_get(fc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get group info")
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set up group location for root group */
|
|
|
|
|
new_root_loc.oloc = &new_root_oloc;
|
|
|
|
|
new_root_loc.path = &new_root_path;
|
|
|
|
|
H5G_loc_reset(&new_root_loc);
|
|
|
|
|
loc = &new_root_loc;
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_obj_create(f, dxpl_id, &ginfo, loc->oloc/*out*/) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group entry")
|
|
|
|
|
if(1 != H5O_link(loc->oloc, 1, dxpl_id))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_LINK, FAIL, "internal error (wrong link count)")
|
|
|
|
|
} else {
|
1998-03-25 07:18:34 +08:00
|
|
|
|
/*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Open the root object as a group.
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_open(loc->oloc) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open root group")
|
|
|
|
|
} /* end else */
|
1998-01-28 13:47:19 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Create the path names for the root group's entry */
|
|
|
|
|
H5G_name_init(loc->path, "/");
|
1998-01-28 13:47:19 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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.
|
|
|
|
|
*/
|
|
|
|
|
if(NULL == (f->shared->root_grp = H5FL_CALLOC(H5G_t)))
|
|
|
|
|
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")
|
|
|
|
|
} /* end if */
|
2002-08-31 05:59:22 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Shallow copy (take ownership) of the group object info */
|
|
|
|
|
root_loc.oloc = &(f->shared->root_grp->oloc);
|
|
|
|
|
root_loc.path = &(f->shared->root_grp->path);
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5G_loc_copy(&root_loc, loc, H5_COPY_SHALLOW) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "can't copy group object location")
|
2005-09-12 14:02: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
|
|
|
|
f->shared->root_grp->shared->fo_count = 1;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(1 == f->nopen_objs);
|
1998-10-15 03:35:08 +08:00
|
|
|
|
f->nopen_objs = 0;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_mkroot() */
|
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
|
|
|
|
*
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static H5G_t *
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_create(H5G_loc_t *loc, const char *name,
|
2005-06-21 02:11:57 +08:00
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5O_ginfo_t ginfo; /* Group info */
|
|
|
|
|
unsigned oloc_init = 0; /* Flag to indicate that the group object location was created successfully */
|
|
|
|
|
H5G_loc_t grp_loc; /* Group location wrapper structure */
|
2003-06-19 04:41:28 +08:00
|
|
|
|
H5G_t *ret_value; /* Return value */
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_create)
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* check args */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(loc);
|
|
|
|
|
HDassert(name && *name);
|
|
|
|
|
HDassert(gcpl_id != H5P_DEFAULT);
|
2005-06-21 02:11:57 +08:00
|
|
|
|
#ifdef LATER
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(gapl_id != H5P_DEFAULT);
|
2005-06-21 02:11:57 +08:00
|
|
|
|
#endif /* LATER */
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* create an open group */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(NULL == (grp = H5FL_CALLOC(H5G_t)))
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
|
|
|
|
|
if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
|
[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
|
|
|
|
|
[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? */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(NULL == (file = H5G_insertion_file(loc, name, dxpl_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to locate insertion point")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-06-21 02:11:57 +08:00
|
|
|
|
/* Get the property list */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(NULL == (gc_plist = H5I_object(gcpl_id)))
|
2005-06-21 02:11:57 +08:00
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Get the group info property */
|
|
|
|
|
if(H5P_get(gc_plist, H5G_CRT_GROUP_INFO_NAME, &ginfo) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get group info")
|
|
|
|
|
|
|
|
|
|
/* Create the group object header */
|
|
|
|
|
if(H5G_obj_create(file, dxpl_id, &ginfo, &(grp->oloc)/*out*/) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group object header")
|
|
|
|
|
oloc_init = 1; /* Indicate that the object location information is valid */
|
|
|
|
|
|
|
|
|
|
/* Insert child name into parent */
|
|
|
|
|
grp_loc.oloc = &(grp->oloc);
|
|
|
|
|
grp_loc.path = &(grp->path);
|
|
|
|
|
if(H5G_insert(loc, name, &grp_loc, dxpl_id, gc_plist) < 0)
|
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't incr object ref. count")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared) < 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 into list of open objects")
|
|
|
|
|
|
|
|
|
|
grp->shared->fo_count = 1;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
/* Set return value */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
ret_value = grp;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(oloc_init) {
|
|
|
|
|
if(H5O_close(&(grp->oloc)) < 0)
|
|
|
|
|
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "unable to release object header")
|
|
|
|
|
if(H5O_delete(file, dxpl_id, grp->oloc.addr) < 0)
|
|
|
|
|
HDONE_ERROR(H5E_SYM, H5E_CANTDELETE, NULL, "unable to delete object header")
|
2003-06-19 04:41:28 +08:00
|
|
|
|
} /* end if */
|
2005-11-15 10:55:39 +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);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end if */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_create() */
|
[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-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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
1998-02-27 02:05:27 +08:00
|
|
|
|
H5G_t *
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_open(H5G_loc_t *loc, 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;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_shared_t *shared_fo = NULL;
|
|
|
|
|
H5G_t *ret_value = NULL;
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_open, NULL)
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(loc);
|
|
|
|
|
|
|
|
|
|
/* Allocate the group structure */
|
|
|
|
|
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 location object */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5O_loc_copy(&(grp->oloc), loc->oloc, H5_COPY_SHALLOW) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy object location")
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5G_name_copy(&(grp->path), loc->path, H5_COPY_SHALLOW) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy path")
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((shared_fo = H5FO_opened(grp->oloc.file, grp->oloc.addr)) == 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
|
|
|
|
|
|
|
|
|
/* 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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_open_oid(grp, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "not found")
|
[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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared) < 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
|
|
|
|
H5FL_FREE(H5G_shared_t, grp->shared);
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end if */
|
[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
|
|
|
|
|
2005-10-03 13:50:05 +08:00
|
|
|
|
/* Increment object count for the object in the top file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
|
|
|
|
|
|
2005-07-21 22:48:26 +08:00
|
|
|
|
/* Set open object count */
|
|
|
|
|
grp->shared->fo_count = 1;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end if */
|
[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 {
|
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++;
|
2005-10-03 13:50:05 +08:00
|
|
|
|
|
|
|
|
|
/* Check if the object has been opened through the top file yet */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
|
2005-10-03 13:50:05 +08:00
|
|
|
|
/* Open the object through this top file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_open(&(grp->oloc)) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object header")
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
/* Increment object count for the object in the top file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end else */
|
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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_open() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_open_oid(H5G_t *grp, hid_t dxpl_id)
|
1999-03-18 08:07:50 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
hbool_t obj_opened = FALSE;
|
|
|
|
|
herr_t ret_value = SUCCEED;
|
1999-03-18 08:07:50 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_open_oid)
|
1999-03-18 08:07:50 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(grp);
|
1999-03-18 08:07:50 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Allocate the shared information for the group */
|
|
|
|
|
if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
|
|
|
|
|
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
|
1999-03-18 08:07:50 +08:00
|
|
|
|
|
|
|
|
|
/* Grab the object header */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_open(&(grp->oloc)) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
|
|
|
|
|
obj_opened = TRUE;
|
2005-09-12 22:29:54 +08:00
|
|
|
|
|
|
|
|
|
/* Check if this object has the right message(s) to be treated as a group */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_exists(&(grp->oloc), H5O_STAB_ID, 0, dxpl_id) <= 0
|
|
|
|
|
&& H5O_exists(&(grp->oloc), H5O_LINFO_ID, 0, dxpl_id) <= 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "not a group")
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(ret_value < 0) {
|
|
|
|
|
if(obj_opened)
|
|
|
|
|
H5O_close(&(grp->oloc));
|
|
|
|
|
if(grp->shared)
|
|
|
|
|
H5FL_FREE(H5G_shared_t, grp->shared);
|
2005-09-12 22:29:54 +08:00
|
|
|
|
} /* end if */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_open_oid() */
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
1998-01-17 06:23:43 +08:00
|
|
|
|
H5G_close(H5G_t *grp)
|
1998-01-06 11:07:15 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(grp && grp->shared);
|
|
|
|
|
HDassert(grp->shared->fo_count > 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
|
|
|
|
|
|
|
|
|
--grp->shared->fo_count;
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(0 == grp->shared->fo_count) {
|
|
|
|
|
HDassert(grp != H5G_rootof(H5G_fileof(grp)));
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
2005-10-03 13:50:05 +08:00
|
|
|
|
/* Remove the group from the list of opened objects in the file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_delete(grp->oloc.file, H5AC_dxpl_id, grp->oloc.addr) < 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_CANTRELEASE, FAIL, "can't remove group from list of open objects")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_close(&(grp->oloc)) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5FL_FREE(H5G_shared_t, grp->shared);
|
1998-05-02 05:16:06 +08:00
|
|
|
|
} else {
|
2005-10-03 13:50:05 +08:00
|
|
|
|
/* Decrement the ref. count for this object in the top file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
|
|
|
|
|
|
|
|
|
|
/* Check reference count for this object in the top file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0)
|
|
|
|
|
if(H5O_close(&(grp->oloc)) < 0)
|
2005-10-03 13:50:05 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
|
|
|
|
|
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5F_try_close(grp->oloc.file) < 0)
|
2005-07-21 22:48:26 +08:00
|
|
|
|
HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problem attempting file close")
|
|
|
|
|
} /* end if */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end else */
|
2005-07-06 05:58:50 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_name_free(&(grp->path)) < 0) {
|
|
|
|
|
H5FL_FREE(H5G_t,grp);
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't free group entry name")
|
|
|
|
|
} /* end if */
|
1998-01-06 11:07:15 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_free(H5G_t *grp)
|
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2004-12-29 22:26:20 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_free, 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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(grp && grp->shared);
|
[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_shared_t, grp->shared);
|
|
|
|
|
H5FL_FREE(H5G_t, grp);
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_free() */
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_t *
|
1998-10-14 01:17:50 +08:00
|
|
|
|
H5G_rootof(H5F_t *f)
|
1997-10-21 07:14:35 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_rootof)
|
2002-08-10 04:48:23 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
while(f->mtab.parent)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
f = f->mtab.parent;
|
2002-08-10 04:48:23 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(f->shared->root_grp)
|
|
|
|
|
} /* end H5G_rootof() */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1997-08-13 06:44:46 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_oloc
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Returns a pointer to the object location for a group.
|
1998-01-06 11:07:15 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Success: Ptr to group entry
|
|
|
|
|
* Failure: NULL
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Tuesday, March 24, 1998
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
H5O_loc_t *
|
|
|
|
|
H5G_oloc(H5G_t *grp)
|
|
|
|
|
{
|
|
|
|
|
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_oloc)
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(grp ? &(grp->oloc) : NULL)
|
|
|
|
|
} /* end H5G_oloc() */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_nameof
|
1997-08-13 06:44:46 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Returns a pointer to the hier. name for a group.
|
2002-09-18 23:51:29 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Success: Ptr to hier. name
|
|
|
|
|
* Failure: NULL
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Monday, September 12, 2005
|
2005-06-21 02:11:57 +08:00
|
|
|
|
*
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_name_t *
|
|
|
|
|
H5G_nameof(H5G_t *grp)
|
1997-08-13 06:44:46 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_nameof)
|
1998-01-17 06:23:43 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(grp ? &(grp->path) : NULL)
|
|
|
|
|
} /* end H5G_nameof() */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
1997-07-31 05:17:56 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_fileof
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Returns the file to which the specified group belongs.
|
1997-09-02 23:38:26 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Success: File pointer.
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Failure: NULL
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
1998-01-28 13:47:19 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Tuesday, March 24, 1998
|
1997-07-31 05:17:56 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5F_t *
|
|
|
|
|
H5G_fileof(H5G_t *grp)
|
1997-07-31 05:17:56 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_fileof)
|
1997-08-08 03:23:00 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(grp);
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(grp->oloc.file)
|
|
|
|
|
} /* end H5G_fileof() */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_insert_cb
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Path traversal callback for inserting an object in a group.
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Tuesday, September 13, 2005
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_insert_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t UNUSED *lnk,
|
|
|
|
|
H5G_loc_t *obj_loc, void *_udata/*in,out*/)
|
1998-03-25 07:18:34 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud7_t *udata = (H5G_trav_ud7_t *)_udata; /* User data passed in */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_insert_cb)
|
|
|
|
|
|
|
|
|
|
/* Check for object using name already */
|
|
|
|
|
if(obj_loc != NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name already exists")
|
|
|
|
|
|
|
|
|
|
/* Insert object into group */
|
|
|
|
|
if(H5G_loc_insert(grp_loc, name, udata->obj_loc, TRUE, udata->dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert name")
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
if(ret_value < 0) {
|
|
|
|
|
/* Release the group location for the object */
|
|
|
|
|
/* (Group traversal callbacks are responsible for either taking ownership
|
|
|
|
|
* of the group location for the object, or freeing it. - QAK)
|
|
|
|
|
*/
|
|
|
|
|
if(obj_loc)
|
|
|
|
|
H5G_loc_free(obj_loc);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_insert_cb() */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_insert
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Inserts a symbol table entry into the group graph.
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
|
|
|
|
* Programmer: Robb Matzke
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Friday, September 19, 1997
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t
|
|
|
|
|
H5G_insert(H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc, hid_t dxpl_id, H5P_genplist_t *oc_plist)
|
1998-03-25 07:18:34 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud7_t udata; /* User data for callback routine */
|
|
|
|
|
unsigned target_flags = H5G_TARGET_NORMAL;
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_insert, FAIL)
|
2002-05-29 02:17:12 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Check args. */
|
|
|
|
|
HDassert(loc);
|
|
|
|
|
HDassert(name && *name);
|
|
|
|
|
HDassert(obj_loc);
|
|
|
|
|
|
|
|
|
|
/* 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_flags |= H5G_CRT_INTMD_GROUP;
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
|
|
|
|
/* Set up user data callback for path traversal */
|
|
|
|
|
udata.obj_loc = obj_loc;
|
|
|
|
|
udata.dxpl_id = dxpl_id;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Lookup and insert the name -- it shouldn't exist yet.
|
|
|
|
|
*/
|
|
|
|
|
if(H5G_traverse(loc, name, target_flags, H5G_insert_cb, &udata, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "can't insert object in group")
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_insert() */
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_link_cb
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Callback for creating a link to an object.
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Monday, September 19, 2005
|
1998-03-25 07:18:34 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t UNUSED *lnk,
|
|
|
|
|
H5G_loc_t *obj_loc, void *_udata/*in,out*/)
|
1998-03-25 07:18:34 +08:00
|
|
|
|
{
|
2005-12-26 13:28:18 +08:00
|
|
|
|
char *old_link_name; /* Pointer to hold the old link name */
|
|
|
|
|
hbool_t old_link_name_set = FALSE; /* Indicate that we've replaced the old link name */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud3_t *udata = (H5G_trav_ud3_t *)_udata; /* User data passed in */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_link_cb)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Check if the name in this group resolved to a valid location */
|
|
|
|
|
/* (which is not what we want) */
|
|
|
|
|
if(obj_loc != NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name already exists")
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Check for crossing file boundaries with a new hard link */
|
|
|
|
|
if(udata->lnk->type == H5G_LINK_HARD) {
|
|
|
|
|
/* Check that both objects are in same file */
|
|
|
|
|
if(grp_loc->oloc->file->shared != udata->file->shared)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_LINK, FAIL, "interfile hard links are not allowed")
|
|
|
|
|
} /* end if */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set the link's name correctly */
|
|
|
|
|
/* Casting away const OK -QAK */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
old_link_name = udata->lnk->name;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
udata->lnk->name = name;
|
2005-12-26 13:28:18 +08:00
|
|
|
|
old_link_name_set = TRUE;
|
2003-08-09 03:12:58 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Insert link into group */
|
|
|
|
|
if(H5G_obj_insert(grp_loc->oloc, name, udata->lnk, (hbool_t)(udata->lnk->type == H5G_LINK_HARD ? TRUE : FALSE), udata->dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create new name/link for object")
|
1998-03-25 07:18:34 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(ret_value < 0) {
|
|
|
|
|
/* Release the group location for the object */
|
|
|
|
|
/* (Group traversal callbacks are responsible for either taking ownership
|
|
|
|
|
* of the group location for the object, or freeing it. - QAK)
|
|
|
|
|
*/
|
|
|
|
|
if(obj_loc)
|
|
|
|
|
H5G_loc_free(obj_loc);
|
|
|
|
|
} /* end if */
|
|
|
|
|
|
2005-12-26 13:28:18 +08:00
|
|
|
|
/* Return the link's name to it's original value */
|
|
|
|
|
if(old_link_name_set)
|
|
|
|
|
udata->lnk->name = old_link_name;
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_link_cb() */
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2005-12-26 13:28:18 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_link_real
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Creates a link at a path location
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Monday, December 5, 2005
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static herr_t
|
|
|
|
|
H5G_link_real(H5G_loc_t *link_loc, const char *link_name, H5F_t *file,
|
|
|
|
|
H5O_link_t *lnk, hid_t dxpl_id)
|
|
|
|
|
{
|
|
|
|
|
H5G_trav_ud3_t udata; /* User data for callback */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_link_real)
|
|
|
|
|
|
|
|
|
|
/* Check args */
|
|
|
|
|
HDassert(link_loc);
|
|
|
|
|
HDassert(link_name && *link_name);
|
|
|
|
|
HDassert(lnk);
|
|
|
|
|
|
|
|
|
|
/* Set up user data */
|
|
|
|
|
udata.file = file;
|
|
|
|
|
udata.lnk = lnk;
|
|
|
|
|
udata.dxpl_id = dxpl_id;
|
|
|
|
|
|
|
|
|
|
/* Traverse the destination path & create new link */
|
|
|
|
|
if(H5G_traverse(link_loc, link_name, H5G_TARGET_NORMAL, H5G_link_cb, &udata, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert link")
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_link_real() */
|
|
|
|
|
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
2005-12-26 13:28:18 +08:00
|
|
|
|
H5G_link(H5G_loc_t *cur_loc, const char *cur_name,
|
|
|
|
|
H5G_loc_t *link_loc, const char *link_name,
|
|
|
|
|
H5G_link_t type, unsigned traverse_flags, hid_t dxpl_id)
|
1998-04-07 23:34:16 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
char *norm_cur_name = NULL; /* Pointer to normalized current name */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
char *norm_link_name = NULL; /* Pointer to normalized link name */
|
|
|
|
|
H5F_t *link_file = NULL; /* Pointer to file to link to */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5O_link_t lnk; /* Link to insert */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_link)
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
|
|
|
|
/* Check args */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(cur_loc);
|
2005-12-26 13:28:18 +08:00
|
|
|
|
HDassert(link_loc);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(cur_name && *cur_name);
|
2005-12-26 13:28:18 +08:00
|
|
|
|
HDassert(link_name && *link_name);
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2003-08-17 02:54:40 +08:00
|
|
|
|
/* Get normalized copies of the current and new names */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((norm_cur_name = H5G_normalize(cur_name)) == NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name")
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if((norm_link_name = H5G_normalize(link_name)) == NULL)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name")
|
2003-08-17 02:54:40 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
switch(type) {
|
2002-08-09 00:52:55 +08:00
|
|
|
|
case H5G_LINK_HARD:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
{
|
|
|
|
|
H5O_loc_t obj_oloc; /* Location of object to link to */
|
|
|
|
|
|
|
|
|
|
/* Get object location for object pointed to */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5G_obj_find(cur_loc, norm_cur_name, traverse_flags, NULL, &obj_oloc, dxpl_id) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "source object not found")
|
|
|
|
|
|
|
|
|
|
/* Construct link information for eventual insertion */
|
|
|
|
|
lnk.u.hard.addr = obj_oloc.addr;
|
|
|
|
|
|
2005-12-26 13:28:18 +08:00
|
|
|
|
/* Set destination's file information */
|
|
|
|
|
link_file = obj_oloc.file;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end case */
|
2002-08-09 00:52:55 +08:00
|
|
|
|
break;
|
|
|
|
|
|
2005-12-26 13:28:18 +08:00
|
|
|
|
case H5G_LINK_SOFT:
|
|
|
|
|
/* Construct link information for eventual insertion */
|
|
|
|
|
lnk.u.soft.name = norm_cur_name;
|
|
|
|
|
|
|
|
|
|
/* Set destination's file information */
|
|
|
|
|
link_file = NULL; /* no file info necessary for soft link */
|
|
|
|
|
break;
|
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
default:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
|
|
|
|
|
} /* end switch */
|
|
|
|
|
|
|
|
|
|
/* Set up common link data */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
lnk.type = type;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
#ifdef H5_HAVE_GETTIMEOFDAY
|
|
|
|
|
{
|
|
|
|
|
struct timeval now_tv;
|
|
|
|
|
|
|
|
|
|
HDgettimeofday(&now_tv, NULL);
|
|
|
|
|
lnk.ctime = now_tv.tv_sec;
|
1998-04-07 23:34:16 +08:00
|
|
|
|
}
|
2005-11-15 10:55:39 +08:00
|
|
|
|
#else /* H5_HAVE_GETTIMEOFDAY */
|
|
|
|
|
lnk.ctime = HDtime(NULL);
|
|
|
|
|
#endif /* H5_HAVE_GETTIMEOFDAY */
|
|
|
|
|
lnk.cset = H5T_CSET_ASCII; /* XXX: Allow user to set this */
|
|
|
|
|
/* lnk.name = name; */ /* This will be set in callback */
|
1998-04-07 23:34:16 +08:00
|
|
|
|
|
2005-12-26 13:28:18 +08:00
|
|
|
|
/* Create actual link to the object */
|
|
|
|
|
if(H5G_link_real(link_loc, norm_link_name, link_file, &lnk, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to register new name for object")
|
2003-08-17 02:54:40 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
done:
|
2003-08-17 02:54:40 +08:00
|
|
|
|
/* Free the normalized path names */
|
|
|
|
|
if(norm_cur_name)
|
|
|
|
|
H5MM_xfree(norm_cur_name);
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(norm_link_name)
|
|
|
|
|
H5MM_xfree(norm_link_name);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_link() */
|
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
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_get_objinfo_cb
|
[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-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Callback for retrieving info about an object. This routine
|
|
|
|
|
* gets the info
|
[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-11-15 10:55:39 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
[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-11-15 10:55:39 +08:00
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Tuesday, September 20, 2005
|
[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-11-15 10:55:39 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_get_objinfo_cb(H5G_loc_t *grp_loc/*in*/, const char UNUSED *name, const H5O_link_t *lnk,
|
|
|
|
|
H5G_loc_t *obj_loc, void *_udata/*in,out*/)
|
[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-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud4_t *udata = (H5G_trav_ud4_t *)_udata; /* User data passed in */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return 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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_get_objinfo_cb)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Check if the name in this group resolved to a valid link */
|
|
|
|
|
if(lnk == NULL && obj_loc == NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Only modify user's buffer if it's available */
|
|
|
|
|
if(udata->statbuf) {
|
|
|
|
|
H5G_stat_t *statbuf = udata->statbuf; /* Convenience pointer for statbuf */
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Reset buffer */
|
|
|
|
|
HDmemset(statbuf, 0, sizeof(H5G_stat_t));
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2005-08-21 03:28:40 +08:00
|
|
|
|
/* Common code to retrieve the file's fileno */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* (Use the object location's file info, if it's available) */
|
|
|
|
|
if(H5F_get_fileno((obj_loc ? obj_loc : grp_loc)->oloc->file, &statbuf->fileno) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "unable to read fileno")
|
|
|
|
|
|
|
|
|
|
/* Get common info from link */
|
|
|
|
|
if(lnk != NULL) {
|
|
|
|
|
statbuf->cset = lnk->cset;
|
|
|
|
|
statbuf->ctime = lnk->ctime;
|
|
|
|
|
} /* end if */
|
|
|
|
|
else {
|
|
|
|
|
/* lookup must be on '.' */
|
|
|
|
|
HDassert(HDstrcmp(name, ".") == 0);
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set "fake" hard link info */
|
|
|
|
|
statbuf->cset = H5T_CSET_ASCII;
|
|
|
|
|
statbuf->ctime = 0;
|
|
|
|
|
} /* end else */
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Get info for soft link */
|
|
|
|
|
/* (If we don't follow the link, we can retrieve info about the soft link itself) */
|
|
|
|
|
if(!udata->follow_link && lnk && lnk->type == H5G_LINK_SOFT) {
|
|
|
|
|
/* Set object type */
|
|
|
|
|
statbuf->type = H5G_LINK;
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Get length of link value */
|
|
|
|
|
statbuf->u.slink.linklen = HDstrlen(lnk->u.soft.name) + 1; /*count the null terminator*/
|
|
|
|
|
} /* end if */
|
|
|
|
|
/* Get info for hard link */
|
|
|
|
|
else {
|
|
|
|
|
/* Get object type */
|
|
|
|
|
statbuf->type = H5O_obj_type(obj_loc->oloc, udata->dxpl_id);
|
|
|
|
|
if(statbuf->type == H5G_UNKNOWN)
|
|
|
|
|
H5E_clear_stack(NULL); /* clear any errors resulting from checking type */
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Get basic info for object */
|
|
|
|
|
statbuf->u.obj.objno = obj_loc->oloc->addr;
|
|
|
|
|
statbuf->u.obj.nlink = H5O_link(obj_loc->oloc, 0, udata->dxpl_id);
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Get creation time for object */
|
|
|
|
|
if(NULL == H5O_read(obj_loc->oloc, H5O_MTIME_ID, 0, &(statbuf->u.obj.mtime), udata->dxpl_id)) {
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack(NULL);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(NULL == H5O_read(obj_loc->oloc, H5O_MTIME_NEW_ID, 0, &(statbuf->u.obj.mtime), udata->dxpl_id)) {
|
2004-09-02 01:43:30 +08:00
|
|
|
|
H5E_clear_stack(NULL);
|
2005-08-27 21:34:28 +08:00
|
|
|
|
statbuf->u.obj.mtime = 0;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end if */
|
|
|
|
|
} /* end if */
|
2003-10-07 23:27:19 +08:00
|
|
|
|
|
|
|
|
|
/* Get object header information */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_get_info(obj_loc->oloc, &(statbuf->u.obj.ohdr), udata->dxpl_id) < 0)
|
2003-10-07 23:27:19 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object header information")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end else */
|
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:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Release the group location for the object */
|
|
|
|
|
/* (Group traversal callbacks are responsible for either taking ownership
|
|
|
|
|
* of the group location for the object, or freeing it. - QAK)
|
|
|
|
|
*/
|
|
|
|
|
if(obj_loc)
|
|
|
|
|
H5G_loc_free(obj_loc);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_get_objinfo_cb() */
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_get_objinfo
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Returns information about an object.
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Success: Non-negative with info about the object
|
|
|
|
|
* returned through STATBUF if it isn't the null
|
|
|
|
|
* pointer.
|
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
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Programmer: Robb Matzke
|
|
|
|
|
* Monday, April 13, 1998
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t
|
|
|
|
|
H5G_get_objinfo(H5G_loc_t *loc, const char *name, hbool_t follow_link,
|
|
|
|
|
H5G_stat_t *statbuf/*out*/, hid_t dxpl_id)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud4_t udata; /* User data for callback */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI(H5G_get_objinfo, FAIL)
|
2003-08-22 21:50:01 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(loc);
|
|
|
|
|
HDassert(name && *name);
|
2003-08-22 21:50:01 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set up user data for retrieving information */
|
|
|
|
|
udata.statbuf = statbuf;
|
|
|
|
|
udata.follow_link = follow_link;
|
|
|
|
|
udata.dxpl_id = dxpl_id;
|
2005-07-31 02:53:01 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Traverse the group hierarchy to locate the object to get info about */
|
|
|
|
|
if(H5G_traverse(loc, name, (unsigned)(follow_link ? H5G_TARGET_NORMAL : H5G_TARGET_SLINK),
|
|
|
|
|
H5G_get_objinfo_cb, &udata, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-11-26 01:59:14 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_get_objinfo() */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Function: H5G_linkval_cb
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Purpose: Callback for retrieving soft link value for an object.
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
2005-11-15 10:55:39 +08:00
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Tuesday, September 20, 2005
|
2002-11-26 01:59:14 +08:00
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
static herr_t
|
|
|
|
|
H5G_linkval_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name, const H5O_link_t *lnk,
|
|
|
|
|
H5G_loc_t UNUSED *obj_loc, void *_udata/*in,out*/)
|
2002-11-26 01:59:14 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud5_t *udata = (H5G_trav_ud5_t *)_udata; /* User data passed in */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2003-08-22 21:50:01 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_linkval_cb)
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Check if the name in this group resolved to a valid link */
|
|
|
|
|
if(lnk == NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_LINK_SOFT != lnk->type)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object is not a symbolic link")
|
2004-09-23 04:01:27 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Copy to output buffer */
|
|
|
|
|
if(udata->size > 0 && udata->buf) {
|
|
|
|
|
HDstrncpy(udata->buf, lnk->u.soft.name, udata->size);
|
|
|
|
|
if(HDstrlen(lnk->u.soft.name) >= udata->size)
|
|
|
|
|
udata->buf[udata->size - 1] = '\0';
|
|
|
|
|
} /* end if */
|
2002-11-26 01:59:14 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Release the group location for the object */
|
|
|
|
|
/* (Group traversal callbacks are responsible for either taking ownership
|
|
|
|
|
* of the group location for the object, or freeing it. - QAK)
|
|
|
|
|
*/
|
|
|
|
|
if(obj_loc)
|
|
|
|
|
H5G_loc_free(obj_loc);
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_linkval_cb() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_linkval(H5G_loc_t *loc, const char *name, size_t size, char *buf/*out*/, hid_t dxpl_id)
|
1998-04-15 00:44:46 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud5_t udata; /* User data for callback */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_linkval)
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set up user data for retrieving information */
|
|
|
|
|
udata.size = size;
|
|
|
|
|
udata.buf = buf;
|
1998-04-15 00:44:46 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Traverse the group hierarchy to locate the object to get info about */
|
|
|
|
|
if(H5G_traverse(loc, name, H5G_TARGET_SLINK, H5G_linkval_cb, &udata, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
|
2003-09-19 03:27:27 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* H5G_linkval() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_set_comment(H5G_loc_t *loc, const char *name, const char *buf, hid_t dxpl_id)
|
1998-07-21 05:01:32 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5O_loc_t obj_oloc; /* Object's location */
|
1998-07-21 05:01:32 +08:00
|
|
|
|
H5O_name_t comment;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5G_obj_find(loc, name, H5G_TARGET_NORMAL, NULL, &obj_oloc/*out*/, dxpl_id) < 0)
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_remove(&obj_oloc, H5O_NAME_ID, 0, TRUE, 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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(buf && *buf) {
|
|
|
|
|
/* Casting away const OK -QAK */
|
|
|
|
|
comment.s = (char *)buf;
|
|
|
|
|
if(H5O_modify(&obj_oloc, H5O_NAME_ID, H5O_NEW_MESG, 0, H5O_UPDATE_TIME, &comment, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to set comment object header message")
|
|
|
|
|
} /* end if */
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_set_comment() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static int
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_get_comment(H5G_loc_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;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5O_loc_t obj_oloc; /* Object's location */
|
|
|
|
|
int ret_value; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5G_obj_find(loc, name, H5G_TARGET_NORMAL, NULL, &obj_oloc/*out*/, dxpl_id) < 0)
|
2005-11-15 10:55:39 +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;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(NULL == H5O_read(&obj_oloc, H5O_NAME_ID, 0, &comment, dxpl_id)) {
|
|
|
|
|
if(buf && bufsize > 0)
|
2002-08-09 00:52:55 +08:00
|
|
|
|
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);
|
2005-11-15 10:55:39 +08:00
|
|
|
|
} /* end else */
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_get_comment() */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_unlink_cb
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Callback for unlinking an object. This routine
|
|
|
|
|
* deletes the link
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Monday, September 19, 2005
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static herr_t
|
|
|
|
|
H5G_unlink_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t UNUSED *lnk,
|
|
|
|
|
H5G_loc_t *obj_loc, void *_udata/*in,out*/)
|
|
|
|
|
{
|
|
|
|
|
H5G_trav_ud6_t *udata = (H5G_trav_ud6_t *)_udata; /* User data passed in */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_unlink_cb)
|
|
|
|
|
|
|
|
|
|
/* Check if the name in this group resolved to a valid link */
|
|
|
|
|
if(obj_loc == NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
|
|
|
|
|
|
|
|
|
|
/* Check for removing '.' */
|
|
|
|
|
if(lnk == NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't delete self")
|
|
|
|
|
|
|
|
|
|
/* Remove the link from the group */
|
|
|
|
|
if(H5G_loc_remove(grp_loc, name, obj_loc, udata->dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to unlink name from group")
|
1998-07-21 05:01:32 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Release the group location for the object */
|
|
|
|
|
/* (Group traversal callbacks are responsible for either taking ownership
|
|
|
|
|
* of the group location for the object, or freeing it. - QAK)
|
|
|
|
|
*/
|
|
|
|
|
if(obj_loc)
|
|
|
|
|
H5G_loc_free(obj_loc);
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_unlink_cb() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_unlink(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
|
1998-09-22 23:27:26 +08:00
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud6_t udata; /* User data for callback */
|
2003-08-17 02:54:40 +08:00
|
|
|
|
char *norm_name = NULL; /* Pointer to normalized name */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_unlink)
|
2005-08-09 05:03:17 +08:00
|
|
|
|
|
|
|
|
|
/* Sanity check */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(loc);
|
|
|
|
|
HDassert(name && *name);
|
1998-09-22 23:27:26 +08:00
|
|
|
|
|
2003-08-17 02:54:40 +08:00
|
|
|
|
/* Get normalized copy of the name */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if((norm_name = H5G_normalize(name)) == NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "can't normalize name")
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set up user data for creating soft link */
|
|
|
|
|
udata.dxpl_id = dxpl_id;
|
2002-09-18 23:51:29 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_traverse(loc, norm_name, H5G_TARGET_SLINK|H5G_TARGET_MOUNT, H5G_unlink_cb, &udata, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
|
|
|
|
|
|
|
|
|
|
done:
|
2003-08-17 02:54:40 +08:00
|
|
|
|
/* Free the normalized path name */
|
|
|
|
|
if(norm_name)
|
|
|
|
|
H5MM_xfree(norm_name);
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_unlink() */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_move_cb
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Callback for moving an object. This routine replaces the
|
|
|
|
|
* names of open objects with the moved object in the path
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Monday, September 19, 2005
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static herr_t
|
|
|
|
|
H5G_move_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name, const H5O_link_t UNUSED *lnk,
|
|
|
|
|
H5G_loc_t *obj_loc, void *_udata/*in,out*/)
|
|
|
|
|
{
|
|
|
|
|
H5G_trav_ud2_t *udata = (H5G_trav_ud2_t *)_udata; /* User data passed in */
|
|
|
|
|
H5RS_str_t *dst_name_r = NULL; /* Ref-counted version of dest name */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_move_cb)
|
|
|
|
|
|
|
|
|
|
/* Check if the name in this group resolved to a valid link */
|
|
|
|
|
if(obj_loc == NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
|
|
|
|
|
|
|
|
|
|
/* Fix names up */
|
|
|
|
|
dst_name_r = H5RS_wrap(udata->dst_name);
|
|
|
|
|
HDassert(dst_name_r);
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5G_name_replace(udata->type, obj_loc, dst_name_r, udata->dst_loc, H5G_NAME_MOVE) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to replace name ")
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
/* Cleanup */
|
|
|
|
|
if(dst_name_r)
|
|
|
|
|
H5RS_decr(dst_name_r);
|
|
|
|
|
|
|
|
|
|
/* Release the group location for the object */
|
|
|
|
|
/* (Group traversal callbacks are responsible for either taking ownership
|
|
|
|
|
* of the group location for the object, or freeing it. - QAK)
|
|
|
|
|
*/
|
|
|
|
|
if(obj_loc)
|
|
|
|
|
H5G_loc_free(obj_loc);
|
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_move_cb() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
2003-02-11 01:26:09 +08:00
|
|
|
|
static herr_t
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_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
|
|
|
|
{
|
2005-12-26 13:28:18 +08:00
|
|
|
|
H5O_loc_t src_oloc; /* Location of object linked to */
|
|
|
|
|
H5O_link_t lnk; /* Link information for object to move */
|
|
|
|
|
hbool_t link_valid = FALSE; /* Flag to indicate that the link information is valid */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_trav_ud2_t udata; /* User data for traversal */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_move)
|
2005-08-09 05:03:17 +08:00
|
|
|
|
|
|
|
|
|
/* Sanity check */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(src_loc);
|
|
|
|
|
HDassert(dst_loc);
|
|
|
|
|
HDassert(src_name && *src_name);
|
|
|
|
|
HDassert(dst_name && *dst_name);
|
|
|
|
|
|
2005-12-26 13:28:18 +08:00
|
|
|
|
/* Get copy of link to move */
|
|
|
|
|
if(H5G_obj_find(src_loc, src_name, (H5G_TARGET_MOUNT|H5G_TARGET_SLINK), &lnk, &src_oloc, dxpl_id) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
|
2005-12-26 13:28:18 +08:00
|
|
|
|
link_valid = TRUE;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
|
2005-12-26 13:28:18 +08:00
|
|
|
|
/* Release name for link (it will have a new name in destination) */
|
|
|
|
|
lnk.name = H5MM_xfree(lnk.name);
|
|
|
|
|
|
|
|
|
|
/* Create new link to the object */
|
|
|
|
|
if(H5G_link_real(dst_loc, dst_name, src_oloc.file, &lnk, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to register new name for object")
|
2005-11-15 10:55:39 +08:00
|
|
|
|
|
|
|
|
|
/* Set up user data for name replacement */
|
2005-12-26 13:28:18 +08:00
|
|
|
|
/* Get object type */
|
|
|
|
|
switch(lnk.type) {
|
|
|
|
|
case H5G_LINK_HARD:
|
|
|
|
|
if(H5G_UNKNOWN == (udata.type = H5O_obj_type(&src_oloc, dxpl_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object type to move")
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case H5G_LINK_SOFT:
|
|
|
|
|
udata.type = H5G_LINK;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "unrecognized link type")
|
|
|
|
|
} /* end switch */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
udata.dst_name = dst_name;
|
|
|
|
|
udata.dst_loc = dst_loc;
|
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-11-15 10:55:39 +08:00
|
|
|
|
*/
|
2005-12-26 13:28:18 +08:00
|
|
|
|
if(H5G_traverse(src_loc, src_name, H5G_TARGET_MOUNT|H5G_TARGET_SLINK, H5G_move_cb, &udata, dxpl_id) < 0)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to follow symbolic link")
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
1998-10-01 04:17:26 +08:00
|
|
|
|
/* Remove the old name */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_unlink(src_loc, src_name, dxpl_id) < 0)
|
2005-12-26 13:28:18 +08:00
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to unlink old object name")
|
1998-09-28 22:20:21 +08:00
|
|
|
|
|
2002-08-09 00:52:55 +08:00
|
|
|
|
done:
|
2005-12-26 13:28:18 +08:00
|
|
|
|
/* If there's valid information in the link, reset it */
|
|
|
|
|
if(link_valid)
|
|
|
|
|
H5O_reset(H5O_LINK_ID, &lnk);
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_move() */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_insertion_file_cb
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Callback for finding insertion file. This routine sets the
|
|
|
|
|
* correct information for the file pointer to return.
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Quincey Koziol
|
|
|
|
|
* Monday, September 19, 2005
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static herr_t
|
|
|
|
|
H5G_insertion_file_cb(H5G_loc_t *grp_loc/*in*/, const char UNUSED *name, const H5O_link_t UNUSED *lnk,
|
|
|
|
|
H5G_loc_t *obj_loc, void *_udata/*in,out*/)
|
|
|
|
|
{
|
|
|
|
|
H5G_trav_ud1_t *udata = (H5G_trav_ud1_t *)_udata; /* User data passed in */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_NOAPI_NOINIT(H5G_insertion_file_cb)
|
|
|
|
|
|
|
|
|
|
/* Check if the name in this group resolves to a valid location */
|
|
|
|
|
/* (which is not what we want) */
|
|
|
|
|
if(obj_loc != NULL)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name already exists")
|
|
|
|
|
|
|
|
|
|
/* Get file pointer for location */
|
|
|
|
|
udata->file = grp_loc->oloc->file;
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_insertion_file_cb() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
H5F_t *
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_insertion_file(H5G_loc_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
|
|
|
|
|
2005-11-15 10:55:39 +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
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(loc);
|
|
|
|
|
HDassert(name && *name);
|
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
|
|
|
|
/* 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
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5F_has_mount(loc->oloc->file) || H5F_is_mount(loc->oloc->file)) {
|
|
|
|
|
H5G_trav_ud1_t udata; /* User data for traversal */
|
[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
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Look up the name to get the containing group and to make sure the name
|
|
|
|
|
* doesn't already exist.
|
|
|
|
|
*/
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_traverse(loc, name, H5G_TARGET_NORMAL, H5G_insertion_file_cb, &udata, dxpl_id) < 0)
|
|
|
|
|
HGOTO_ERROR(H5E_SYM, H5E_EXISTS, NULL, "name already exists")
|
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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
ret_value = udata.file;
|
[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
|
|
|
|
|
/* Use the location's file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
ret_value = loc->oloc->file;
|
2002-08-09 00:52:55 +08:00
|
|
|
|
|
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_insertion_file() */
|
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
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
herr_t
|
|
|
|
|
H5G_free_grp_name(H5G_t *grp)
|
|
|
|
|
{
|
2005-11-15 10:55:39 +08:00
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +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 */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(grp && grp->shared);
|
|
|
|
|
HDassert(grp->shared->fo_count > 0);
|
2002-09-25 22:50:49 +08:00
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Free the path */
|
|
|
|
|
H5G_name_free(&(grp->path));
|
2005-08-14 04:53:35 +08:00
|
|
|
|
|
2002-08-29 02:34:12 +08:00
|
|
|
|
done:
|
2005-11-15 10:55:39 +08:00
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_free_grp_name() */
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
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() */
|
|
|
|
|
|
2005-11-07 11:13:53 +08:00
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------
|
|
|
|
|
* Function: H5G_copy
|
|
|
|
|
*
|
|
|
|
|
* Purpose: Copy an object to destination location
|
|
|
|
|
*
|
|
|
|
|
* Return: Non-negative on success/Negative on failure
|
|
|
|
|
*
|
|
|
|
|
* Programmer: Peter Cao
|
|
|
|
|
* June 4, 2005
|
|
|
|
|
*
|
|
|
|
|
*-------------------------------------------------------------------------
|
|
|
|
|
*/
|
|
|
|
|
static herr_t
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_copy(H5G_loc_t *src_loc, H5G_loc_t *dst_loc,
|
2005-11-07 11:13:53 +08:00
|
|
|
|
const char *name_dst, hid_t plist_id)
|
|
|
|
|
{
|
|
|
|
|
H5P_genplist_t *oc_plist; /* Property list created */
|
|
|
|
|
hid_t dxpl_id = H5AC_dxpl_id;
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_name_t new_path; /* Copied object group hier. path */
|
|
|
|
|
H5O_loc_t new_oloc; /* Copied object object location */
|
|
|
|
|
H5G_loc_t new_loc; /* Group location of object copied */
|
2005-11-07 11:13:53 +08:00
|
|
|
|
hbool_t entry_inserted = FALSE; /* Flag to indicate that the new entry was inserted into a group */
|
|
|
|
|
herr_t ret_value = SUCCEED; /* Return value */
|
|
|
|
|
|
|
|
|
|
FUNC_ENTER_NOAPI(H5G_copy, FAIL);
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
HDassert(src_loc);
|
|
|
|
|
HDassert(src_loc->oloc->file);
|
|
|
|
|
HDassert(dst_loc);
|
|
|
|
|
HDassert(dst_loc->oloc->file);
|
2005-11-07 11:13:53 +08:00
|
|
|
|
HDassert(name_dst);
|
|
|
|
|
|
|
|
|
|
/* Get the property list */
|
|
|
|
|
if(NULL == (oc_plist = H5I_object(plist_id)))
|
|
|
|
|
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list")
|
|
|
|
|
|
2005-11-15 10:55:39 +08:00
|
|
|
|
/* Set up copied object location to fill in */
|
|
|
|
|
new_loc.oloc = &new_oloc;
|
|
|
|
|
new_loc.path = &new_path;
|
|
|
|
|
H5G_loc_reset(&new_loc);
|
|
|
|
|
new_oloc.file = dst_loc->oloc->file;
|
2005-11-07 11:13:53 +08:00
|
|
|
|
|
|
|
|
|
/* copy the object from the source file to the destination file */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5O_copy_header(src_loc->oloc, &new_oloc, dxpl_id) < 0)
|
2005-11-07 11:13:53 +08:00
|
|
|
|
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
|
|
|
|
|
|
|
|
|
|
/* Insert the new object in the destination file's group */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
if(H5G_insert(dst_loc, name_dst, &new_loc, dxpl_id, oc_plist) < 0)
|
2005-11-07 11:13:53 +08:00
|
|
|
|
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to insert the name")
|
|
|
|
|
entry_inserted = TRUE;
|
|
|
|
|
|
|
|
|
|
done:
|
|
|
|
|
/* Free the ID to name buffers */
|
|
|
|
|
if(entry_inserted)
|
2005-11-15 10:55:39 +08:00
|
|
|
|
H5G_loc_free(&new_loc);
|
2005-11-07 11:13:53 +08:00
|
|
|
|
|
|
|
|
|
FUNC_LEAVE_NOAPI(ret_value)
|
|
|
|
|
} /* end H5G_copy() */
|
2005-11-15 10:55:39 +08:00
|
|
|
|
|