diff options
| author | Yann Ylavic <ylavic@apache.org> | 2022-01-27 12:34:53 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2022-01-27 12:34:53 +0000 |
| commit | 3e0035d1892b7e8506cc2f53921282aaab8e4c23 (patch) | |
| tree | 6a09f29bd2fff2bd884779d06faf9eda8712ca4f /include | |
| parent | aa95fe54f45cbd518a1d53bf9eda5cf17acc37f4 (diff) | |
| download | httpd-3e0035d1892b7e8506cc2f53921282aaab8e4c23.tar.gz | |
core: Follow up to r1897460: Provide ap_thread_main_create().
Replace ap_thread_current_create() by ap_thread_main_create() which is how
it's used by httpd. The former is now a local helper only to implement the
latter.
This allows to consolidate/factorize common code in the main() of httpd and
the unix MPMs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897543 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 2 | ||||
| -rw-r--r-- | include/httpd.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 6e35c4fee1..6060c766d7 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -700,7 +700,7 @@ * add PROXY_WORKER_UDS_PATH_SIZE. * 20211221.1 (2.5.1-dev) Add read_line to scoreboard. * 20211221.2 (2.5.1-dev) Add AGAIN, AP_MPMQ_CAN_AGAIN. - * 20211221.3 (2.5.1-dev) Add ap_thread_create(), ap_thread_current_create() + * 20211221.3 (2.5.1-dev) Add ap_thread_create(), ap_thread_main_create() * and ap_thread_current() * */ diff --git a/include/httpd.h b/include/httpd.h index 419314fe31..96618c282a 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -2579,7 +2579,6 @@ AP_DECLARE(void *) ap_realloc(void *ptr, size_t size) #endif #define ap_thread_create apr_thread_create #define ap_thread_current apr_thread_current -#define ap_thread_current_create apr_thread_current_create #define ap_thread_current_after_fork apr_thread_current_after_fork #else /* !APR_VERSION_AT_LEAST(1,8,0) */ @@ -2607,14 +2606,15 @@ AP_DECLARE(apr_status_t) ap_thread_create(apr_thread_t **thread, apr_thread_start_t func, void *data, apr_pool_t *pool); #endif /* AP_THREAD_LOCAL */ -AP_DECLARE(apr_status_t) ap_thread_current_create(apr_thread_t **current, - apr_threadattr_t *attr, - apr_pool_t *pool); + AP_DECLARE(void) ap_thread_current_after_fork(void); AP_DECLARE(apr_thread_t *) ap_thread_current(void); #endif /* !APR_VERSION_AT_LEAST(1,8,0) */ +AP_DECLARE(apr_status_t) ap_thread_main_create(apr_thread_t **thread, + apr_pool_t *pool); + #else /* !APR_HAS_THREADS */ #define AP_HAS_THREAD_LOCAL 0 |