Skip to content
Snippets Groups Projects
Commit bc6a8ad2 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Limit chunksizehint to filesize.

parent 732fcc10
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,10 @@
* using CGRIBEX library version 1.9.1
* Version 1.9.5 released
2018-05-31 Uwe Schulzweida
* Limit chunksizehint to filesize
2018-05-30 Uwe Schulzweida
* Added error code CDI_ETMOF (Too many open files)
......
......@@ -77,7 +77,7 @@ int cdf_open(const char *path, int omode, int *ncidp)
struct stat filestat;
size_t chunksizehint = 0;
#if defined (HAVE_LIBNC_DAP)
#ifdef HAVE_LIBNC_DAP
if ( strncmp(path, "http:", 5) == 0 || strncmp(path, "https:", 6) == 0 ) dapfile = true;
#endif
......@@ -89,8 +89,9 @@ int cdf_open(const char *path, int omode, int *ncidp)
{
if ( stat(path, &filestat) != 0 ) SysError(path);
#if defined (HAVE_STRUCT_STAT_ST_BLKSIZE)
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
chunksizehint = (size_t) filestat.st_blksize * 4;
if ( chunksizehint > (size_t) filestat.st_size ) chunksizehint = (size_t) filestat.st_size;
#endif
/*
if ( chunksizehint < ChunkSizeMin ) chunksizehint = ChunkSizeMin;
......@@ -101,7 +102,7 @@ int cdf_open(const char *path, int omode, int *ncidp)
/* FIXME: parallel part missing */
status = nc__open(path, omode, &chunksizehint, ncidp);
if ( CDF_Debug ) Message("chunksizehint %d", chunksizehint);
if ( CDF_Debug ) Message("chunksizehint %zu", chunksizehint);
}
if ( CDF_Debug )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment