diff options
-rw-r--r-- | MANIFEST | 13 | ||||
-rw-r--r-- | src/H5F.c | 34 | ||||
-rw-r--r-- | src/H5Fpkg.h | 2 | ||||
-rw-r--r-- | src/H5private.h | 28 | ||||
-rwxr-xr-x | src/Makefile.am | 8 | ||||
-rw-r--r-- | src/Makefile.in | 14 | ||||
-rw-r--r-- | test/Makefile.am | 4 | ||||
-rw-r--r-- | test/Makefile.in | 29 | ||||
-rw-r--r-- | testpar/Makefile.am | 3 | ||||
-rw-r--r-- | testpar/Makefile.in | 20 |
10 files changed, 132 insertions, 23 deletions
@@ -429,6 +429,10 @@ ./src/H5ACpkg.h ./src/H5ACprivate.h ./src/H5ACpublic.h +./src/H5AC2.c +./src/H5AC2pkg.h +./src/H5AC2private.h +./src/H5AC2public.h ./src/H5B.c ./src/H5Bcache.c ./src/H5Bpkg.h @@ -447,6 +451,10 @@ ./src/H5Cpkg.h ./src/H5Cprivate.h ./src/H5Cpublic.h +./src/H5C2.c +./src/H5C2pkg.h +./src/H5C2private.h +./src/H5C2public.h ./src/H5CS.c ./src/H5CSprivate.h ./src/H5D.c @@ -733,9 +741,13 @@ ./test/bittests.c ./test/btree2.c ./test/cache.c +./test/cache2.c ./test/cache_api.c +./test/cache2_api.c ./test/cache_common.c +./test/cache2_common.c ./test/cache_common.h +./test/cache2_common.h ./test/cmpd_dset.c ./test/cross_read.c ./test/dangle.c @@ -854,6 +866,7 @@ ./testpar/Makefile.am ./testpar/Makefile.in ./testpar/t_cache.c +./testpar/t_cache2.c ./testpar/t_dset.c ./testpar/t_file.c ./testpar/t_mdset.c @@ -23,6 +23,9 @@ #include "H5private.h" /* Generic Functions */ #include "H5Aprivate.h" /* Attributes */ #include "H5ACprivate.h" /* Metadata cache */ +#if 1 /* JRM */ +#include "H5AC2private.h" /* Metadata cache2 */ +#endif /* JRM */ #include "H5Dprivate.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ #include "H5Fpkg.h" /* File access */ @@ -930,7 +933,15 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf) */ if(SUCCEED != H5AC_create(f, &(f->shared->mdc_initCacheCfg))) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create meta data cache") - +#if 1 /* JRM */ + /* create a metadata cache with modified API along side the regular + * version. For now, this is just for testing. Once we get it + * fully in use, we will delete the old version. + */ + if(SUCCEED != H5AC2_create(f, + (H5AC2_cache_config_t *)&(f->shared->mdc_initCacheCfg))) + HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create meta data cache2") +#endif /* JRM */ /* Create the file's "open object" information */ if(H5FO_create(f) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create open object data structure") @@ -1029,6 +1040,12 @@ H5F_dest(H5F_t *f, hid_t dxpl_id) if(H5AC_dest(f, dxpl_id)) /* Push error, but keep going*/ HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file") +#if 1 /* JRM */ + /* also destroy the modified cache */ + if(H5AC2_dest(f, dxpl_id)) + /* Push error, but keep going*/ + HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file") +#endif /* JRM */ if(H5FO_dest(f) < 0) /* Push error, but keep going*/ HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file") @@ -1703,6 +1720,11 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags) H5AC_flags |= H5AC__FLUSH_INVALIDATE_FLAG; if(H5AC_flush(f, dxpl_id, H5AC_flags) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush meta data cache") +#if 1 /* JRM */ + if(H5AC2_flush(f, dxpl_id, H5AC_flags) < 0) + HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ + "unable to flush meta data cache2") +#endif /* JRM */ /* * If we are invalidating everything (which only happens just before @@ -3329,7 +3351,17 @@ H5Fset_mdc_config(hid_t file_id, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \ "H5AC_set_cache_auto_resize_config() failed."); } +#if 1 /* JRM */ + /* pass the resize configuration to the modified cache as well. */ + result = H5AC2_set_cache_auto_resize_config(file->shared->cache2, + (H5AC2_cache_config_t *)config_ptr); + if ( result != SUCCEED ) { + + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \ + "H5AC2_set_cache_auto_resize_config() failed."); + } +#endif /* JRM */ done: FUNC_LEAVE_API(ret_value) diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index a104e61..3e13b0d 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -41,6 +41,7 @@ #include "H5Gprivate.h" /* Groups */ #include "H5Oprivate.h" /* Object header messages */ #include "H5RCprivate.h" /* Reference counted object functions */ +#include "H5AC2private.h" /* cache */ /* * Feature: Define this constant on the compiler command-line if you want to @@ -90,6 +91,7 @@ typedef struct H5F_file_t { hbool_t fam_to_sec2; /* Is h5repart changing driver from family to sec2 */ H5AC_t *cache; /* The object cache */ + H5AC2_t *cache2; /* test cache */ H5AC_cache_config_t mdc_initCacheCfg; /* initial configuration for the */ /* metadata cache. This structure is */ diff --git a/src/H5private.h b/src/H5private.h index dad4e13..e5fa35a 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1050,7 +1050,34 @@ H5_DLL double H5_trace(const double *calltime, const char *func, const char *typ /* `S' is the name of a function which is being tested to check if its */ /* an API function */ +#if 0 #define H5_IS_API(S) ('_'!=S[2] && '_'!=S[3] && (!S[4] || '_'!=S[4])) +#else +/* +#define H5_IS_API(S) ('_'!=S[2] && '_'!=S[3] && (!S[4] || '_'!=S[4]) && \ + (!S[5] || ('_'!=S[5] && (S[4]>='a' && S[4]<='z')))) +*/ +#define H5_IS_API(S) ( ( 'H' == S[0] ) \ + && \ + ( '5' == S[1] ) \ + && \ + ( ( islower(S[2]) ) \ + || \ + ( ( ( isupper(S[2]) ) || ( isdigit(S[2]) ) ) \ + && \ + ( islower(S[3]) ) \ + ) \ + || \ + ( ( ( isupper(S[2]) ) || ( isdigit(S[2]) ) ) \ + && \ + ( ( isupper(S[3]) ) || ( isdigit(S[3]) ) ) \ + && \ + ( islower(S[4]) ) \ + ) \ + ) \ + ) + +#endif /* global library version information string */ extern char H5_lib_vers_info_g[]; @@ -1391,6 +1418,7 @@ H5_DLL void H5_term_library(void); /* Functions to terminate interfaces */ H5_DLL int H5A_term_interface(void); H5_DLL int H5AC_term_interface(void); +H5_DLL int H5AC2_term_interface(void); H5_DLL int H5D_term_interface(void); H5_DLL int H5E_term_interface(void); H5_DLL int H5F_term_interface(void); diff --git a/src/Makefile.am b/src/Makefile.am index d742282..7319c1c 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,9 +43,9 @@ DISTCLEANFILES=H5pubconf.h # library sources libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ H5A.c H5Abtree2.c H5Adense.c H5Adeprec.c H5Aint.c H5Atest.c \ - H5AC.c H5B.c H5Bcache.c \ + H5AC.c H5AC2.c H5B.c H5Bcache.c \ H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \ - H5C.c H5CS.c \ + H5C.c H5C2.c H5CS.c \ H5D.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \ H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c \ H5Dio.c \ @@ -97,8 +97,8 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ # Public headers include_HEADERS = hdf5.h H5api_adpt.h H5pubconf.h H5public.h H5version.h \ - H5Apublic.h H5ACpublic.h \ - H5Cpublic.h H5Dpublic.h \ + H5Apublic.h H5ACpublic.h H5AC2public.h \ + H5Cpublic.h H5C2public.h H5Dpublic.h \ H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDdirect.h \ H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \ H5FDmulti.h H5FDsec2.h H5FDstdio.h \ diff --git a/src/Makefile.in b/src/Makefile.in index 1dbf810..3462319 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -80,9 +80,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libhdf5_la_LIBADD = am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \ H5timer.lo H5trace.lo H5A.lo H5Abtree2.lo H5Adense.lo \ - H5Adeprec.lo H5Aint.lo H5Atest.lo H5AC.lo H5B.lo H5Bcache.lo \ + H5Adeprec.lo H5Aint.lo H5Atest.lo H5AC.lo H5AC2.lo H5B.lo H5Bcache.lo \ H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo H5B2stat.lo \ - H5B2test.lo H5C.lo H5CS.lo H5D.lo H5Dcompact.lo H5Dcontig.lo \ + H5B2test.lo H5C.lo H5C2.lo H5CS.lo H5D.lo H5Dcompact.lo H5Dcontig.lo \ H5Ddbg.lo H5Ddeprec.lo H5Defl.lo H5Dfill.lo H5Dint.lo H5Dio.lo \ H5Distore.lo H5Dmpio.lo H5Doh.lo H5Dselect.lo H5Dtest.lo \ H5E.lo H5Edeprec.lo H5Eint.lo H5F.lo H5Fdbg.lo H5Ffake.lo \ @@ -400,9 +400,9 @@ DISTCLEANFILES = H5pubconf.h # library sources libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ H5A.c H5Abtree2.c H5Adense.c H5Adeprec.c H5Aint.c H5Atest.c \ - H5AC.c H5B.c H5Bcache.c \ + H5AC.c H5AC2.c H5B.c H5Bcache.c \ H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \ - H5C.c H5CS.c \ + H5C.c H5C2.c H5CS.c \ H5D.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \ H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c \ H5Dio.c \ @@ -454,8 +454,8 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ # Public headers include_HEADERS = hdf5.h H5api_adpt.h H5pubconf.h H5public.h H5version.h \ - H5Apublic.h H5ACpublic.h \ - H5Cpublic.h H5Dpublic.h \ + H5Apublic.h H5ACpublic.h H5AC2public.h \ + H5Cpublic.h H5C2public.h H5Dpublic.h \ H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDdirect.h \ H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h \ H5FDmulti.h H5FDsec2.h H5FDstdio.h \ @@ -585,6 +585,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5A.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Abtree2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adense.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adeprec.Plo@am__quote@ @@ -599,6 +600,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2test.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Bcache.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CS.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5D.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcompact.Plo@am__quote@ diff --git a/test/Makefile.am b/test/Makefile.am index 0947adc..84149cb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -36,7 +36,7 @@ SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) # These tests (fheap, btree2) are under development and are not used by # the library yet. Move them to the end so that their failure do not block # other current library code tests. -TEST_PROG=testhdf5 lheap ohdr stab gheap cache cache_api \ +TEST_PROG=testhdf5 lheap ohdr stab gheap cache cache_api cache2 cache2_api \ pool hyperslab istore bittests dt_arith \ dtypes dsets cmpd_dset extend external objcopy links unlink big mtime \ fillval mount flush1 flush2 enum \ @@ -69,7 +69,7 @@ endif # The libh5test library provides common support code for the tests. noinst_LTLIBRARIES=libh5test.la -libh5test_la_SOURCES=h5test.c testframe.c cache_common.c +libh5test_la_SOURCES=h5test.c testframe.c cache_common.c cache2_common.c # Use libhd5test.la to compile all of the tests LDADD=libh5test.la $(LIBHDF5) diff --git a/test/Makefile.in b/test/Makefile.in index 32698dc..a142b99 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -67,10 +67,12 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = testerror.sh LTLIBRARIES = $(noinst_LTLIBRARIES) libh5test_la_LIBADD = -am_libh5test_la_OBJECTS = h5test.lo testframe.lo cache_common.lo +am_libh5test_la_OBJECTS = h5test.lo testframe.lo cache_common.lo \ + cache2_common.lo libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS) am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \ stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) cache_api$(EXEEXT) \ + cache2$(EXEEXT) cache2_api$(EXEEXT) \ pool$(EXEEXT) hyperslab$(EXEEXT) istore$(EXEEXT) \ bittests$(EXEEXT) dt_arith$(EXEEXT) dtypes$(EXEEXT) \ dsets$(EXEEXT) cmpd_dset$(EXEEXT) extend$(EXEEXT) \ @@ -105,6 +107,14 @@ cache_SOURCES = cache.c cache_OBJECTS = cache.$(OBJEXT) cache_LDADD = $(LDADD) cache_DEPENDENCIES = libh5test.la $(LIBHDF5) +cache2_SOURCES = cache2.c +cache2_OBJECTS = cache2.$(OBJEXT) +cache2_LDADD = $(LDADD) +cache2_DEPENDENCIES = libh5test.la $(LIBHDF5) +cache2_api_SOURCES = cache2_api.c +cache2_api_OBJECTS = cache2_api.$(OBJEXT) +cache2_api_LDADD = $(LDADD) +cache2_api_DEPENDENCIES = libh5test.la $(LIBHDF5) cache_api_SOURCES = cache_api.c cache_api_OBJECTS = cache_api.$(OBJEXT) cache_api_LDADD = $(LDADD) @@ -328,6 +338,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c \ + cache2.c cache2_api.c \ cache_api.c cmpd_dset.c cross_read.c dangle.c dsets.c \ dt_arith.c dtransform.c dtypes.c enum.c err_compat.c \ error_test.c extend.c external.c fheap.c fillval.c flush1.c \ @@ -339,7 +350,8 @@ SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c \ set_extent.c space_overflow.c stab.c $(testhdf5_SOURCES) \ testmeta.c $(ttsafe_SOURCES) unlink.c vfd.c DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c \ - cache.c cache_api.c cmpd_dset.c cross_read.c dangle.c dsets.c \ + cache.c cache2.c cache2_api.c \ + cache_api.c cmpd_dset.c cross_read.c dangle.c dsets.c \ dt_arith.c dtransform.c dtypes.c enum.c err_compat.c \ error_test.c extend.c external.c fheap.c fillval.c flush1.c \ flush2.c gen_bogus.c gen_cross.c gen_deflate.c gen_filters.c \ @@ -615,7 +627,7 @@ SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) # These tests (fheap, btree2) are under development and are not used by # the library yet. Move them to the end so that their failure do not block # other current library code tests. -TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api \ +TEST_PROG = testhdf5 lheap ohdr stab gheap cache cache_api cache2 cache2_api \ pool hyperslab istore bittests dt_arith \ dtypes dsets cmpd_dset extend external objcopy links unlink big mtime \ fillval mount flush1 flush2 enum \ @@ -638,7 +650,7 @@ BUILD_ALL_PROGS = gen_bogus gen_cross gen_deflate gen_filters gen_new_array \ # The libh5test library provides common support code for the tests. noinst_LTLIBRARIES = libh5test.la -libh5test_la_SOURCES = h5test.c testframe.c cache_common.c +libh5test_la_SOURCES = h5test.c testframe.c cache_common.c cache2_common.c # Use libhd5test.la to compile all of the tests LDADD = libh5test.la $(LIBHDF5) @@ -747,6 +759,12 @@ btree2$(EXEEXT): $(btree2_OBJECTS) $(btree2_DEPENDENCIES) cache$(EXEEXT): $(cache_OBJECTS) $(cache_DEPENDENCIES) @rm -f cache$(EXEEXT) $(LINK) $(cache_OBJECTS) $(cache_LDADD) $(LIBS) +cache2$(EXEEXT): $(cache2_OBJECTS) $(cache2_DEPENDENCIES) + @rm -f cache2$(EXEEXT) + $(LINK) $(cache2_OBJECTS) $(cache2_LDADD) $(LIBS) +cache2_api$(EXEEXT): $(cache2_api_OBJECTS) $(cache2_api_DEPENDENCIES) + @rm -f cache2_api$(EXEEXT) + $(LINK) $(cache2_api_OBJECTS) $(cache2_api_LDADD) $(LIBS) cache_api$(EXEEXT): $(cache_api_OBJECTS) $(cache_api_DEPENDENCIES) @rm -f cache_api$(EXEEXT) $(LINK) $(cache_api_OBJECTS) $(cache_api_LDADD) $(LIBS) @@ -908,6 +926,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bittests.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btree2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache2_api.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache2_common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache_api.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache_common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmpd_dset.Po@am__quote@ diff --git a/testpar/Makefile.am b/testpar/Makefile.am index 02cf742..df3a168 100644 --- a/testpar/Makefile.am +++ b/testpar/Makefile.am @@ -25,7 +25,8 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test # Test programs and scripts. These are our main targets. # -TEST_PROG_PARA=t_mpi t_posix_compliant testphdf5 t_cache t_pflush1 t_pflush2 +TEST_PROG_PARA=t_mpi t_posix_compliant testphdf5 t_cache t_cache2 \ + t_pflush1 t_pflush2 TEST_SCRIPT_PARA=testph5.sh check_PROGRAMS = $(TEST_PROG_PARA) diff --git a/testpar/Makefile.in b/testpar/Makefile.in index ba73cb2..e812e78 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -62,12 +62,16 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = testph5.sh am__EXEEXT_1 = t_mpi$(EXEEXT) t_posix_compliant$(EXEEXT) \ - testphdf5$(EXEEXT) t_cache$(EXEEXT) t_pflush1$(EXEEXT) \ - t_pflush2$(EXEEXT) + testphdf5$(EXEEXT) t_cache$(EXEEXT) t_cache2$(EXEEXT) \ + t_pflush1$(EXEEXT) t_pflush2$(EXEEXT) t_cache_SOURCES = t_cache.c t_cache_OBJECTS = t_cache.$(OBJEXT) t_cache_LDADD = $(LDADD) t_cache_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) +t_cache2_SOURCES = t_cache2.c +t_cache2_OBJECTS = t_cache2.$(OBJEXT) +t_cache2_LDADD = $(LDADD) +t_cache2_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) t_mpi_SOURCES = t_mpi.c t_mpi_OBJECTS = t_mpi.$(OBJEXT) t_mpi_LDADD = $(LDADD) @@ -103,9 +107,9 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c \ +SOURCES = t_cache.c t_cache2.c t_mpi.c t_pflush1.c t_pflush2.c \ t_posix_compliant.c $(testphdf5_SOURCES) -DIST_SOURCES = t_cache.c t_mpi.c t_pflush1.c t_pflush2.c \ +DIST_SOURCES = t_cache.c t_cache2.c t_mpi.c t_pflush1.c t_pflush2.c \ t_posix_compliant.c $(testphdf5_SOURCES) ETAGS = etags CTAGS = ctags @@ -346,7 +350,9 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test # Test programs and scripts. These are our main targets. # -TEST_PROG_PARA = t_mpi t_posix_compliant testphdf5 t_cache t_pflush1 t_pflush2 +TEST_PROG_PARA = t_mpi t_posix_compliant testphdf5 t_cache t_cache2 \ + t_pflush1 t_pflush2 + TEST_SCRIPT_PARA = testph5.sh check_SCRIPTS = $(TEST_SCRIPT) testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_mdset.c t_ph5basic.c \ @@ -417,6 +423,9 @@ clean-checkPROGRAMS: t_cache$(EXEEXT): $(t_cache_OBJECTS) $(t_cache_DEPENDENCIES) @rm -f t_cache$(EXEEXT) $(LINK) $(t_cache_OBJECTS) $(t_cache_LDADD) $(LIBS) +t_cache2$(EXEEXT): $(t_cache2_OBJECTS) $(t_cache2_DEPENDENCIES) + @rm -f t_cache2$(EXEEXT) + $(LINK) $(t_cache2_OBJECTS) $(t_cache2_LDADD) $(LIBS) t_mpi$(EXEEXT): $(t_mpi_OBJECTS) $(t_mpi_DEPENDENCIES) @rm -f t_mpi$(EXEEXT) $(LINK) $(t_mpi_OBJECTS) $(t_mpi_LDADD) $(LIBS) @@ -440,6 +449,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_cache.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_cache2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_chunk_alloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_coll_chunk.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_dset.Po@am__quote@ |