external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure unique names for section pointers accross files

refactor/dist-ops-linker
Nils Dijk 2020-02-07 00:25:52 +01:00
parent 91a7047b6d
commit 62a6cd63b7
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/distributed/commands.h
View File

@ -82,9 +82,11 @@ typedef struct DistributedObjectOpsContainer
#define PP_CAT_II(p, res) res #define PP_CAT_II(p, res) res
#define REGISTER_SECTION_POINTER(section_name, ptr) \ #define REGISTER_SECTION_POINTER(section_name, ptr) \
void *PP_CAT(section_name, __COUNTER__) \ void *PP_CAT3(section_name, ptr, __COUNTER__) \
__attribute__((unused)) \
__attribute__((section("__DATA," # section_name))) \ __attribute__((section("__DATA," # section_name))) \
= ptr \ = &ptr
#define SECTION_ARRAY(_type, _section) \ #define SECTION_ARRAY(_type, _section) \
extern _type __start_ ## _section[] __asm("section$start$__DATA$" # _section); \ extern _type __start_ ## _section[] __asm("section$start$__DATA$" # _section); \
@ -99,7 +101,7 @@ typedef struct DistributedObjectOpsContainer
.type = T_ ## stmt, \ .type = T_ ## stmt, \
.ops = &opsvar, \ .ops = &opsvar, \
}; \ }; \
REGISTER_SECTION_POINTER(opscontainer, &PP_CAT(opscontainer, opsvar)) REGISTER_SECTION_POINTER(opscontainer, PP_CAT(opscontainer, opsvar))
#define REGISTER_DISTRIBUTED_OPERATION_NESTED(stmt, objectVarName, objtype, opsvar) \ #define REGISTER_DISTRIBUTED_OPERATION_NESTED(stmt, objectVarName, objtype, opsvar) \
static DistributedObjectOpsContainer PP_CAT3(opscontainer_, stmt, objtype) = { \ static DistributedObjectOpsContainer PP_CAT3(opscontainer_, stmt, objtype) = { \
@ -109,7 +111,7 @@ typedef struct DistributedObjectOpsContainer
.nestedType = objtype, \ .nestedType = objtype, \
.ops = &opsvar, \ .ops = &opsvar, \
}; \ }; \
REGISTER_SECTION_POINTER(opscontainer, &PP_CAT3(opscontainer_, stmt, objtype)) REGISTER_SECTION_POINTER(opscontainer, PP_CAT3(opscontainer_, stmt, objtype))
#define REGISTER_DISTRIBUTED_OPERATION_NESTED_NEW(stmt, objectVarName, objtype) \ #define REGISTER_DISTRIBUTED_OPERATION_NESTED_NEW(stmt, objectVarName, objtype) \
static DistributeObjectOps PP_CAT3(distops, stmt, objtype); \ static DistributeObjectOps PP_CAT3(distops, stmt, objtype); \