diff options
| author | Stefan Eissing <icing@apache.org> | 2022-04-19 12:16:02 +0200 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2022-04-19 12:16:02 +0200 |
| commit | 9d74016b80d2cf537811499df6bb46b079c8312e (patch) | |
| tree | d1a89c2674d77e5a618e3aa02c87502a800fa4e4 | |
| parent | *) mod_proxy: Add backend port to log messages to (diff) | |
| download | apache2-9d74016b80d2cf537811499df6bb46b079c8312e.tar.xz apache2-9d74016b80d2cf537811499df6bb46b079c8312e.zip | |
*) core: add ap_sb_get_child_thread() to retrieve child_num
and thread_num from a scoreboard handle.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900029 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/scoreboard.h | 2 | ||||
| -rw-r--r-- | server/scoreboard.c | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 7b6753cbe4..88868775a7 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -710,6 +710,7 @@ * Add new http/1.x formatting helpers * Add ap_assign_request_line() * 20211221.7 (2.5.1-dev) Add ap_h1_append_header() + * 20211221.8 (2.5.1-dev) Add ap_sb_get_child_thread() */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -717,7 +718,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20211221 #endif -#define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 8 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/scoreboard.h b/include/scoreboard.h index 321b32778a..7cf92e405a 100644 --- a/include/scoreboard.h +++ b/include/scoreboard.h @@ -183,6 +183,8 @@ AP_DECLARE(void) ap_create_sb_handle(ap_sb_handle_t **new_sbh, apr_pool_t *p, int child_num, int thread_num); AP_DECLARE(void) ap_update_sb_handle(ap_sb_handle_t *sbh, int child_num, int thread_num); +AP_DECLARE(void) ap_sb_get_child_thread(ap_sb_handle_t *sbh, + int *pchild_num, int *pthread_num); AP_DECLARE(int) ap_find_child_by_pid(apr_proc_t *pid); AP_DECLARE(int) ap_update_child_status(ap_sb_handle_t *sbh, int status, request_rec *r); diff --git a/server/scoreboard.c b/server/scoreboard.c index 688f89f75f..181477e357 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -429,6 +429,14 @@ AP_DECLARE(void) ap_create_sb_handle(ap_sb_handle_t **new_sbh, apr_pool_t *p, ap_update_sb_handle(*new_sbh, child_num, thread_num); } +AP_DECLARE(void) ap_sb_get_child_thread(ap_sb_handle_t *sbh, + int *pchild_num, int *pthread_num) +{ + AP_DEBUG_ASSERT(sbh); + *pchild_num = sbh->child_num; + *pthread_num = sbh->thread_num; +} + static void copy_request(char *rbuf, apr_size_t rbuflen, request_rec *r) { char *p; |