From bbac3e8541d0457076b18a9808879e8bfbf903e2 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 1 Aug 2019 00:44:16 -0700 Subject: [PATCH] rpc: ensure RPCs are registered before aliases Some older clang versions will reorder constructor functions rather than execute them in the order they are defined. This causes registration failures for RPC aliases when the alias is registered before the RPC that it refers to. So use constructor priorities to ensure that all RPCs are registered before any aliases. Fixes issue #892. Signed-off-by: Jim Harris Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/463915 (master) (cherry picked from commit 0972520167ea611ca51a1e59fc63a8367c98e2c5) Change-Id: I409254ec7172faf3997aa058b433890793499458 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467128 Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- include/spdk/rpc.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/spdk/rpc.h b/include/spdk/rpc.h index 2ffb0e2db9..e48c86dc5b 100644 --- a/include/spdk/rpc.h +++ b/include/spdk/rpc.h @@ -103,14 +103,20 @@ int spdk_rpc_is_method_allowed(const char *method, uint32_t state_mask); #define SPDK_RPC_STARTUP 0x1 #define SPDK_RPC_RUNTIME 0x2 +/* Give SPDK_RPC_REGISTER a higher execution priority than + * SPDK_RPC_REGISTER_ALIAS_DEPRECATED to ensure all of the RPCs are registered + * before we try registering any aliases. Some older versions of clang may + * otherwise execute the constructors in a different order than + * defined in the source file (see issue #892). + */ #define SPDK_RPC_REGISTER(method, func, state_mask) \ -static void __attribute__((constructor)) rpc_register_##func(void) \ +static void __attribute__((constructor(1000))) rpc_register_##func(void) \ { \ spdk_rpc_register_method(method, func, state_mask); \ } #define SPDK_RPC_REGISTER_ALIAS_DEPRECATED(method, alias) \ -static void __attribute__((constructor)) rpc_register_##alias(void) \ +static void __attribute__((constructor(1001))) rpc_register_##alias(void) \ { \ spdk_rpc_register_alias_deprecated(#method, #alias); \ }