From 02922e19ca4af9b219ede00766af8b9c0d0d096b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 29 Jan 2021 12:27:57 +0100 Subject: [PATCH] MINOR: session: export session_expire_embryonic() This is only to make it resolve nicely in "show tasks". --- include/haproxy/session.h | 1 + src/session.c | 6 +++--- src/tools.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/haproxy/session.h b/include/haproxy/session.h index 3b96f35..f62ea50 100644 --- a/include/haproxy/session.h +++ b/include/haproxy/session.h @@ -37,6 +37,7 @@ struct session *session_new(struct proxy *fe, struct listener *li, enum obj_type void session_free(struct session *sess); int session_accept_fd(struct connection *cli_conn); int conn_complete_session(struct connection *conn); +struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state); /* Remove the refcount from the session to the tracked counters, and clear the * pointer to ensure this is only performed once. The caller is responsible for diff --git a/src/session.c b/src/session.c index 07828df..055b578 100644 --- a/src/session.c +++ b/src/session.c @@ -28,7 +28,6 @@ DECLARE_POOL(pool_head_sess_srv_list, "session server list", sizeof(struct sess_srv_list)); int conn_complete_session(struct connection *conn); -static struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state); /* Create a a new session and assign it to frontend , listener
  • , * origin , set the current date and clear the stick counters pointers. @@ -376,9 +375,10 @@ static void session_kill_embryonic(struct session *sess, unsigned short state) } /* Manages the embryonic session timeout. It is only called when the timeout - * strikes and performs the required cleanup. + * strikes and performs the required cleanup. It's only exported to make it + * resolve in "show tasks". */ -static struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state) +struct task *session_expire_embryonic(struct task *t, void *context, unsigned short state) { struct session *sess = context; diff --git a/src/tools.c b/src/tools.c index 8891d47..4ad6b95 100644 --- a/src/tools.c +++ b/src/tools.c @@ -4699,6 +4699,7 @@ const void *resolve_sym_name(struct buffer *buf, const char *pfx, const void *ad { .func = listener_accept, .name = "listener_accept" }, { .func = poller_pipe_io_handler, .name = "poller_pipe_io_handler" }, { .func = mworker_accept_wrapper, .name = "mworker_accept_wrapper" }, + { .func = session_expire_embryonic, .name = "session_expire_embryonic" }, #ifdef USE_THREAD { .func = accept_queue_process, .name = "accept_queue_process" }, #endif -- 1.7.10.4