diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-10-21 15:14:15 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-10-21 15:14:15 (GMT) |
commit | 2bfbf4f707415774e17d160e626a5e11ff8d8d61 (patch) | |
tree | ac6ba5031c7e2774442953f750e356f8f3e7ae94 /src/H5T.c | |
parent | bf5d98d7b9018c03e947422dc6f43e76feeca2b0 (diff) | |
download | hdf5-2bfbf4f707415774e17d160e626a5e11ff8d8d61.zip hdf5-2bfbf4f707415774e17d160e626a5e11ff8d8d61.tar.gz hdf5-2bfbf4f707415774e17d160e626a5e11ff8d8d61.tar.bz2 |
[svn-r773] Changes since 19981019
----------------------
./src/H5Fistore.c
Improved the hash function so it mixes bits better. This
results in a few percent improvement in raw data chunk cache
efficiency because there are fewer collisions.
./test/chunk.c
Added #define's for chunk preemption `w0' value and number of
slots in cache.
./src/H5B.c
Added some more comments to H5B_insert_helper() and
H5B_remove_helper() and also point to some additional
documentation.
Diffstat (limited to 'src/H5T.c')
-rw-r--r-- | src/H5T.c | 33 |
1 files changed, 20 insertions, 13 deletions
@@ -4333,17 +4333,21 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2) break; case H5T_POINTER: - if (dt1->u.atomic.u.r.rtype < dt2->u.atomic.u.r.rtype) HGOTO_DONE(-1); - if (dt1->u.atomic.u.r.rtype > dt2->u.atomic.u.r.rtype) HGOTO_DONE(1); + if (dt1->u.atomic.u.r.rtype < dt2->u.atomic.u.r.rtype) { + HGOTO_DONE(-1); + } + if (dt1->u.atomic.u.r.rtype > dt2->u.atomic.u.r.rtype) { + HGOTO_DONE(1); + } - switch(dt1->u.atomic.u.r.rtype) { + switch(dt1->u.atomic.u.r.rtype) { case H5R_OBJECT: /*void */ break; default: assert("not implemented yet" && 0); - } /* end switch */ + } break; default: @@ -4395,7 +4399,7 @@ H5T_find(const H5T_t *src, const H5T_t *dst, H5T_bkg_t need_bkg, FUNC_ENTER(H5T_find, NULL); #ifdef QAK -printf("%s: check 1.0\n",FUNC); + printf("%s: check 1.0\n",FUNC); #endif /* QAK */ if (!noop_cdata.stats && NULL==(noop_cdata.stats = H5MM_calloc (sizeof(H5T_stats_t)))) { @@ -4404,7 +4408,8 @@ printf("%s: check 1.0\n",FUNC); } #ifdef QAK -printf("%s: check 2.0, src->type=%d, dst->type=%d\n",FUNC,(int)src->type,(int)dst->type); + printf("%s: check 2.0, src->type=%d, dst->type=%d\n", + FUNC, (int)src->type, (int)dst->type); #endif /* QAK */ /* No-op case */ if (need_bkg<H5T_BKG_YES && 0==H5T_cmp(src, dst)) { @@ -4413,7 +4418,7 @@ printf("%s: check 2.0, src->type=%d, dst->type=%d\n",FUNC,(int)src->type,(int)ds } #ifdef QAK -printf("%s: check 3.0\n",FUNC); + printf("%s: check 3.0\n", FUNC); #endif /* QAK */ /* Find it */ if (NULL == (path = H5T_path_find(NULL, src, dst, TRUE, NULL))) { @@ -4421,7 +4426,7 @@ printf("%s: check 3.0\n",FUNC); "unable to create conversion path"); } #ifdef QAK -printf("%s: path=%p\n",FUNC,path); + printf("%s: path=%p\n", FUNC, path); #endif /* QAK */ if ((ret_value=path->func)) { @@ -4491,7 +4496,7 @@ H5T_path_find(const char *name, const H5T_t *src, const H5T_t *dst, } } #ifdef QAK -printf("%s: check 2.0, create=%d, md=%d\n",FUNC,(int)create,md); + printf("%s: check 2.0, create=%d, md=%d\n", FUNC, (int)create, md); #endif /* QAK */ /* Insert */ @@ -4520,14 +4525,16 @@ printf("%s: check 2.0, create=%d, md=%d\n",FUNC,(int)create,md); "memory allocation failed"); } #ifdef QAK -printf("%s: check 3.0, src=%p, dst=%p\n",FUNC,src,dst); -printf("%s: check 3.0, src->type=%d, dst->type=%d\n",FUNC,(int)src->type,(int)dst->type); + printf("%s: check 3.0, src=%p, dst=%p\n", FUNC, src, dst); + printf("%s: check 3.0, src->type=%d, dst->type=%d\n", + FUNC, (int)src->type, (int)dst->type); #endif /* QAK */ path->src = H5T_copy(src, H5T_COPY_ALL); path->dst = H5T_copy(dst, H5T_COPY_ALL); #ifdef QAK -printf("%s: check 3.5, func=%p, name=%s\n",FUNC,func,(name!=NULL ? name : "NULL")); + printf("%s: check 3.5, func=%p, name=%s\n", + FUNC, func, (name!=NULL ? name : "NULL")); #endif /* QAK */ /* Associate a function with the path if possible */ if (func) { @@ -4595,7 +4602,7 @@ printf("%s: check 3.5, func=%p, name=%s\n",FUNC,func,(name!=NULL ? name : "NULL" } } #ifdef QAK -printf("%s: leaving path=%p\n",FUNC,path); + printf("%s: leaving path=%p\n", FUNC, path); #endif /* QAK */ FUNC_LEAVE(path); } |