mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-30 16:10:44 +08:00
fb40a72b45
re: Issue https://github.com/Unidata/netcdf-c/issues/2685 re: PR https://github.com/Unidata/netcdf-c/pull/2179 As noted in PR https://github.com/Unidata/netcdf-c/pull/2179, the old code did not allow for reclaiming instances of types, nor for properly copying them. That PR provided new functions capable of reclaiming/copying instances of arbitrary types. However, as noted by Issue https://github.com/Unidata/netcdf-c/issues/2685, using these most general functions resulted in a significant performance degradation, even for common cases. This PR attempts to mitigate the cost of using the general reclaim/copy functions in two ways. First, the previous functions operating at the top level by using ncid and typeid arguments. These functions were augmented with equivalent versions that used the netcdf-c library internal data structures to allow direct access to needed information. These new functions are used internally to the library. The second mitigation involves optimizing the internal functions by providing early tests for common cases. This avoids unnecessary recursive function calls. The overall result is a significant improvement in speed by a factor of roughly twenty -- your mileage may vary. These optimized functions are still not as fast as the original (more limited) functions, but they are getting close. Additional optimizations are possible. But the cost is a significant "uglification" of the code that I deemed a step too far, at least for now. ## Misc. Changes 1. Added a test case to check the proper reclamation/copy of complex types. 2. Found and fixed some places where nc_reclaim/copy should have been used. 3. Replaced, in the netcdf-c library, (almost all) occurrences of nc_reclaim_copy with calls to NC_reclaim/copy. This plus the optimizations is the primary speed-up mechanism. 4. In DAP4, the metadata is held in a substrate in-memory file; this required some changes so that the reclaim/copy code accessed that substrate dispatcher rather than the DAP4 dispatcher. 5. Re-factored and isolated the code that computes if a type is (transitively) variable-sized or not. 6. Clean up the reclamation code in ncgen; adding the use of nc_reclaim exposed some memory problems.
48 lines
1.4 KiB
CMake
48 lines
1.4 KiB
CMake
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
|
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
|
|
# 2015, 2016, 2017, 2018, 2019
|
|
# University Corporation for Atmospheric Research/Unidata.
|
|
|
|
# See netcdf-c/COPYRIGHT file for more info.
|
|
|
|
# This is the cmake build file for unit_test/ directory.
|
|
# @author Ward Fisher
|
|
|
|
# Currently (August 21, 2019): Some tests will not work with
|
|
# Visual Studio. The unit tests are for internal netCDF functions,
|
|
# so we don't want to make them external, which would be required to
|
|
# run on Windows.
|
|
|
|
SET(UNIT_TESTS test_ncuri)
|
|
|
|
IF(USE_X_GETOPT)
|
|
SET(XGETOPTSRC "${CMAKE_CURRENT_SOURCE_DIR}/../libdispatch/XGetopt.c")
|
|
ENDIF()
|
|
|
|
IF(ENABLE_HDF5)
|
|
IF(NOT MSVC)
|
|
add_bin_test(unit_test tst_nclist)
|
|
add_bin_test(unit_test tst_nc4internal)
|
|
ENDIF(NOT MSVC)
|
|
build_bin_test(tst_reclaim ${XGETOPTSRC})
|
|
add_sh_test(unit_test run_reclaim_tests)
|
|
ENDIF(ENABLE_HDF5)
|
|
|
|
# Path convert test(s)
|
|
add_bin_test(unit_test test_pathcvt)
|
|
|
|
IF(BUILD_UTILITIES)
|
|
IF(ENABLE_S3 AND WITH_S3_TESTING)
|
|
# SDK Test
|
|
build_bin_test(test_s3sdk ${XGETOPTSRC})
|
|
add_sh_test(unit_test run_s3sdk)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
# Performance tests
|
|
add_bin_test(unit_test tst_exhash timer_utils.c)
|
|
add_bin_test(unit_test tst_xcache timer_utils.c)
|
|
|
|
FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
|
|
FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE)
|