Merge pull request #2734 from DennisHeimbigner/cachesizes.dmh

Cleanup the handling of cache parameters.

Author: WardF

CMakeLists.txt

@@ -364,14 +364,17 @@ ENDIF()
 # Option checks
 ################################
 
-# HDF5 cache variables.
+# Default Cache variables.
 SET(DEFAULT_CHUNK_SIZE 16777216 CACHE STRING "Default Chunk Cache Size.")
-SET(DEFAULT_CHUNKS_IN_CACHE 10 CACHE STRING "Default number of chunks in cache.")
-SET(CHUNK_CACHE_SIZE 16777216 CACHE STRING "Default Chunk Cache Size.")
-SET(CHUNK_CACHE_NELEMS 4133 CACHE STRING "Default maximum number of elements in cache.")
-SET(CHUNK_CACHE_PREEMPTION 0.75 CACHE STRING "Default file chunk cache preemption policy for HDf5 files(a number between 0 and 1, inclusive.")
-SET(CHUNK_CACHE_SIZE_NCZARR 4194304 CACHE STRING "Default NCZarr Chunk Cache Size.")
-SET(MAX_DEFAULT_CACHE_SIZE 67108864 CACHE STRING "Default maximum cache size.")
+SET(DEFAULT_CHUNK_CACHE_SIZE 16777216U CACHE STRING "Default Chunk Cache Size.")
+SET(DEFAULT_CHUNKS_IN_CACHE 1000 CACHE STRING "Default number of chunks in cache.")
+SET(DEFAULT_CHUNK_CACHE_PREEMPTION 0.75 CACHE STRING "Default file chunk cache preemption policy (a number between 0 and 1, inclusive.")
+
+# HDF5 default cache size values
+SET(CHUNK_CACHE_SIZE ${DEFAULT_CHUNK_CACHE_SIZE} CACHE STRING "Default HDF5 Chunk Cache Size.")
+SET(CHUNK_CACHE_NELEMS ${DEFAULT_CHUNKS_IN_CACHE} CACHE STRING "Default maximum number of elements in cache.")
+SET(CHUNK_CACHE_PREEMPTION ${DEFAULT_CHUNK_CACHE_PREEMPTION} CACHE STRING "Default file chunk cache preemption policy for HDf5 files(a number between 0 and 1, inclusive.")
+
 SET(NETCDF_LIB_NAME "" CACHE STRING "Default name of the netcdf library.")
 SET(TEMP_LARGE "." CACHE STRING "Where to put large temp files if large file tests are run.")
 SET(NCPROPERTIES_EXTRA "" CACHE STRING "Specify extra pairs for _NCProperties.")

RELEASE_NOTES.md

@@ -7,6 +7,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## 4.9.3 - TBD
 
