diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-03-30 19:24:08 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-03-30 19:24:08 (GMT) |
commit | 78c1574378256975b39d4b65a011307a631dc667 (patch) | |
tree | 84e0dc9edf12a69a405c0d9da02803f2cc291382 /test | |
parent | 2d9f2282e6e639dc5a7881c5c55c3f56d43526b1 (diff) | |
download | hdf5-78c1574378256975b39d4b65a011307a631dc667.zip hdf5-78c1574378256975b39d4b65a011307a631dc667.tar.gz hdf5-78c1574378256975b39d4b65a011307a631dc667.tar.bz2 |
[svn-r333] Changes since 19980324
----------------------
./MANIFEST
./src/H5HG.c [new]
./src/H5HGprivate.h [new]
./src/H5HGpublic.h [new]
./src/Makefile.in
Added global heaps, H5HG. This compiles but is untested.
./src/H5D.c
./src/H5G.c
./src/H5Gnode.c
./src/H5Gstab.c
./src/H5HL.c [renamed from H5H.c]
./src/H5HLprivate.h [renamed from H5Hprivate.h]
./src/H5HLpublic.h [renamed from H5Hpublic.h]
./src/H5Oefl.c
./src/Makefile.in
./src/hdf5.h
./test/theap.c
Renamed local heaps from H5H to H5HL.
./src/H5AC.c
./src/H5ACprivate.h
./src/debug.c
Added debugging support for global heap collections.
./html/H5.format.html
Ripped out the old small object heap documentation and added
documentation for the new global heap.
./html/H5.api.html
./src/H5P.c
./src/H5Ppublic.h
./src/H5F.c
./src/H5Fprivate.h
./src/H5private.h
The H5Pget_version() function no longer returns a small object
heap version number. Instead, each collection of the global
heap has its own version number instead of a single number in
the file boot block.
./bin/release
Omit files marked for removal by CVS even though the removal
hasn't been committed yet.
./test/iopipe.c
Removed warnings about casting unsigned int to double on Irix64.
./MANIFEST
Removed ./test/testpar/phdf5sup.c
Diffstat (limited to 'test')
-rw-r--r-- | test/.distdep | 12 | ||||
-rw-r--r-- | test/iopipe.c | 23 | ||||
-rw-r--r-- | test/theap.c | 10 |
3 files changed, 26 insertions, 19 deletions
diff --git a/test/.distdep b/test/.distdep index cb9225b..03ec460 100644 --- a/test/.distdep +++ b/test/.distdep @@ -130,7 +130,7 @@ dtypes.o: \ ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ - ../src/H5Hpublic.h \ + ../src/H5HLpublic.h \ ../src/H5MFpublic.h \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ @@ -183,7 +183,7 @@ dsets.o: \ ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ - ../src/H5Hpublic.h \ + ../src/H5HLpublic.h \ ../src/H5MFpublic.h \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ @@ -202,7 +202,7 @@ cmpd_dset.o: \ ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ - ../src/H5Hpublic.h \ + ../src/H5HLpublic.h \ ../src/H5MFpublic.h \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ @@ -220,7 +220,7 @@ extend.o: \ ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ - ../src/H5Hpublic.h \ + ../src/H5HLpublic.h \ ../src/H5MFpublic.h \ ../src/H5MMpublic.h \ ../src/H5Opublic.h @@ -236,7 +236,7 @@ external.o: \ ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ - ../src/H5Hpublic.h \ + ../src/H5HLpublic.h \ ../src/H5MFpublic.h \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ @@ -255,7 +255,7 @@ iopipe.o: \ ../src/H5Epublic.h \ ../src/H5Fpublic.h \ ../src/H5Gpublic.h \ - ../src/H5Hpublic.h \ + ../src/H5HLpublic.h \ ../src/H5MFpublic.h \ ../src/H5MMpublic.h \ ../src/H5Opublic.h \ diff --git a/test/iopipe.c b/test/iopipe.c index f185aad..4d856b9 100644 --- a/test/iopipe.c +++ b/test/iopipe.c @@ -59,16 +59,22 @@ print_stats (const char *prefix, { double u_time, s_time, e_time, bw; - u_time = (r_stop->ru_utime.tv_sec+r_stop->ru_utime.tv_usec/1000000.0) - - (r_start->ru_utime.tv_sec+r_start->ru_utime.tv_usec/1000000.0); + u_time = ((double)(r_stop->ru_utime.tv_sec)+ + (double)(r_stop->ru_utime.tv_usec)/1000000.0) - + ((double)(r_start->ru_utime.tv_sec)+ + (double)(r_start->ru_utime.tv_usec)/1000000.0); - s_time = (r_stop->ru_stime.tv_sec+r_stop->ru_stime.tv_usec/1000000.0) - - (r_start->ru_stime.tv_sec+r_start->ru_stime.tv_usec/1000000.0); + s_time = ((double)(r_stop->ru_stime.tv_sec)+ + (double)(r_stop->ru_stime.tv_usec)/1000000.0) - + ((double)(r_start->ru_stime.tv_sec)+ + (double)(r_start->ru_stime.tv_usec)/1000000.0); - e_time = (t_stop->tv_sec+t_stop->tv_usec/1000000.0) - - (t_start->tv_sec+t_start->tv_usec/1000000.0); + e_time = ((double)(t_stop->tv_sec)+ + (double)(t_stop->tv_usec)/1000000.0) - + ((double)(t_start->tv_sec)+ + (double)(t_start->tv_usec)/1000000.0); - bw = nbytes / e_time; + bw = (double)nbytes / e_time; printf (HEADING "%1.2fuser %1.2fsystem %1.2felapsed %1.2fMB/s\n", prefix, u_time, s_time, e_time, bw/(1024*1024)); @@ -141,7 +147,8 @@ main (void) int start[2]; size_t count[2]; - printf ("I/O request size is %1.1fMB\n", (size[0]*size[1])/(1024.0*1024)); + printf ("I/O request size is %1.1fMB\n", + ((double)(size[0])*(double)(size[1]))/(1024.0*1024)); /* Open the files */ diff --git a/test/theap.c b/test/theap.c index 4ffc892..e355ded 100644 --- a/test/theap.c +++ b/test/theap.c @@ -21,7 +21,7 @@ #include <H5ACprivate.h> #include <H5Pprivate.h> #include <H5Fprivate.h> -#include <H5Hprivate.h> +#include <H5HLprivate.h> #define NOBJS 40 @@ -61,8 +61,8 @@ test_heap(void) CHECK(f, NULL, "H5I_object"); /* Create a new heap */ - status = H5H_create(f, H5H_LOCAL, 0, &heap_addr /*out */ ); - CHECK_I(status, "H5H_new"); + status = H5HL_create(f, 0, &heap_addr /*out */ ); + CHECK_I(status, "H5HL_create"); /* Add stuff to the heap */ for (i = 0; i < NOBJS; i++) { @@ -72,7 +72,7 @@ test_heap(void) if (j > 4) buf[j] = '\0'; - obj[i] = H5H_insert(f, &heap_addr, strlen(buf) + 1, buf); + obj[i] = H5HL_insert(f, &heap_addr, strlen(buf) + 1, buf); assert ((size_t)(-1)!=obj[i]); } @@ -81,7 +81,7 @@ test_heap(void) /* Read the objects back out */ for (i = 0; i < NOBJS; i++) { - s = H5H_peek(f, &heap_addr, obj[i]); + s = H5HL_peek(f, &heap_addr, obj[i]); MESSAGE(8, ("object is `%s'\n", s)); } |