From 81280c7878290bf784ee3984e968bb4bca5bf7a2 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Wed, 5 Dec 2012 18:35:42 +0000 Subject: [PATCH] Merge from latest netcdf-cmake branch. - Fixes for Windows. - CMake-based changes (functionality, tests). - Smattering of coverity-informed bug-fixes. --- CMakeLists.txt | 20 ++++++++++++++------ cmake_config.h.in | 26 ++++++++++++++++++-------- include/netcdf.h | 16 +++++++++++++--- libdap2/dceparselex.h | 4 ++-- libdispatch/dv2i.c | 29 ++++++++++++++++++++++------- libsrc/XGetopt.c | 2 +- libsrc/posixio.c | 2 -- nc_test/CMakeLists.txt | 4 ++++ nc_test/tst_big_rvar.c | 4 ++-- nc_test/tst_big_var2.c | 4 ++-- nc_test/tst_big_var6.c | 2 +- ncdump/CMakeLists.txt | 40 ++++++++++++++++++++++------------------ ncdump/XGetopt.c | 2 +- ncgen/XGetopt.c | 2 +- ncgen3/XGetopt.c | 2 +- oc2/dapparselex.h | 4 ---- 16 files changed, 104 insertions(+), 59 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a04b0a44..b07e28eb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ - + #Minimum required CMake Version cmake_minimum_required(VERSION 2.8.8) @@ -90,7 +90,7 @@ MACRO(add_bin_env_test prefix F) ENDIF() - ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=/machine/wfisher/netcdf-cmake/ncgen;" "export TOPSRCDIR=/machine/wfisher/netcdf-cmake;" "/machine/wfisher/netcdf-cmake/build/ncgen/run_tests.sh" "-c" "export TOPSRCDIR=${CMAKE_SOURCE_DIR};" ${EXECUTABLE_OUTPUT_PATH}/${prefix}_${F}) + ADD_TEST(${prefix}_${F} bash "-c" "TOPSRCDIR=${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${prefix}_${F}") IF(MSVC) SET_PROPERTY(TARGET ${prefix}_${F} PROPERTY FOLDER "tests") ENDIF() @@ -129,7 +129,7 @@ ENDMACRO() # Shell script Macro MACRO(add_sh_test prefix F) IF(NOT MSVC) - ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};" "export TOPSRCDIR=${CMAKE_SOURCE_DIR};" "${CMAKE_CURRENT_BINARY_DIR}/${F}.sh") + ADD_TEST(${prefix}_${F} bash "-c" "export srcdir=${CMAKE_CURRENT_SOURCE_DIR};export TOPSRCDIR=${CMAKE_SOURCE_DIR};${CMAKE_CURRENT_BINARY_DIR}/${F}.sh") ENDIF() ENDMACRO() @@ -189,7 +189,9 @@ ENDIF() # Option Logging, only valid for netcdf4. OPTION (ENABLE_LOGGING "Enable Logging." OFF) - +IF(ENABLE_LOGGING) + SET(LOGGING ON) +ENDIF() # Option to use HDF4 OPTION (USE_HDF4 "Build NetCDF-4 with HDF5 read capability (HDF4, HDF5 and Zlib required." OFF) IF (USE_HDF4) @@ -341,6 +343,9 @@ IF(ENABLE_LARGE_FILE_TESTS) SET(LARGE_FILE_TESTS ON) ENDIF() +# Location for large file tests. +SET(TEMP_LARGE "." CACHE STRING "Location to store large file tests.") + OPTION (ENABLE_INTERNAL_DOCS "Enable documentation of library internals. This is of interest only to those developing the netCDF library." OFF) IF(ENABLE_INTERNAL_DOCS) SET(BUILD_INTERNAL_DOCS ON) @@ -434,6 +439,8 @@ CHECK_TYPE_SIZE("off_t" SIZEOF_OFF_T) CHECK_TYPE_SIZE("short" SIZEOF_SHORT) CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T) CHECK_TYPE_SIZE("uchar" SIZEOF_UCHAR) +CHECK_TYPE_SIZE("int64_t" SIZEOF_INT64_T) +CHECK_TYPE_SIZE("uint64_t" SIZEOF_UINT64_T) # Check for various functions. CHECK_FUNCTION_EXISTS(fsync HAVE_FSYNC) @@ -639,8 +646,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT ) SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/COPYRIGHT.txt") -SET(CPACK_PACKAGE_VERSION "4.2.x-Developer_Snapshot") - +IF(NOT CPACK_PACK_VERSION) + SET(CPACK_PACKAGE_VERSION "4.2.x-Developer_Snapshot") +ENDIF() IF(APPLE) SET(CPACK_SOURCE_GENERATOR "TBZ2") SET(CPACK_GENERATOR "PackageMaker" "STGZ" "TBZ2" "TGZ" "ZIP") diff --git a/cmake_config.h.in b/cmake_config.h.in index be6407f92..a9774af0c 100644 --- a/cmake_config.h.in +++ b/cmake_config.h.in @@ -1,30 +1,40 @@ +#ifndef CONFIG_H +#define CONFIG_H +#define HAVE_CONFIG_H + /* Eliminate a number of warnings which come up based on deprecated POSIX naming conventions. */ #ifdef _MSC_VER /* Disable a few warnings under Visual Studio, for the time being. */ -#include - + #include #pragma warning( disable: 4018 4996 4244 4305 ) #define unlink _unlink #define open _open #define close _close #define read _read - #define lseek _lseek +#ifdef _WIN64 + #define lseek _lseeki64 +#else + #define lseek _lseek +#endif + + + #define strdup _strdup #define fdopen _fdopen #define write _write #define snprintf _snprintf #ifndef strcasecmp + //#define strcasecmp stricmp #define strcasecmp _stricmp + #define snprintf _snprintf #endif #define strtoll _strtoi64 #endif -#ifndef CONFIG_H -#define CONFIG_H -#define HAVE_CONFIG_H + /* Cache Size, other variables for HDF5 */ #define DEFAULT_CHUNK_SIZE ${DEFAULT_CHUNK_SIZE} #define DEFAULT_CHUNKS_IN_CACHE ${DEFAULT_CHUNKS_IN_CACHE} @@ -34,8 +44,8 @@ #define MAX_DEFAULT_CACHE_SIZE ${MAX_DEFAULT_CACHE_SIZE} #define NCIO_MINBLOCKSIZE ${NCIO_MINBLOCKSIZE} -#define PACKAGE_VERSION "${PACKAGE_VERSION}" - +#define PACKAGE_VERSION "${VERSION}" +#define VERSION "${VERSION}" /* For HDF5 use. */ #cmakedefine H5_USE_16_API 1 diff --git a/include/netcdf.h b/include/netcdf.h index 0342e233d..1c9e40e1a 100644 --- a/include/netcdf.h +++ b/include/netcdf.h @@ -14,6 +14,11 @@ for more info. #include /* size_t, ptrdiff_t */ #include /* netcdf functions sometimes return system errors */ + +#ifdef _WIN64 +#include +#endif + /*! The nc_type type is just an int. */ typedef int nc_type; @@ -391,7 +396,6 @@ by the desired type. */ */ /* Declaration modifiers for DLL support (MSC et al) */ - #if defined(DLL_NETCDF) /* define when library is a DLL */ # if defined(DLL_EXPORT) /* define when building the library */ # define MSC_EXTRA __declspec(dllexport) @@ -399,14 +403,20 @@ by the desired type. */ # define MSC_EXTRA __declspec(dllimport) # endif #include -/*#define lseek _lseeki64 - #define off_t __int64*/ #else #define MSC_EXTRA #endif /* defined(DLL_NETCDF) */ # define EXTERNL MSC_EXTRA extern +/* Define for 64 bit windows. */ +#if defined (_WIN64) +#define off_t __int64 +#define size_t __int64 +//#define lseek _lseeki64 +#define _OFF_T_DEFINED +#endif + #if defined(DLL_NETCDF) /* define when library is a DLL */ EXTERNL int ncerr; EXTERNL int ncopts; diff --git a/libdap2/dceparselex.h b/libdap2/dceparselex.h index 07f19d506..d889a0853 100644 --- a/libdap2/dceparselex.h +++ b/libdap2/dceparselex.h @@ -8,8 +8,8 @@ #include "dcetab.h" #ifdef WIN32 -#define strcasecmp stricmp -#define snprintf _snprintf + + #endif /* For consistency with Java parser */ diff --git a/libdispatch/dv2i.c b/libdispatch/dv2i.c index 01d3267a0..022e9b085 100644 --- a/libdispatch/dv2i.c +++ b/libdispatch/dv2i.c @@ -12,7 +12,7 @@ See \ref copyright file for copying and redistribution conditions. #include #include #include "netcdf.h" - +#include "math.h" /* The subroutines in error.c emit no messages unless NC_VERBOSE bit * is on. They call exit() when NC_FATAL bit is on. */ int ncopts = (NC_FATAL | NC_VERBOSE) ; @@ -43,7 +43,7 @@ int ncerr = NC_NOERR ; # include "onstack.h" -static size_t +static int nvdims(int ncid, int varid) { int ndims=-1, status; @@ -56,7 +56,16 @@ nvdims(int ncid, int varid) return ndims; } -#define NDIMS_DECL const size_t ndims = nvdims(ncid, varid); +static void* nvmalloc(int ct, int size) { + int mct = ct; + if(ct < 0) mct = 1; + + return malloc(mct * size); + +} + +#define NDIMS_DECL const int ndims = nvdims(ncid, varid); + # define A_DECL(name, type, ndims, rhs) \ ALLOC_ONSTACK(name, type, ndims) @@ -66,6 +75,7 @@ nvdims(int ncid, int varid) # define A_INIT(lhs, type, ndims, rhs) \ { \ + if(ndims >= 0) { \ const long *lp = rhs; \ type *tp = lhs; \ type *const end = lhs + ndims; \ @@ -73,7 +83,10 @@ nvdims(int ncid, int varid) { \ *tp++ = (type) *lp++; \ } \ - } + } \ + } \ + \ + if (ndims < 0) {nc_advise("nvdims",NC_EMAXDIMS,"ndims %d",ndims); return -1;} #endif @@ -664,8 +677,8 @@ ncvarput1( ) { NDIMS_DECL - A_DECL(coordp, size_t, ndims, index); - A_INIT(coordp, size_t, ndims, index); + A_DECL(coordp, size_t, (size_t)ndims, index); + A_INIT(coordp, size_t, (size_t)ndims, index); { const int status = nc_put_var1(ncid, varid, coordp, value); A_FREE(coordp); @@ -773,7 +786,9 @@ ncvarputs( return ncvarput(ncid, varid, start, count, value); /* else */ { - NDIMS_DECL + + NDIMS_DECL + A_DECL(stp, size_t, ndims, start); A_DECL(cntp, size_t, ndims, count); A_DECL(strdp, ptrdiff_t, ndims, stride); diff --git a/libsrc/XGetopt.c b/libsrc/XGetopt.c index d7198bb0f..1330774ad 100644 --- a/libsrc/XGetopt.c +++ b/libsrc/XGetopt.c @@ -186,7 +186,7 @@ int getopt(int argc, TCHAR *argv[], TCHAR *optstring) } c = *next++; - *cp = _tcschr(optstring, c); + cp = strchr(optstring, c); if (cp == NULL || c == _T(':')) return _T('?'); diff --git a/libsrc/posixio.c b/libsrc/posixio.c index b653656c8..395a8c596 100644 --- a/libsrc/posixio.c +++ b/libsrc/posixio.c @@ -9,8 +9,6 @@ #include #include #include -#define fstat64 fstat -#define lseek64 lseek #endif #include diff --git a/nc_test/CMakeLists.txt b/nc_test/CMakeLists.txt index 81e77c839..2c8a02fc8 100644 --- a/nc_test/CMakeLists.txt +++ b/nc_test/CMakeLists.txt @@ -22,6 +22,10 @@ IF(USE_NETCDF4) SET(EXTRA_TSTS ${EXTRA_TSTS} tst_atts) ENDIF() +IF(LARGE_FILE_TESTS) + SET(EXTRA_TSTS ${EXTRA_TSTS} quick_large_files tst_big_var6 tst_big_var2 tst_big_rvar tst_big_var tst_large large_files) +ENDIF() + IF(BUILD_DISKLESS) SET(EXTRA_TSTS ${EXTRA_TSTS} tst_diskless tst_diskless3 tst_diskless4) IF(USE_NETCDF4) diff --git a/nc_test/tst_big_rvar.c b/nc_test/tst_big_rvar.c index 8f8db0da5..cc1a8f808 100644 --- a/nc_test/tst_big_rvar.c +++ b/nc_test/tst_big_rvar.c @@ -87,7 +87,7 @@ test_big_var(const char *testfile) start[0], i, j, (i + j) % 16, data[i][j]); ERR; if(nerrs++ > 2) - return; + return nerrs; } } start[1] = DIM1 - 1; @@ -101,7 +101,7 @@ test_big_var(const char *testfile) start[0], i, j, (i + j) % 16, data[i][j]); ERR; if(nerrs++ > 2) - return; + return nerrs; } } if (nc_close(ncid)) ERR; diff --git a/nc_test/tst_big_var2.c b/nc_test/tst_big_var2.c index 0a9d8ff28..367ff93e0 100644 --- a/nc_test/tst_big_var2.c +++ b/nc_test/tst_big_var2.c @@ -93,7 +93,7 @@ test_big_var(const char *testfile) start[0], i, j, 42, data[i][j]); ERR; if(nerrs++ > 1) - return; + return nerrs; } } start[0] = DIM0 - 1; @@ -107,7 +107,7 @@ test_big_var(const char *testfile) start[0], i, j, 19, data[i][j]); ERR; if(nerrs++ > 1) - return; + return nerrs; } } if (nc_close(ncid)) ERR; diff --git a/nc_test/tst_big_var6.c b/nc_test/tst_big_var6.c index 570e9b9ea..574c5bfe5 100644 --- a/nc_test/tst_big_var6.c +++ b/nc_test/tst_big_var6.c @@ -88,7 +88,7 @@ test_big_var(const char *testfile) start[0], start[1], start[2], j, FIRST_VAL, data[j]); ERR; if(nerrs++ > 1) - return; + return nerrs; } } if (nc_close(ncid)) ERR; diff --git a/ncdump/CMakeLists.txt b/ncdump/CMakeLists.txt index a3c26c5dd..314cf9998 100644 --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt @@ -46,20 +46,6 @@ IF(ENABLE_TESTS) # The tests are set up as a combination of shell scripts and executables that # must be run in a particular order. It is painful but will use macros to help # keep it from being too bad. - # Binary Test Macro - #MACRO(add_bin_test F) - # ADD_EXECUTABLE(ncdump_${F} ${F}.c) - # TARGET_LINK_LIBRARIES(ncdump_${F} netcdf) - # ADD_TEST(ncdump_${F} ${EXECUTABLE_OUTPUT_PATH}/ncdump_${F}) - - #ENDMACRO() - - # Shell script Macro - #MACRO(add_sh_test F) - # IF(NOT MSVC) - # ADD_TEST(ncdump_${F} sh ${CMAKE_CURRENT_BINARY_DIR}/${F}.sh) - # ENDIF() - #ENDMACRO() ## Start adding tests in the appropriate order add_sh_test(ncdump run_tests) @@ -89,8 +75,26 @@ IF(ENABLE_TESTS) add_bin_test(ncdump tst_comp) add_bin_test(ncdump tst_comp2) add_bin_test(ncdump tst_nans) - add_bin_test(ncdump tst_special_atts) + #add_bin_test(ncdump tst_special_atts) + # Add this test by hand, as it is also called from a script. + # Editing the script would break autotools compatibility. + set(MANUAL_TESTS tst_special_atts tst_compress tst_chunking) + FOREACH (MTEST ${MANUAL_TESTS}) + ADD_EXECUTABLE(${MTEST} ${MTEST}.c) + TARGET_LINK_LIBRARIES(${MTEST} netcdf) + IF(MSVC) + SET_TARGET_PROPERTIES(${MTEST} + PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT" + ) + ENDIF() + #ADD_TEST(${MTEST} ${EXECUTABLE_OUTPUT_PATH}/${MTEST}) + ENDFOREACH() + IF(NOT WIN32) + # tst_netcdf4 depends on the output from other scripts + # that don't currently run. So for time being, leave + # it disabled. + #add_sh_test(ncdump tst_netcdf4) #add_bin_test(ncdump tst_h_rdc0) ENDIF() @@ -100,9 +104,9 @@ IF(ENABLE_TESTS) #add_sh_test(ncdump tst_fillbug) ENDIF() IF(NOT WIN32) - #add_sh_test(ncdump tst_netcdf4_4) + add_sh_test(ncdump tst_netcdf4_4) ENDIF() - add_bin_test(ncdump tst_compress) + IF(NOT WIN32) #add_sh_test(ncdump tst_nccopy4) ENDIF() @@ -112,7 +116,7 @@ IF(ENABLE_TESTS) #add_sh_test(tst_ncgen4_classic) IF(USE_NETCDF4) - #add_sh_test(tst_ncgen4) + add_sh_test(ncdump tst_ncgen4) ENDIF() diff --git a/ncdump/XGetopt.c b/ncdump/XGetopt.c index d7198bb0f..1330774ad 100644 --- a/ncdump/XGetopt.c +++ b/ncdump/XGetopt.c @@ -186,7 +186,7 @@ int getopt(int argc, TCHAR *argv[], TCHAR *optstring) } c = *next++; - *cp = _tcschr(optstring, c); + cp = strchr(optstring, c); if (cp == NULL || c == _T(':')) return _T('?'); diff --git a/ncgen/XGetopt.c b/ncgen/XGetopt.c index d7198bb0f..1330774ad 100644 --- a/ncgen/XGetopt.c +++ b/ncgen/XGetopt.c @@ -186,7 +186,7 @@ int getopt(int argc, TCHAR *argv[], TCHAR *optstring) } c = *next++; - *cp = _tcschr(optstring, c); + cp = strchr(optstring, c); if (cp == NULL || c == _T(':')) return _T('?'); diff --git a/ncgen3/XGetopt.c b/ncgen3/XGetopt.c index d7198bb0f..1330774ad 100644 --- a/ncgen3/XGetopt.c +++ b/ncgen3/XGetopt.c @@ -186,7 +186,7 @@ int getopt(int argc, TCHAR *argv[], TCHAR *optstring) } c = *next++; - *cp = _tcschr(optstring, c); + cp = strchr(optstring, c); if (cp == NULL || c == _T(':')) return _T('?'); diff --git a/oc2/dapparselex.h b/oc2/dapparselex.h index d635bf3b2..34aaf9f57 100644 --- a/oc2/dapparselex.h +++ b/oc2/dapparselex.h @@ -7,10 +7,6 @@ #include "ocinternal.h" #include "ocdebug.h" -#ifdef WIN32 -#define strcasecmp stricmp -#define snprintf _snprintf -#endif /* For consistency with Java parser */ #define null NULL