+* Fix default parameters for caching of NCZarr. See [Github #2734](https://github.com/Unidata/netcdf-c/pull/2734).
 * Introducing configure-time options to disable various filters, even if the required libraries are available on the system, in support of [GitHub #2712](https://github.com/Unidata/netcdf-c/pull/2712). 
 * Fix memory leak WRT unreclaimed HDF5 plist. See [Github #2752](https://github.com/Unidata/netcdf-c/pull/2752).
 * Support HDF5 transient types when reading an HDF5 file.  See [Github #2724](https://github.com/Unidata/netcdf-c/pull/2724).

config.h.cmake.in

@@ -83,9 +83,6 @@ are set when opening a binary file on Windows. */
 /* default file chunk cache size in bytes. */
 #cmakedefine CHUNK_CACHE_SIZE ${CHUNK_CACHE_SIZE}
 
-/* default nczarr chunk cache size in bytes. */
-#cmakedefine CHUNK_CACHE_SIZE_NCZARR ${CHUNK_CACHE_SIZE_NCZARR}
-
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -94,7 +91,16 @@ are set when opening a binary file on Windows. */
 /* Define to 1 if using `alloca.c'. */
 #cmakedefine C_ALLOCA 1
 
-/* num chunks in default per-var chunk cache. */
+/* default num chunks per cache. */
+#cmakedefine DEFAULT_CHUNKS_CACHE_SIZE ${DEFAULT_CHUNKS_CACHE_SIZE}
+
+/* default num chunks per cache. */
+#cmakedefine DEFAULT_CHUNK_CACHE_PREEMPTION ${DEFAULT_CHUNK_CACHE_PREEMPTION}
+
+/* default total chunks cache size. */
+#cmakedefine DEFAULT_CHUNK_CACHE_SIZE ${DEFAULT_CHUNK_CACHE_SIZE}
+
+/* default num chunks per cache. */
 #cmakedefine DEFAULT_CHUNKS_IN_CACHE ${DEFAULT_CHUNKS_IN_CACHE}
 
 /* default chunk size in bytes */
@@ -459,9 +465,6 @@ with zip */
 /* If true, define nc_set_log_level. */
 #cmakedefine ENABLE_SET_LOG_LEVEL 1
 
-/* max size of the default per-var chunk cache. */
-#cmakedefine MAX_DEFAULT_CACHE_SIZE ${MAX_DEFAULT_CACHE_SIZE}
-
 /* min blocksize for posixio. */
 #cmakedefine NCIO_MINBLOCKSIZE ${NCIO_MINBLOCKSIZE}
 

configure.ac

@@ -390,48 +390,58 @@ AC_ARG_WITH([default-chunk-size],
 AC_MSG_RESULT([$DEFAULT_CHUNK_SIZE])
 AC_DEFINE_UNQUOTED([DEFAULT_CHUNK_SIZE], [$DEFAULT_CHUNK_SIZE], [default chunk size in bytes])
 
-# Did the user specify a max per-var cache size?
-AC_MSG_CHECKING([whether a maximum per-variable cache size for HDF5 was specified])
-AC_ARG_WITH([max-default-cache-size],
-              [AS_HELP_STRING([--with-max-default-cache-size=<integer>],
-                              [Specify maximum size (in bytes) for the default per-var chunk cache.])],
-            [MAX_DEFAULT_CACHE_SIZE=$with_max_default_cache_size], [MAX_DEFAULT_CACHE_SIZE=67108864])
-AC_MSG_RESULT([$MAX_DEFAULT_CACHE_SIZE])
-AC_DEFINE_UNQUOTED([MAX_DEFAULT_CACHE_SIZE], [$MAX_DEFAULT_CACHE_SIZE], [max size of the default per-var chunk cache.])
-
-# Did the user specify a number of chunks in default per-var cache size?
-AC_MSG_CHECKING([whether a number of chunks for the default per-variable cache was specified])
+# Did the user specify a default cache size?
+AC_MSG_CHECKING([whether a default cache size was specified])
+AC_ARG_WITH([default-chunk-cache-size],
+              [AS_HELP_STRING([--with-default-chunk-cache-size=<integer>],
+                              [Specify default size (in bytes) for chunk cache.])],
+            [DEFAULT_CHUNK_CACHE_SIZE=$with_default_chunk_cache_size], [DEFAULT_CHUNK_CACHE_SIZE=16777216U])
+AC_MSG_RESULT([$DEFAULT_CHUNK_CACHE_SIZE])
+AC_DEFINE_UNQUOTED([DEFAULT_CHUNK_CACHE_SIZE], [$DEFAULT_CHUNK_CACHE_SIZE], [default size of the chunk cache.])
+
+# Did the user specify a max number of chunks in default per-var cache size?
+AC_MSG_CHECKING([whether a default number of entries for the chunk cache was specified])
 AC_ARG_WITH([default-chunks-in-cache],
               [AS_HELP_STRING([--with-default-chunks-in-cache=<integer>],
-                              [Specify the number of chunks to store in default per-variable cache.])],
-            [DEFAULT_CHUNKS_IN_CACHE=$with_default_chunks_in_cache], [DEFAULT_CHUNKS_IN_CACHE=10])
+                              [Specify the max number of chunks to store in cache.])],
+            [DEFAULT_CHUNKS_IN_CACHE=$with_default_chunks_in_cache], [DEFAULT_CHUNKS_IN_CACHE=1000])
 AC_MSG_RESULT([$DEFAULT_CHUNKS_IN_CACHE])
-AC_DEFINE_UNQUOTED([DEFAULT_CHUNKS_IN_CACHE], [$DEFAULT_CHUNKS_IN_CACHE], [num chunks in default per-var chunk cache.])
+AC_DEFINE_UNQUOTED([DEFAULT_CHUNKS_IN_CACHE], [$DEFAULT_CHUNKS_IN_CACHE], [default max num chunks in chunk cache.])
 
+# Did the user specify a default cache preemption
+AC_MSG_CHECKING([whether a default cache preemption was specified])
+AC_ARG_WITH([default-chunk-cache-preemption],
+              [AS_HELP_STRING([--with-chunk-cache-preemption=<float between 0 and 1 inclusive>],
+                              [Specify default file chunk cache preemption policy (a number between 0 and 1, inclusive).])],
+            [DEFAULT_CHUNK_CACHE_PREEMPTION=$with_chunk_cache_preemption], [DEFAULT_CHUNK_CACHE_PREEMPTION=0.75])
+AC_MSG_RESULT([$DEFAULT_CHUNK_CACHE_PREEMPTION])
+AC_DEFINE_UNQUOTED([DEFAULT_CHUNK_CACHE_PREEMPTION], [$DEFAULT_CHUNK_CACHE_PREEMPTION], [default file chunk cache preemption policy.])
+
+# These three options are redundant over the --with-default... options above.
 # Did the user specify a default cache size for HDF5?
 AC_MSG_CHECKING([whether a default file cache size for HDF5 was specified])
 AC_ARG_WITH([chunk-cache-size],
               [AS_HELP_STRING([--with-chunk-cache-size=<integer>],
                               [Specify default file cache chunk size for HDF5 files in bytes.])],
-            [CHUNK_CACHE_SIZE=$with_chunk_cache_size], [CHUNK_CACHE_SIZE=16777216])
+            [CHUNK_CACHE_SIZE=$with_chunk_cache_size], [CHUNK_CACHE_SIZE=DEFAULT_CHUNK_CACHE_SIZE])
 AC_MSG_RESULT([$CHUNK_CACHE_SIZE])
 AC_DEFINE_UNQUOTED([CHUNK_CACHE_SIZE], [$CHUNK_CACHE_SIZE], [default file chunk cache size in bytes.])
 
-# Did the user specify a default cache nelems?
+# Did the user specify a default max cache entries for HDF5
 AC_MSG_CHECKING([whether a default file cache maximum number of elements for HDF5 was specified])
 AC_ARG_WITH([chunk-cache-nelems],
               [AS_HELP_STRING([--with-chunk-cache-nelems=<integer>],
                               [Specify default maximum number of elements in the file chunk cache chunk for HDF5 files (should be prime number).])],
-            [CHUNK_CACHE_NELEMS=$with_chunk_cache_nelems], [CHUNK_CACHE_NELEMS=4133])
+            [CHUNK_CACHE_NELEMS=$with_chunk_cache_nelems], [CHUNK_CACHE_NELEMS=DEFAULT_CHUNKS_IN_CACHE])
 AC_MSG_RESULT([$CHUNK_CACHE_NELEMS])
 AC_DEFINE_UNQUOTED([CHUNK_CACHE_NELEMS], [$CHUNK_CACHE_NELEMS], [default file chunk cache nelems.])
 
