MEDIUM: init: convert all trivial registration calls to initcalls
This switches explicit calls to various trivial registration methods for
keywords, muxes or protocols from constructors to INITCALL1 at stage
STG_REGISTER. All these calls have in common to consume a single pointer
and return void. Doing this removes 26 constructors. The following calls
were addressed :
- acl_register_keywords
- bind_register_keywords
- cfg_register_keywords
- cli_register_kw
- flt_register_keywords
- http_req_keywords_register
- http_res_keywords_register
- protocol_register
- register_mux_proto
- sample_register_convs
- sample_register_fetches
- srv_register_keywords
- tcp_req_conn_keywords_register
- tcp_req_cont_keywords_register
- tcp_req_sess_keywords_register
- tcp_res_cont_keywords_register
- flt_register_keywords
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index 02bc3d2..aa9d875 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -16,9 +16,10 @@
#include <common/compat.h>
#include <common/config.h>
#include <common/debug.h>
+#include <common/hathreads.h>
+#include <common/initcall.h>
#include <common/memory.h>
#include <common/time.h>
-#include <common/hathreads.h>
#include <types/arg.h>
#include <types/global.h>
@@ -4641,37 +4642,44 @@
}
};
+INITCALL1(STG_REGISTER, flt_register_keywords, &flt_kws);
+
/* Delcate the action parser for "spoe-action" keyword */
static struct action_kw_list tcp_req_action_kws = { { }, {
{ "send-spoe-group", parse_send_spoe_group },
{ /* END */ },
}
};
+
+INITCALL1(STG_REGISTER, tcp_req_cont_keywords_register, &tcp_req_action_kws);
+
static struct action_kw_list tcp_res_action_kws = { { }, {
{ "send-spoe-group", parse_send_spoe_group },
{ /* END */ },
}
};
+
+INITCALL1(STG_REGISTER, tcp_res_cont_keywords_register, &tcp_res_action_kws);
+
static struct action_kw_list http_req_action_kws = { { }, {
{ "send-spoe-group", parse_send_spoe_group },
{ /* END */ },
}
};
+
+INITCALL1(STG_REGISTER, http_req_keywords_register, &http_req_action_kws);
+
static struct action_kw_list http_res_action_kws = { { }, {
{ "send-spoe-group", parse_send_spoe_group },
{ /* END */ },
}
};
+INITCALL1(STG_REGISTER, http_res_keywords_register, &http_res_action_kws);
+
__attribute__((constructor))
static void __spoe_init(void)
{
- flt_register_keywords(&flt_kws);
- tcp_req_cont_keywords_register(&tcp_req_action_kws);
- tcp_res_cont_keywords_register(&tcp_res_action_kws);
- http_req_keywords_register(&http_req_action_kws);
- http_res_keywords_register(&http_res_action_kws);
-
pool_head_spoe_ctx = create_pool("spoe_ctx", sizeof(struct spoe_context), MEM_F_SHARED);
pool_head_spoe_appctx = create_pool("spoe_appctx", sizeof(struct spoe_appctx), MEM_F_SHARED);
}