summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5Distore.c88
-rw-r--r--src/H5Fistore.c88
-rw-r--r--src/Makefile.in26
3 files changed, 101 insertions, 101 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 5e54464..c78e44e 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -399,7 +399,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
FUNC_ENTER(H5F_istore_new_node, FAIL);
#ifdef AKC
-printf("%s: Called\n", FUNC);
+ printf("%s: Called\n", FUNC);
#endif
/* check args */
assert(f);
@@ -412,7 +412,7 @@ printf("%s: Called\n", FUNC);
/* Allocate new storage */
assert (udata->key.nbytes > 0);
#ifdef AKC
-printf("calling H5MF_alloc for new chunk\n");
+ printf("calling H5MF_alloc for new chunk\n");
#endif
if (H5MF_alloc(f, H5MF_RAW, udata->key.nbytes, addr /*out */ ) < 0) {
HRETURN_ERROR(H5E_IO, H5E_CANTINIT, FAIL,
@@ -545,7 +545,7 @@ H5F_istore_insert(H5F_t *f, const haddr_t *addr, void *_lt_key,
FUNC_ENTER(H5F_istore_insert, H5B_INS_ERROR);
#ifdef AKC
-printf("%s: Called\n", FUNC);
+ printf("%s: Called\n", FUNC);
#endif
/* check args */
@@ -577,7 +577,7 @@ printf("%s: Called\n", FUNC);
*/
if (lt_key->nbytes != udata->key.nbytes) {
#ifdef AKC
-printf("calling H5MF_realloc for new chunk\n");
+ printf("calling H5MF_realloc for new chunk\n");
#endif
if (H5MF_realloc (f, H5MF_RAW, lt_key->nbytes, addr,
udata->key.nbytes, new_node/*out*/)<0) {
@@ -613,7 +613,7 @@ printf("calling H5MF_realloc for new chunk\n");
* Allocate storage for the new chunk
*/
#ifdef AKC
-printf("calling H5MF_alloc for new chunk\n");
+ printf("calling H5MF_alloc for new chunk\n");
#endif
if (H5MF_alloc(f, H5MF_RAW, udata->key.nbytes, new_node/*out*/)<0) {
HRETURN_ERROR(H5E_IO, H5E_CANTINIT, H5B_INS_ERROR,
@@ -1380,11 +1380,11 @@ H5F_istore_read(H5F_t *f, const H5O_layout_t *layout,
#endif
#ifdef AKC
-printf("Locking chunk( ");
-for (i=0; i<layout->ndims; i++){
-printf("%ld ", chunk_offset[i]);
-}
-printf(")\n");
+ printf("Locking chunk( ");
+ for (i=0; i<layout->ndims; i++){
+ printf("%ld ", chunk_offset[i]);
+ }
+ printf(")\n");
#endif
/*
@@ -1555,29 +1555,30 @@ H5F_istore_write(H5F_t *f, const H5O_layout_t *layout,
#endif
#ifdef AKC
-printf("Locking chunk( ");
-for (i=0; i<layout->ndims; i++){
-printf("%ld ", chunk_offset[i]);
-}
-printf(")\n");
+ printf("Locking chunk( ");
+ for (i=0; i<layout->ndims; i++){
+ printf("%ld ", chunk_offset[i]);
+ }
+ printf(")\n");
#endif
- /*
- * Lock the chunk, copy from application to chunk, then unlock the
- * chunk.
- */
- if (NULL==(chunk=H5F_istore_lock (f, layout, comp, chunk_offset,
- naccessed==chunk_size, &idx_hint))) {
- HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
- "unable to read raw data chunk");
- }
- H5V_hyper_copy(layout->ndims, sub_size,
- layout->dim, offset_wrt_chunk, chunk,
- size_m, sub_offset_m, buf);
- if (H5F_istore_unlock (f, layout, comp, TRUE, chunk_offset, &idx_hint,
- chunk, naccessed)<0) {
- HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
- "uanble to unlock raw data chunk");
- }
+ /*
+ * Lock the chunk, copy from application to chunk, then unlock the
+ * chunk.
+ */
+ if (NULL==(chunk=H5F_istore_lock (f, layout, comp, chunk_offset,
+ naccessed==chunk_size,
+ &idx_hint))) {
+ HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
+ "unable to read raw data chunk");
+ }
+ H5V_hyper_copy(layout->ndims, sub_size,
+ layout->dim, offset_wrt_chunk, chunk,
+ size_m, sub_offset_m, buf);
+ if (H5F_istore_unlock (f, layout, comp, TRUE, chunk_offset,
+ &idx_hint, chunk, naccessed)<0) {
+ HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
+ "uanble to unlock raw data chunk");
+ }
#ifdef HAVE_PARALLEL
}
#endif
@@ -1637,7 +1638,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ )
#endif
udata.mesg.ndims = layout->ndims;
- if (H5B_create(f, H5B_ISTORE, &udata, &(layout->addr) /*out */ ) < 0) {
+ if (H5B_create(f, H5B_ISTORE, &udata, &(layout->addr)/*out*/) < 0) {
HRETURN_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "can't create B-tree");
}
@@ -1821,7 +1822,7 @@ H5F_istore_allocate (H5D_t *dataset, H5F_t *f, const H5O_layout_t *layout,
FUNC_ENTER(H5F_istore_allocate, FAIL);
#ifdef AKC
-printf("Enter %s:\n", FUNC);
+ printf("Enter %s:\n", FUNC);
#endif
/* Check args */
@@ -1858,11 +1859,11 @@ printf("Enter %s:\n", FUNC);
while (1) {
#ifdef AKC
-printf("Checking allocation for chunk( ");
-for (i=0; i<layout->ndims; i++){
-printf("%ld ", chunk_offset[i]);
-}
-printf(")\n");
+ printf("Checking allocation for chunk( ");
+ for (i=0; i<layout->ndims; i++){
+ printf("%ld ", chunk_offset[i]);
+ }
+ printf(")\n");
#endif
#ifdef NO
if (H5F_istore_get_addr(f, layout, chunk_offset, &udata)==FAIL){
@@ -1873,7 +1874,7 @@ printf(")\n");
/* allocation effect in the unlock process. */
#ifdef AKC
-printf("need allocation\n");
+ printf("need allocation\n");
#endif
/*
* Lock the chunk, copy from application to chunk, then unlock the
@@ -1890,11 +1891,10 @@ printf("need allocation\n");
"uanble to unlock raw data chunk");
}
#ifdef NO
- }
- else{
+ } else {
#ifdef AKC
-printf("NO need for allocation\n");
-printf("udata.addr.offset=%d\n", udata.addr.offset);
+ printf("NO need for allocation\n");
+ printf("udata.addr.offset=%d\n", udata.addr.offset);
#endif
}
#endif
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 5e54464..c78e44e 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -399,7 +399,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
FUNC_ENTER(H5F_istore_new_node, FAIL);
#ifdef AKC
-printf("%s: Called\n", FUNC);
+ printf("%s: Called\n", FUNC);
#endif
/* check args */
assert(f);
@@ -412,7 +412,7 @@ printf("%s: Called\n", FUNC);
/* Allocate new storage */
assert (udata->key.nbytes > 0);
#ifdef AKC
-printf("calling H5MF_alloc for new chunk\n");
+ printf("calling H5MF_alloc for new chunk\n");
#endif
if (H5MF_alloc(f, H5MF_RAW, udata->key.nbytes, addr /*out */ ) < 0) {
HRETURN_ERROR(H5E_IO, H5E_CANTINIT, FAIL,
@@ -545,7 +545,7 @@ H5F_istore_insert(H5F_t *f, const haddr_t *addr, void *_lt_key,
FUNC_ENTER(H5F_istore_insert, H5B_INS_ERROR);
#ifdef AKC
-printf("%s: Called\n", FUNC);
+ printf("%s: Called\n", FUNC);
#endif
/* check args */
@@ -577,7 +577,7 @@ printf("%s: Called\n", FUNC);
*/
if (lt_key->nbytes != udata->key.nbytes) {
#ifdef AKC
-printf("calling H5MF_realloc for new chunk\n");
+ printf("calling H5MF_realloc for new chunk\n");
#endif
if (H5MF_realloc (f, H5MF_RAW, lt_key->nbytes, addr,
udata->key.nbytes, new_node/*out*/)<0) {
@@ -613,7 +613,7 @@ printf("calling H5MF_realloc for new chunk\n");
* Allocate storage for the new chunk
*/
#ifdef AKC
-printf("calling H5MF_alloc for new chunk\n");
+ printf("calling H5MF_alloc for new chunk\n");
#endif
if (H5MF_alloc(f, H5MF_RAW, udata->key.nbytes, new_node/*out*/)<0) {
HRETURN_ERROR(H5E_IO, H5E_CANTINIT, H5B_INS_ERROR,
@@ -1380,11 +1380,11 @@ H5F_istore_read(H5F_t *f, const H5O_layout_t *layout,
#endif
#ifdef AKC
-printf("Locking chunk( ");
-for (i=0; i<layout->ndims; i++){
-printf("%ld ", chunk_offset[i]);
-}
-printf(")\n");
+ printf("Locking chunk( ");
+ for (i=0; i<layout->ndims; i++){
+ printf("%ld ", chunk_offset[i]);
+ }
+ printf(")\n");
#endif
/*
@@ -1555,29 +1555,30 @@ H5F_istore_write(H5F_t *f, const H5O_layout_t *layout,
#endif
#ifdef AKC
-printf("Locking chunk( ");
-for (i=0; i<layout->ndims; i++){
-printf("%ld ", chunk_offset[i]);
-}
-printf(")\n");
+ printf("Locking chunk( ");
+ for (i=0; i<layout->ndims; i++){
+ printf("%ld ", chunk_offset[i]);
+ }
+ printf(")\n");
#endif
- /*
- * Lock the chunk, copy from application to chunk, then unlock the
- * chunk.
- */
- if (NULL==(chunk=H5F_istore_lock (f, layout, comp, chunk_offset,
- naccessed==chunk_size, &idx_hint))) {
- HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
- "unable to read raw data chunk");
- }
- H5V_hyper_copy(layout->ndims, sub_size,
- layout->dim, offset_wrt_chunk, chunk,
- size_m, sub_offset_m, buf);
- if (H5F_istore_unlock (f, layout, comp, TRUE, chunk_offset, &idx_hint,
- chunk, naccessed)<0) {
- HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
- "uanble to unlock raw data chunk");
- }
+ /*
+ * Lock the chunk, copy from application to chunk, then unlock the
+ * chunk.
+ */
+ if (NULL==(chunk=H5F_istore_lock (f, layout, comp, chunk_offset,
+ naccessed==chunk_size,
+ &idx_hint))) {
+ HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
+ "unable to read raw data chunk");
+ }
+ H5V_hyper_copy(layout->ndims, sub_size,
+ layout->dim, offset_wrt_chunk, chunk,
+ size_m, sub_offset_m, buf);
+ if (H5F_istore_unlock (f, layout, comp, TRUE, chunk_offset,
+ &idx_hint, chunk, naccessed)<0) {
+ HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
+ "uanble to unlock raw data chunk");
+ }
#ifdef HAVE_PARALLEL
}
#endif
@@ -1637,7 +1638,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ )
#endif
udata.mesg.ndims = layout->ndims;
- if (H5B_create(f, H5B_ISTORE, &udata, &(layout->addr) /*out */ ) < 0) {
+ if (H5B_create(f, H5B_ISTORE, &udata, &(layout->addr)/*out*/) < 0) {
HRETURN_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "can't create B-tree");
}
@@ -1821,7 +1822,7 @@ H5F_istore_allocate (H5D_t *dataset, H5F_t *f, const H5O_layout_t *layout,
FUNC_ENTER(H5F_istore_allocate, FAIL);
#ifdef AKC
-printf("Enter %s:\n", FUNC);
+ printf("Enter %s:\n", FUNC);
#endif
/* Check args */
@@ -1858,11 +1859,11 @@ printf("Enter %s:\n", FUNC);
while (1) {
#ifdef AKC
-printf("Checking allocation for chunk( ");
-for (i=0; i<layout->ndims; i++){
-printf("%ld ", chunk_offset[i]);
-}
-printf(")\n");
+ printf("Checking allocation for chunk( ");
+ for (i=0; i<layout->ndims; i++){
+ printf("%ld ", chunk_offset[i]);
+ }
+ printf(")\n");
#endif
#ifdef NO
if (H5F_istore_get_addr(f, layout, chunk_offset, &udata)==FAIL){
@@ -1873,7 +1874,7 @@ printf(")\n");
/* allocation effect in the unlock process. */
#ifdef AKC
-printf("need allocation\n");
+ printf("need allocation\n");
#endif
/*
* Lock the chunk, copy from application to chunk, then unlock the
@@ -1890,11 +1891,10 @@ printf("need allocation\n");
"uanble to unlock raw data chunk");
}
#ifdef NO
- }
- else{
+ } else {
#ifdef AKC
-printf("NO need for allocation\n");
-printf("udata.addr.offset=%d\n", udata.addr.offset);
+ printf("NO need for allocation\n");
+ printf("udata.addr.offset=%d\n", udata.addr.offset);
#endif
}
#endif
diff --git a/src/Makefile.in b/src/Makefile.in
index 604e347..10d360f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,12 +16,12 @@ PROGS=debug h5ls h5repart
# Source and object files for the library (lexicographically)...
LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \
- H5Ffamily.c H5Fistore.c H5Flow.c H5Fmpio.c H5Fsec2.c H5Fsplit.c H5Fstdio.c \
- H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c H5MM.c H5O.c \
- H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c H5Olayout.c H5Oname.c \
- H5Onull.c H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c H5S.c H5Sall.c \
- H5Shyper.c H5Spoint.c H5Ssimp.c H5Sselect.c H5T.c H5Tbit.c H5Tconv.c \
- H5Tinit.c H5TB.c H5V.c H5Z.c
+ H5Ffamily.c H5Fistore.c H5Flow.c H5Fmpio.c H5Fsec2.c H5Fsplit.c \
+ H5Fstdio.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c \
+ H5MM.c H5O.c H5Oattr.c H5Ocomp.c H5Ocont.c H5Odtype.c H5Oefl.c \
+ H5Olayout.c H5Oname.c H5Onull.c H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c \
+ H5S.c H5Sall.c H5Shyper.c H5Spoint.c H5Ssimp.c H5Sselect.c H5T.c H5Tbit.c \
+ H5Tconv.c H5Tinit.c H5TB.c H5V.c H5Z.c
LIB_OBJ=$(LIB_SRC:.c=.o)
@@ -33,16 +33,16 @@ PROG_SRC=debug.c h5ls.c h5repart.c
PROG_OBJ=$(PROG_SRC:.c=.o)
# Public header files (to be installed)...
-PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Ppublic.h \
- H5Dpublic.h H5Epublic.h H5Fpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \
- H5Ipublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Spublic.h H5Tpublic.h \
- H5config.h hdf5.h
+PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h \
+ H5Epublic.h H5Fpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \
+ H5Ipublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h \
+ H5Spublic.h H5Tpublic.h H5Zpublic.h H5config.h hdf5.h
# Other header files (not to be installed)...
PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \
- H5Pprivate.h H5Dprivate.h H5Dpkg.h H5Eprivate.h H5Fprivate.h H5Gprivate.h \
- H5Gpkg.h H5HGprivate.h H5HLprivate.h H5Iprivate.h H5MFprivate.h \
- H5MMprivate.h H5Oprivate.h H5Sprivate.h H5Tprivate.h H5TBprivate.h \
+ H5Dprivate.h H5Eprivate.h H5Fprivate.h H5Gprivate.h H5Gpkg.h \
+ H5HGprivate.h H5HLprivate.h H5Iprivate.h H5MFprivate.h H5MMprivate.h \
+ H5Oprivate.h H5Pprivate.h H5Sprivate.h H5Tprivate.h H5TBprivate.h \
H5Tpkg.h H5Vprivate.h H5Zprivate.h
# Number format detection
generated by cgit v0.12 at 2024-11-22 07:30:11 (GMT)