mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-27 07:30:33 +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.
105 lines
3.6 KiB
Makefile
105 lines
3.6 KiB
Makefile
## This is a automake file, part of Unidata's netCDF package.
|
|
# Copyright 2008, see the COPYRIGHT file for more information.
|
|
|
|
# This Makefile controls the building of the dispatch layer of the
|
|
# netCDF library. The dispatch layer decides whether to call the
|
|
# netcdf-classic code, netcdf-4 code, nc3 dap code, or nc4 dap
|
|
# code. It also contains code that sit above the dispatch layer, like
|
|
# the v2 API.
|
|
|
|
# Put together AM_CPPFLAGS and AM_LDFLAGS.
|
|
include $(top_srcdir)/lib_flags.am
|
|
|
|
# This is our output, the dispatch convenience library.
|
|
noinst_LTLIBRARIES = libdispatch.la
|
|
libdispatch_la_CPPFLAGS = ${AM_CPPFLAGS}
|
|
|
|
# The source files.
|
|
libdispatch_la_SOURCES = dcopy.c dfile.c ddim.c datt.c dattinq.c \
|
|
dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c dvarinq.c \
|
|
dinternal.c ddispatch.c dutf8.c nclog.c dstring.c ncuri.c nclist.c \
|
|
ncbytes.c nchashmap.c nctime.c nc.c nclistmgr.c dauth.c doffsets.c \
|
|
dpathmgr.c dutil.c dreadonly.c dnotnc4.c dnotnc3.c dinfermodel.c \
|
|
daux.c dinstance.c dcrc32.c dcrc32.h dcrc64.c ncexhash.c ncxcache.c \
|
|
ncjson.c ds3util.c dparallel.c dmissing.c dinstance_intern.c
|
|
|
|
# Add the utf8 codebase
|
|
libdispatch_la_SOURCES += utf8proc.c utf8proc.h
|
|
|
|
# The rc code is currently only used by libdap2 and libdap4,
|
|
# but in the future, it will be expanded to be used as the
|
|
# general .rc file for the netcdf-c library. So, always compile it.
|
|
libdispatch_la_SOURCES += drc.c
|
|
|
|
# Add functions only found in netCDF-4.
|
|
# They are always defined, even if they just return an error
|
|
libdispatch_la_SOURCES += dgroup.c dvlen.c dcompound.c dtype.c denum.c \
|
|
dopaque.c dfilter.c
|
|
|
|
# Add V2 API convenience library if needed.
|
|
if BUILD_V2
|
|
noinst_LTLIBRARIES += libnetcdf2.la
|
|
libnetcdf2_la_SOURCES = dv2i.c
|
|
libnetcdf2_la_CPPFLAGS = ${AM_CPPFLAGS} -DDLL_EXPORT
|
|
endif # BUILD_V2
|
|
|
|
if ENABLE_BYTERANGE
|
|
libdispatch_la_SOURCES += dhttp.c
|
|
endif # ENABLE_BYTERANGE
|
|
|
|
if ENABLE_S3
|
|
if ENABLE_S3_INTERNAL
|
|
# Renamed to avoid conflicts with the HDF5 files
|
|
libdispatch_la_SOURCES += ncs3sdk_h5.c nch5s3comms.c nch5s3comms.h ncutil.h nccurl_setup.h \
|
|
nccurl_sha256.c nccurl_sha256.h nccurl_hmac.c nccurl_hmac.h
|
|
AM_CPPFLAGS += -I$(top_srcdir)/libncxml
|
|
libdispatch_la_CPPFLAGS += ${AM_CPPFLAGS}
|
|
else
|
|
libdispatch_la_SOURCES += ncs3sdk_aws.cpp awsincludes.h
|
|
AM_CXXFLAGS = -std=c++11
|
|
endif
|
|
endif
|
|
|
|
if REGEDIT
|
|
libdispatch_la_SOURCES += dreg.c
|
|
endif
|
|
|
|
# Support generation of 32-bit unsigned int random numbers
|
|
noinst_PROGRAMS = ncrandom
|
|
ncrandom_SOURCES = ncrandom.c
|
|
|
|
EXTRA_DIST = CMakeLists.txt ncsettings.hdr utf8proc_data.c XGetopt.c
|
|
|
|
# Build ncsettings.c as follows:
|
|
# 1. copy ncsettings.hdr to ncsettings.c
|
|
# 2. append libnetcdf.settings to ncsettings.c after
|
|
# processing it as follows:
|
|
# 1. convert tabs and cr to blanks
|
|
# 2. convert embedded double quote (") to escaped form (\").
|
|
# 3. append newline (\n) to each line
|
|
# 4. surround each line with double quotes.
|
|
# 3. finally, add a semicolon to the end of ncsettings.c
|
|
# to complete the string constant.
|
|
|
|
ncsettings.c: $(top_srcdir)/libnetcdf.settings ncsettings.hdr
|
|
rm -f ncsettings.c
|
|
cat ncsettings.hdr > ncsettings.c
|
|
tr '\t\r' ' ' <${top_srcdir}/libnetcdf.settings | \
|
|
sed -e 's/"/\\"/g' | \
|
|
sed -e 's/\(.*\)/\"\1\\n\"/' | \
|
|
cat >> ncsettings.c
|
|
echo ';' >> ncsettings.c
|
|
|
|
# Show what is needed to insert a new version of ezxml
|
|
# primary fix: The original ezxml.[ch] uses '//' comments;
|
|
# unpack and replace with '/*..*/'
|
|
|
|
REPO=https://downloads.sourceforge.net/project/ezxml/
|
|
EZXML=ezxml-0.8.6.tar.gz
|
|
ezxml::
|
|
rm -fr ./ezxml ./ezxml.[ch] ./license.txt
|
|
tar -zxf ./${EZXML}
|
|
sed -e 's|//\(.*\)|/*\1*/|' <ezxml/ezxml.c >./ezxml.c
|
|
sed -e 's|//\(.*\)|/*\1*/|' <ezxml/ezxml.h >./ezxml.h
|
|
cp ezxml/license.txt .
|