Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EARLY WIP] PG_FUNCTION_INFO_V2 #2

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[EARLY WIP] PG_FUNCTION_INFO_V2 #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 49 additions & 4 deletions src/include/fmgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,18 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena *datum);
/*-------------------------------------------------------------------------
* Support for detecting call convention of dynamically-loaded functions
*
* Dynamically loaded functions currently can only use the version-1 ("new
* style") calling convention. Version-0 ("old style") is not supported
* anymore. Version 1 is the call convention defined in this header file, and
* Dynamically loaded functions currently can use the version-2 ("new
* style") or version-1 calling convention. Version-0 ("old style") is not
* supported anymore
*
* Version 2 is the call convention defined in this header file, and must
* be accompanied by the following construct:
*
* PG_FUNCTIONS_V2(
*
* );
*
* Version 1 is the call convention defined in this header file, and
* must be accompanied by the macro call
*
* PG_FUNCTION_INFO_V1(function_name);
Expand All @@ -401,7 +410,8 @@ typedef struct
typedef const Pg_finfo_record *(*PGFInfoFunction) (void);

/*
* Macro to build an info function associated with the given function name.
* Macro to build an info function associated with the given function name
* for version-1 calling convention.
*
* As a convenience, also provide an "extern" declaration for the given
* function name, so that writers of C functions need not write that too.
Expand All @@ -423,6 +433,41 @@ CppConcat(pg_finfo_,funcname) (void) \
} \
extern int no_such_variable

typedef struct {
const char *name;
} Pg_FunctionInfo_v2;

typedef struct {
int api_version;
union {
Pg_FunctionInfo_v2 *v2;
} info;
} Pg_FunctionInfo;

typedef struct {
int api_version;
int total_entries;
Pg_FunctionInfo_v2 entries[FLEXIBLE_ARRAY_MEMBER];
} Pg_functions_info_v2;

extern PGDLLEXPORT const Pg_functions_info_v2 * pg_finfo_functions_v2(void);

/* Expected signature of an info function */
typedef const Pg_functions_info_v2 *(*PGFunctionsInfo) (void);

#define PG_FUNCTIONS_V2(members) \
const Pg_functions_info_v2 * \
pg_finfo_functions_v2(void) \
{ \
static const Pg_functions_info_v2 info = { \
.entries = {members}, \
.api_version = 2, \
.total_entries = sizeof((Pg_FunctionInfo_v2[]){members}) / sizeof(Pg_FunctionInfo_v2) \
}; \
return &info; \
} \
extern int no_such_variable


/*
* Declare _PG_init/_PG_fini centrally. Historically each shared library had
Expand Down