mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +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.
63 lines
2.5 KiB
C
63 lines
2.5 KiB
C
/*********************************************************************
|
|
* Copyright 2018, UCAR/Unidata
|
|
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
|
|
*********************************************************************/
|
|
|
|
#ifndef GENERATE_H
|
|
#define GENERATE_H 1
|
|
|
|
typedef struct Generator Generator;
|
|
|
|
void alignbuffer(struct NCConstant* prim, Bytebuffer* buf);
|
|
|
|
/* Code dump support procedures */
|
|
void bbindent(Bytebuffer*,const int);
|
|
void bbprintf(Bytebuffer*,const char *fmt, ...); /* append */
|
|
void bbprintf0(Bytebuffer*,const char *fmt, ...); /* clear, then append*/
|
|
/* Following dump to codebuffer */
|
|
void codeprintf(const char *fmt, ...);
|
|
void codedump(Bytebuffer*);
|
|
void codepartial(const char*);
|
|
void codeline(const char*);
|
|
void codelined(int n,const char*);
|
|
void codeflush(void); /* flush codebuffer to stdout */
|
|
|
|
void commify(Bytebuffer* buf);
|
|
char* word(char* p, Bytebuffer* buf);
|
|
|
|
/* Provide buffers for language based generators */
|
|
extern Bytebuffer* codebuffer; /* buffer over the std output */
|
|
extern Bytebuffer* stmt; /* single stmt text generation */
|
|
|
|
/* From genchar.c */
|
|
void gen_charattr(Datalist*, Bytebuffer*);
|
|
void gen_charseq(Datalist*, Bytebuffer*);
|
|
void gen_chararray(Dimset*, int, Datalist*, Bytebuffer*, Datalist*);
|
|
|
|
typedef enum ListClass {
|
|
LISTDATA, LISTATTR, LISTVLEN, LISTCOMPOUND, LISTFIELDARRAY
|
|
} ListClass;
|
|
|
|
struct Generator {
|
|
void* globalstate; /* per-generator; per list state is in the method args where needed */
|
|
int (*charconstant)(Generator*,struct Symbol*,Bytebuffer*,...);
|
|
int (*constant)(Generator*,struct Symbol*,NCConstant*,Bytebuffer*,...);
|
|
int (*listbegin)(Generator*,struct Symbol*,void*,ListClass,size_t,Bytebuffer*,int*,...);
|
|
int (*list)(Generator*,struct Symbol*,void*,ListClass,int,size_t,Bytebuffer*,...);
|
|
int (*listend)(Generator*,struct Symbol*,void*,ListClass,int,size_t,Bytebuffer*,...);
|
|
int (*vlendecl)(Generator*,struct Symbol*,Bytebuffer*,int,size_t,...);
|
|
int (*vlenstring)(Generator*,struct Symbol*,Bytebuffer*,int*,size_t*,...);
|
|
};
|
|
|
|
extern int generator_getstate(Generator*,void**);
|
|
extern int generator_reset(Generator*,void*);
|
|
|
|
typedef int (*Writer)(Generator*,struct Symbol*,Bytebuffer*,int,const size_t*,const size_t*);
|
|
|
|
extern void generate_attrdata(struct Symbol*, Generator*, Writer writer, Bytebuffer*);
|
|
extern void generate_vardata(struct Symbol*, Generator*, Writer writer, Bytebuffer*);
|
|
extern void generate_basetype(struct Symbol*,NCConstant*,Bytebuffer*,Datalist*,Generator*);
|
|
|
|
#endif /*DATA_H*/
|
|
|