Fix fd_redblack symbol visibility

Fixes an issue where fd_redblack produces externally linked symbols even if the implementation style is set to 'local use only'.
firedancer-io · Dec 10, 2024 · 53568e6 · 53568e6
1 parent 9ddc217
commit 53568e6
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 100 deletions.
diff --git a/src/disco/rpcserver/fd_rpc_service.c b/src/disco/rpcserver/fd_rpc_service.c
@@ -565,7 +565,7 @@ struct product_rb_node {
 typedef struct product_rb_node product_rb_node_t;
 #define REDBLK_T product_rb_node_t
 #define REDBLK_NAME product_rb
-FD_FN_PURE long product_rb_compare(product_rb_node_t* left, product_rb_node_t* right) {
+FD_FN_PURE static long product_rb_compare(product_rb_node_t* left, product_rb_node_t* right) {
   for( uint i = 0; i < sizeof(fd_pubkey_t)/sizeof(ulong); ++i ) {
     ulong a = left->key.ul[i];
     ulong b = right->key.ul[i];
@@ -574,7 +574,6 @@ FD_FN_PURE long product_rb_compare(product_rb_node_t* left, product_rb_node_t* r
   return 0;
 }
 #include "../../util/tmpl/fd_redblack.c"
-#undef REDBLK_NAME
 
 static int
 method_getBlockProduction(struct json_values* values, fd_rpc_ctx_t * ctx) {
@@ -1023,7 +1022,7 @@ struct leader_rb_node {
 typedef struct leader_rb_node leader_rb_node_t;
 #define REDBLK_T leader_rb_node_t
 #define REDBLK_NAME leader_rb
-FD_FN_PURE long leader_rb_compare(leader_rb_node_t* left, leader_rb_node_t* right) {
+FD_FN_PURE static long leader_rb_compare(leader_rb_node_t* left, leader_rb_node_t* right) {
   for( uint i = 0; i < sizeof(fd_pubkey_t)/sizeof(ulong); ++i ) {
     ulong a = left->key.ul[i];
     ulong b = right->key.ul[i];

diff --git a/src/flamenco/types/fd_types.c b/src/flamenco/types/fd_types.c
diff --git a/src/flamenco/types/fd_types.h b/src/flamenco/types/fd_types.h
diff --git a/src/flamenco/types/fd_types_custom.c b/src/flamenco/types/fd_types_custom.c
@@ -372,8 +372,7 @@ int fd_archive_decode_skip_field( fd_bincode_decode_ctx_t * ctx, ushort tag ) {
 #define REDBLK_NAME fd_vote_reward_t_map
 #define REDBLK_IMPL_STYLE 2
 #include "../../util/tmpl/fd_redblack.c"
-#undef REDBLK_T
-#undef REDBLK_NAME
+
 long fd_vote_reward_t_map_compare( fd_vote_reward_t_mapnode_t * left, fd_vote_reward_t_mapnode_t * right ) {
   return memcmp( left->elem.pubkey.uc, right->elem.pubkey.uc, sizeof(right->elem.pubkey) );
 }
diff --git a/src/flamenco/types/fd_types_custom.h b/src/flamenco/types/fd_types_custom.h
@@ -258,8 +258,6 @@ typedef struct fd_vote_reward_t_mapnode fd_vote_reward_t_mapnode_t;
 #define REDBLK_NAME fd_vote_reward_t_map
 #define REDBLK_IMPL_STYLE 1
 #include "../../util/tmpl/fd_redblack.c"
-#undef REDBLK_T
-#undef REDBLK_NAME
 struct fd_vote_reward_t_mapnode {
     fd_vote_reward_t elem;
     ulong redblack_parent;
@@ -388,7 +386,7 @@ typedef struct fd_epoch_reward_status fd_epoch_reward_status_t;
 enum {
 fd_epoch_reward_status_enum_Active = 0,
 fd_epoch_reward_status_enum_Inactive = 1,
-}; 
+};
 
 /*******************************************************************************************/
 #endif

diff --git a/src/flamenco/types/gen_stubs.py b/src/flamenco/types/gen_stubs.py
@@ -866,8 +866,6 @@ def emitPreamble(self):
         print(f"#define REDBLK_NAME {mapname}", file=header)
         print(f"#define REDBLK_IMPL_STYLE 1", file=header)
         print(f'#include "../../util/tmpl/fd_redblack.c"', file=header)
-        print(f"#undef REDBLK_T", file=header)
-        print(f"#undef REDBLK_NAME", file=header)
         print(f"struct {nodename} {{", file=header)
         print(f"    {element_type} elem;", file=header)
         print(f"    ulong redblack_parent;", file=header)
@@ -893,8 +891,6 @@ def emitPostamble(self):
         print(f'#define REDBLK_NAME {mapname}', file=body)
         print(f'#define REDBLK_IMPL_STYLE 2', file=body)
         print(f'#include "../../util/tmpl/fd_redblack.c"', file=body)
-        print(f'#undef REDBLK_T', file=body)
-        print(f'#undef REDBLK_NAME', file=body)
         print(f'long {mapname}_compare( {nodename} * left, {nodename} * right ) {{', file=body)
         key = self.key
         if key == "pubkey" or key == "account" or key == "key":