mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-12-15 08:30:11 +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.
71 lines
2.2 KiB
C
71 lines
2.2 KiB
C
/*********************************************************************
|
|
* Copyright 2018, UCAR/Unidata
|
|
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
|
|
*********************************************************************/
|
|
|
|
#ifndef NCOFFSETS_H
|
|
#define NCOFFSETS_H 1
|
|
|
|
/* Define indices for every primitive C type */
|
|
/* NAT => NOT-A-TYPE*/
|
|
#define NC_NATINDEX 0
|
|
#define NC_CHARINDEX 1
|
|
#define NC_UCHARINDEX 2
|
|
#define NC_SHORTINDEX 3
|
|
#define NC_USHORTINDEX 4
|
|
#define NC_INTINDEX 5
|
|
#define NC_UINTINDEX 6
|
|
#define NC_LONGINDEX 7
|
|
#define NC_ULONGINDEX 8
|
|
#define NC_LONGLONGINDEX 9
|
|
#define NC_ULONGLONGINDEX 10
|
|
#define NC_FLOATINDEX 11
|
|
#define NC_DOUBLEINDEX 12
|
|
#define NC_PTRINDEX 13
|
|
#define NC_NCVLENINDEX 14
|
|
|
|
#define NC_NCTYPES 15
|
|
|
|
typedef struct NCalignment {
|
|
char* type_name;
|
|
size_t alignment;
|
|
} NCalignment;
|
|
|
|
typedef NCalignment NCtypealignvec;
|
|
|
|
/* Capture in struct and in a vector*/
|
|
typedef struct NCtypealignset {
|
|
NCalignment charalign; /* char*/
|
|
NCalignment ucharalign; /* unsigned char*/
|
|
NCalignment shortalign; /* short*/
|
|
NCalignment ushortalign; /* unsigned short*/
|
|
NCalignment intalign; /* int*/
|
|
NCalignment uintalign; /* unsigned int*/
|
|
NCalignment longalign; /* long*/
|
|
NCalignment ulongalign; /* unsigned long*/
|
|
NCalignment longlongalign; /* long long*/
|
|
NCalignment ulonglongalign; /* unsigned long long*/
|
|
NCalignment floatalign; /* float*/
|
|
NCalignment doublealign; /* double*/
|
|
NCalignment ptralign; /* void**/
|
|
NCalignment ncvlenalign; /* nc_vlen_t*/
|
|
} NCtypealignset;
|
|
|
|
EXTERNL int NC_class_alignment(int ncclass, size_t*);
|
|
EXTERNL void NC_compute_alignments(void);
|
|
|
|
/* From libdispatch/dinstance.c */
|
|
EXTERNL int NC_type_alignment(int ncid, nc_type xtype, size_t*);
|
|
|
|
/* From libdispatch/dinstance_intern.c */
|
|
/**
|
|
* Internal version of NC_type_alignment
|
|
*/
|
|
struct NC_FILE_INFO; /* forward */
|
|
struct NC_TYPE_INFO; /* forward */
|
|
|
|
EXTERNL int NC_type_alignment_internal(struct NC_FILE_INFO* file, nc_type xtype, struct NC_TYPE_INFO* utype, size_t* alignp);
|
|
EXTERNL uintptr_t NC_read_align(uintptr_t addr, size_t alignment);
|
|
|
|
#endif /*NCOFFSETS_H*/
|