-# Did the user specify a default cache preemption?
+# Did the user specify a default cache preemption for HDF5?
 AC_MSG_CHECKING([whether a default cache preemption for HDF5 was specified])
 AC_ARG_WITH([chunk-cache-preemption],
               [AS_HELP_STRING([--with-chunk-cache-preemption=<float between 0 and 1 inclusive>],
                               [Specify default file chunk cache preemption policy for HDF5 files (a number between 0 and 1, inclusive).])],
-            [CHUNK_CACHE_PREEMPTION=$with_chunk_cache_preemption], [CHUNK_CACHE_PREEMPTION=0.75])
+            [CHUNK_CACHE_PREEMPTION=$with_chunk_cache_preemption], [CHUNK_CACHE_PREEMPTION=DEFAULT_CHUNK_CACHE_PREEMPTION])
 AC_MSG_RESULT([$CHUNK_CACHE_PREEMPTION])
 AC_DEFINE_UNQUOTED([CHUNK_CACHE_PREEMPTION], [$CHUNK_CACHE_PREEMPTION], [default file chunk cache preemption policy.])
 
@@ -953,16 +963,6 @@ if test "x$with_s3_testing" = xyes ; then
   AC_MSG_WARN([*** DO NOT SPECIFY WITH_S3_TESTING=YES UNLESS YOU HAVE ACCESS TO THE UNIDATA S3 BUCKET! ***])
 fi
 
-# Set default
-# Did the user specify a default cache size for NCZarr?
-AC_MSG_CHECKING([whether a default file cache size for NCZarr was specified])
-AC_ARG_WITH([chunk-cache-size-nczarr],
-              [AS_HELP_STRING([--with-chunk-cache-size-nczarr=<integer>],
-                              [Specify default maximum space used by the chunk cache NCZarr.])],
-            [CHUNK_CACHE_SIZE_NCZARR=$with_chunk_cache_size_nczarr], [CHUNK_CACHE_SIZE_NCZARR=4194304])
-AC_MSG_RESULT([$CHUNK_CACHE_SIZE_NCZARR])
-AC_DEFINE_UNQUOTED([CHUNK_CACHE_SIZE_NCZARR], [$CHUNK_CACHE_SIZE_NCZARR], [default nczarr chunk cache size.])
-
 # Check whether we want to enable strict null byte header padding.
 # See https://github.com/Unidata/netcdf-c/issues/657 for more information.
 AC_MSG_CHECKING([whether to enable strict null-byte header padding when reading (default off)])

libhdf5/nc4hdf.c

@@ -1144,8 +1144,8 @@ nc4_adjust_var_cache(NC_GRP_INFO_T *grp, NC_VAR_INFO_T *var)
         if (chunk_size_bytes > var->chunkcache.size)
         {
             var->chunkcache.size = chunk_size_bytes * DEFAULT_CHUNKS_IN_CACHE;
-            if (var->chunkcache.size > MAX_DEFAULT_CACHE_SIZE)
-                var->chunkcache.size = MAX_DEFAULT_CACHE_SIZE;
+            if (var->chunkcache.size > DEFAULT_CHUNK_CACHE_SIZE)
+                var->chunkcache.size = DEFAULT_CHUNK_CACHE_SIZE;
             if ((retval = nc4_reopen_dataset(grp, var)))
                 return retval;
         }

libnczarr/zcache.h

@@ -44,8 +44,7 @@ typedef struct NCZChunkCache {
     size64_t chunksize; /* for real data */
     size64_t chunkcount; /* cross product of chunksizes */
     void* fillchunk; /* enough fillvalues to fill a real chunk */
-    size_t maxentries; /* Max number of entries allowed; maxsize can override */
-    size_t maxsize; /* Maximum space used by cache; 0 => nolimit */
+    struct ChunkCache params;
     size_t used; /* How much total space is being used */
     NClist* mru; /* NClist<NCZCacheEntry> all cache entries in mru order */
     struct NCxcache* xcache;

libnczarr/zinternal.h

@@ -99,11 +99,11 @@ Inserted into any .zattrs ? or should it go into the container?
 #define LEGAL_DIM_SEPARATORS "./"
 #define DFALT_DIM_SEPARATOR '.'
 
+#define islegaldimsep(c) ((c) != '\0' && strchr(LEGAL_DIM_SEPARATORS,(c)) != NULL)
+
 /* Default max string length for fixed length strings */
 #define NCZ_MAXSTR_DEFAULT 128
 
-#define islegaldimsep(c) ((c) != '\0' && strchr(LEGAL_DIM_SEPARATORS,(c)) != NULL)
-
 /* Mnemonics */
 #define ZCLEAR	0 /* For NCZ_copy_data */
 #define ZCLOSE	1 /* this is closeorabort as opposed to enddef */

libnczarr/zvar.c

@@ -297,6 +297,7 @@ NCZ_def_var(int ncid, const char *name, nc_type xtype, int ndims,
     char norm_name[NC_MAX_NAME + 1];
     int d;
     int retval;
+    NCglobalstate* gstate = NC_getglobalstate();
 
     ZTRACE(1,"ncid=%d name=%s xtype=%d ndims=%d dimids=%s",ncid,name,xtype,ndims,nczprint_idvector(ndims,dimidsp));
 
@@ -383,7 +384,7 @@ NCZ_def_var(int ncid, const char *name, nc_type xtype, int ndims,
     zvar->common.file = h5;
     zvar->scalar = (ndims == 0 ? 1 : 0);
 
-    zvar->dimension_separator = NC_getglobalstate()->zarr.dimension_separator;
+    zvar->dimension_separator = gstate->zarr.dimension_separator;
     assert(zvar->dimension_separator != 0);
 
     /* Set these state flags for the var. */
@@ -460,15 +461,16 @@ var->type_info->rc++;
         {for(d=0;d<var->ndims;d++) {zvar->chunkproduct *= var->chunksizes[d];}}
     zvar->chunksize = zvar->chunkproduct * var->type_info->size;
 
-    /* Override the cache setting to use NCZarr defaults */
-    var->chunkcache.size = CHUNK_CACHE_SIZE_NCZARR;
-    var->chunkcache.nelems = ceildiv(var->chunkcache.size,zvar->chunksize);
-    var->chunkcache.preemption = 1; /* not used */
+    /* Set cache defaults */
+    var->chunkcache = gstate->chunkcache;
 
     /* Create the cache */
     if((retval=NCZ_create_chunk_cache(var,zvar->chunkproduct*var->type_info->size,zvar->dimension_separator,&zvar->cache)))
 	BAIL(retval);
 
+    /* Set the per-variable chunkcache defaults */
+    zvar->cache->params = var->chunkcache;
+
     /* Return the varid. */
     if (varidp)
 	*varidp = var->hdr.id;

libnczarr/zxcache.c

@@ -120,8 +120,9 @@ fprintf(stderr,"xxx: adjusting cache for: %s\n",var->hdr.name);
     /* Reclaim any existing fill_chunk */
     if((stat = NCZ_reclaim_fill_chunk(zcache))) goto done;
     /* Reset the parameters */
-    zvar->cache->maxsize = var->chunkcache.size;
-    zvar->cache->maxentries = var->chunkcache.nelems;
+    zvar->cache->params.size = var->chunkcache.size;
+    zvar->cache->params.nelems = var->chunkcache.nelems;
+    zvar->cache->params.preemption = var->chunkcache.preemption;
 #ifdef DEBUG
     fprintf(stderr,"%s.cache.adjust: size=%ld nelems=%ld\n",
         var->hdr.name,(unsigned long)zvar->cache->maxsize,(unsigned long)zvar->cache->maxentries);
@@ -181,6 +182,9 @@ NCZ_create_chunk_cache(NC_VAR_INFO_T* var, size64_t chunksize, char dimsep, NCZC
         }
     }
 
+    /* Set default cache parameters */
+    cache->params = NC_getglobalstate()->chunkcache;
+
 #ifdef FLUSH
     cache->maxentries = 1;
 #endif
@@ -192,7 +196,7 @@ NCZ_create_chunk_cache(NC_VAR_INFO_T* var, size64_t chunksize, char dimsep, NCZC
     if((stat = ncxcachenew(LEAFLEN,&cache->xcache))) goto done;
     if((cache->mru = nclistnew()) == NULL)
 	{stat = NC_ENOMEM; goto done;}
-    nclistsetalloc(cache->mru,cache->maxentries);
+    nclistsetalloc(cache->mru,cache->params.nelems);
 
     if(cachep) {*cachep = cache; cache = NULL;}
 done:
@@ -371,8 +375,12 @@ makeroom(NCZChunkCache* cache)
 static int
 flushcache(NCZChunkCache* cache)
 {
-    cache->maxentries = 0;
-    return constraincache(cache);
+    int stat = NC_NOERR;
+    size_t oldsize = cache->params.size;
+    cache->params.size = 0;
+    stat = constraincache(cache);
+    cache->params.size = oldsize;
+    return stat;
 }
 
 
@@ -391,7 +399,7 @@ constraincache(NCZChunkCache* cache)
     if(cache->used == 0) goto done;
 
     /* Flush from LRU end if we are at capacity */
-    while(nclistlength(cache->mru) > cache->maxentries || cache->used > cache->maxsize) {
+    while(nclistlength(cache->mru) > cache->params.nelems || cache->used > cache->params.size) {
 	int i;
 	void* ptr;
 	NCZCacheEntry* e = ncxcachelast(cache->xcache); /* last entry is the least recently used */
@@ -858,8 +866,8 @@ NCZ_printxcache(NCZChunkCache* cache)
     ncbytescat(buf,s);
 
     snprintf(s,sizeof(s),"\tmaxentries=%u\n\tmaxsize=%u\n\tused=%u\n\tdimsep='%c'\n",
-    	(unsigned)cache->maxentries,
-    	(unsigned)cache->maxsize,
+    	(unsigned)cache->params.nelems,
+	(unsigned)cache->params.size,
     	(unsigned)cache->used,
     	cache->dimension_separator
 	);

libsrc4/nc4internal.c

@@ -2084,9 +2084,9 @@ NC_createglobalstate(void)
     if(tmp != NULL && strlen(tmp) > 0)
         nc_globalstate->rcinfo->rcfile = strdup(tmp);
     /* Initialize chunk cache defaults */
-    nc_globalstate->chunkcache.size = CHUNK_CACHE_SIZE;            /**< Default chunk cache size. */
-    nc_globalstate->chunkcache.nelems = CHUNK_CACHE_NELEMS;        /**< Default chunk cache number of elements. */
-    nc_globalstate->chunkcache.preemption = CHUNK_CACHE_PREEMPTION; /**< Default chunk cache preemption. */
+    nc_globalstate->chunkcache.size = DEFAULT_CHUNK_CACHE_SIZE;		    /**< Default chunk cache size. */
+    nc_globalstate->chunkcache.nelems = DEFAULT_CHUNKS_IN_CACHE;	    /**< Default chunk cache number of elements. */
+    nc_globalstate->chunkcache.preemption = DEFAULT_CHUNK_CACHE_PREEMPTION; /**< Default chunk cache preemption. */
 
 done:
     return stat;