X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=server%2Fscoreboard.c;h=3b9299264ea860fef136d45deefc92a145cbb0f4;hb=c9fd2623da21dc757571e93f8c14344946e59ec7;hp=7726379862a401cea348eb752314f8021412ee23;hpb=2b87916666dff71af6092251cce1cf6579c5f182;p=apache diff --git a/server/scoreboard.c b/server/scoreboard.c index 7726379862..3b9299264e 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -1,59 +1,17 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 +/* Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at * - * Copyright (c) 2000-2001 The Apache Software Foundation. All rights - * reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include "apr.h" @@ -76,13 +34,51 @@ #include "http_config.h" #include "ap_mpm.h" -#include "mpm.h" #include "scoreboard.h" +/* we know core's module_index is 0 */ +#undef APLOG_MODULE_INDEX +#define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX + AP_DECLARE_DATA scoreboard *ap_scoreboard_image = NULL; AP_DECLARE_DATA const char *ap_scoreboard_fname = NULL; + +const char * ap_set_scoreboard(cmd_parms *cmd, void *dummy, + const char *arg) +{ + const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); + if (err != NULL) { + return err; + } + + ap_scoreboard_fname = arg; + return NULL; +} + +/* Default to false when mod_status is not loaded */ AP_DECLARE_DATA int ap_extended_status = 0; -AP_DECLARE_DATA apr_time_t ap_restart_time = 0; + +const char *ap_set_extended_status(cmd_parms *cmd, void *dummy, int arg) +{ + const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); + if (err != NULL) { + return err; + } + ap_extended_status = arg; + return NULL; +} + +AP_DECLARE_DATA int ap_mod_status_reqtail = 0; + +const char *ap_set_reqtail(cmd_parms *cmd, void *dummy, int arg) +{ + const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY); + if (err != NULL) { + return err; + } + ap_mod_status_reqtail = arg; + return NULL; +} #if APR_HAS_SHARED_MEMORY @@ -98,10 +94,13 @@ static /* but must be exported to mpm_winnt */ APR_HOOK_STRUCT( APR_HOOK_LINK(pre_mpm) ) - -AP_IMPLEMENT_HOOK_VOID(pre_mpm, - (apr_pool_t *p, ap_scoreboard_e sb_type), - (p, sb_type)) + +AP_IMPLEMENT_HOOK_RUN_ALL(int,pre_mpm, + (apr_pool_t *p, ap_scoreboard_e sb_type), + (p, sb_type),OK,DECLINED) + +static APR_OPTIONAL_FN_TYPE(ap_logio_get_last_bytes) + *pfn_ap_logio_get_last_bytes; struct ap_sb_handle_t { int child_num; @@ -117,7 +116,7 @@ static apr_size_t scoreboard_size; * and it should handle cleaning up a scoreboard shared * between processes using any form of IPC (file, shared memory * segment, etc.). Leave it as is now because it is being used - * by various MPMs. + * by various MPMs. */ static apr_status_t ap_cleanup_shared_mem(void *d) { @@ -129,13 +128,17 @@ static apr_status_t ap_cleanup_shared_mem(void *d) return APR_SUCCESS; } -int ap_calc_scoreboard_size(void) +AP_DECLARE(int) ap_calc_scoreboard_size(void) { ap_mpm_query(AP_MPMQ_HARD_LIMIT_THREADS, &thread_limit); ap_mpm_query(AP_MPMQ_HARD_LIMIT_DAEMONS, &server_limit); + scoreboard_size = sizeof(global_score); scoreboard_size += sizeof(process_score) * server_limit; scoreboard_size += sizeof(worker_score) * server_limit * thread_limit; + + pfn_ap_logio_get_last_bytes = APR_RETRIEVE_OPTIONAL_FN(ap_logio_get_last_bytes); + return scoreboard_size; } @@ -144,79 +147,126 @@ void ap_init_scoreboard(void *shared_score) char *more_storage; int i; - ap_scoreboard_image = + ap_calc_scoreboard_size(); + ap_scoreboard_image = calloc(1, sizeof(scoreboard) + server_limit * sizeof(worker_score *)); more_storage = shared_score; ap_scoreboard_image->global = (global_score *)more_storage; more_storage += sizeof(global_score); ap_scoreboard_image->parent = (process_score *)more_storage; more_storage += sizeof(process_score) * server_limit; - ap_scoreboard_image->servers = + ap_scoreboard_image->servers = (worker_score **)((char*)ap_scoreboard_image + sizeof(scoreboard)); for (i = 0; i < server_limit; i++) { ap_scoreboard_image->servers[i] = (worker_score *)more_storage; more_storage += thread_limit * sizeof(worker_score); } ap_assert(more_storage == (char*)shared_score + scoreboard_size); + ap_scoreboard_image->global->server_limit = server_limit; + ap_scoreboard_image->global->thread_limit = thread_limit; +} + +/** + * Create a name-based scoreboard in the given pool using the + * given filename. + */ +static apr_status_t create_namebased_scoreboard(apr_pool_t *pool, + const char *fname) +{ +#if APR_HAS_SHARED_MEMORY + apr_status_t rv; + + /* The shared memory file must not exist before we create the + * segment. */ + apr_shm_remove(fname, pool); /* ignore errors */ + + rv = apr_shm_create(&ap_scoreboard_shm, scoreboard_size, fname, pool); + if (rv != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, + "unable to create or access scoreboard \"%s\" " + "(name-based shared memory failure)", fname); + return rv; + } +#endif /* APR_HAS_SHARED_MEMORY */ + return APR_SUCCESS; } -/* ToDo: This function should be made to handle setting up - * a scoreboard shared between processes using any IPC technique, +/* ToDo: This function should be made to handle setting up + * a scoreboard shared between processes using any IPC technique, * not just a shared memory segment */ -static apr_status_t open_scoreboard(apr_pool_t *p) +static apr_status_t open_scoreboard(apr_pool_t *pconf) { #if APR_HAS_SHARED_MEMORY apr_status_t rv; char *fname = NULL; - -#ifndef WIN32 - rv = apr_shm_create(&ap_scoreboard_shm, scoreboard_size, fname, p); - if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, - "Fatal error: could not create scoreboard " - "(using anonymous shared memory)"); + apr_pool_t *global_pool; + + /* We don't want to have to recreate the scoreboard after + * restarts, so we'll create a global pool and never clean it. + */ + rv = apr_pool_create(&global_pool, NULL); + if (rv != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, + "Fatal error: unable to create global pool " + "for use by the scoreboard"); return rv; } - if (rv == APR_ENOTIMPL) { -#else - { -#endif - if (ap_scoreboard_fname) { - fname = ap_server_root_relative(p, ap_scoreboard_fname); + + /* The config says to create a name-based shmem */ + if (ap_scoreboard_fname) { + /* make sure it's an absolute pathname */ + fname = ap_server_root_relative(pconf, ap_scoreboard_fname); + if (!fname) { + ap_log_error(APLOG_MARK, APLOG_CRIT, APR_EBADPATH, ap_server_conf, + "Fatal error: Invalid Scoreboard path %s", + ap_scoreboard_fname); + return APR_EBADPATH; } - rv = apr_shm_create(&ap_scoreboard_shm, scoreboard_size, fname, p); - if (rv != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, - "Fatal error: could not open(create) scoreboard"); + return create_namebased_scoreboard(global_pool, fname); + } + else { /* config didn't specify, we get to choose shmem type */ + rv = apr_shm_create(&ap_scoreboard_shm, scoreboard_size, NULL, + global_pool); /* anonymous shared memory */ + if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) { + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf, + "Unable to create or access scoreboard " + "(anonymous shared memory failure)"); return rv; } + /* Make up a filename and do name-based shmem */ + else if (rv == APR_ENOTIMPL) { + /* Make sure it's an absolute pathname */ + ap_scoreboard_fname = DEFAULT_SCOREBOARD; + fname = ap_server_root_relative(pconf, ap_scoreboard_fname); + + return create_namebased_scoreboard(global_pool, fname); + } } - /* everything will be cleared shortly */ -#endif +#endif /* APR_HAS_SHARED_MEMORY */ return APR_SUCCESS; } /* If detach is non-zero, this is a seperate child process, * if zero, it is a forked child. */ -apr_status_t reopen_scoreboard(apr_pool_t *p, int detached) +apr_status_t ap_reopen_scoreboard(apr_pool_t *p, apr_shm_t **shm, int detached) { #if APR_HAS_SHARED_MEMORY - apr_status_t rv; - char *fname = NULL; - if (!detached) { return APR_SUCCESS; } if (apr_shm_size_get(ap_scoreboard_shm) < scoreboard_size) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, + ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf, "Fatal error: shared scoreboard too small for child!"); apr_shm_detach(ap_scoreboard_shm); ap_scoreboard_shm = NULL; return APR_EINVAL; } /* everything will be cleared shortly */ + if (*shm) { + *shm = ap_scoreboard_shm; + } #endif return APR_SUCCESS; } @@ -240,59 +290,58 @@ apr_status_t ap_cleanup_scoreboard(void *d) /* Create or reinit an existing scoreboard. The MPM can control whether * the scoreboard is shared across multiple processes or not */ -void ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type) +int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type) { - int running_gen = 0; + int i; #if APR_HAS_SHARED_MEMORY apr_status_t rv; #endif + pfn_ap_logio_get_last_bytes = APR_RETRIEVE_OPTIONAL_FN(ap_logio_get_last_bytes); + if (ap_scoreboard_image) { - running_gen = ap_scoreboard_image->global->running_generation; + ap_scoreboard_image->global->restart_time = apr_time_now(); + memset(ap_scoreboard_image->parent, 0, + sizeof(process_score) * server_limit); + for (i = 0; i < server_limit; i++) { + memset(ap_scoreboard_image->servers[i], 0, + sizeof(worker_score) * thread_limit); + } + return OK; } - if (ap_scoreboard_image == NULL) { - ap_calc_scoreboard_size(); + ap_calc_scoreboard_size(); #if APR_HAS_SHARED_MEMORY - if (sb_type == SB_SHARED) { - void *sb_shared; - rv = open_scoreboard(p); - if (rv || !(sb_shared = apr_shm_baseaddr_get(ap_scoreboard_shm))) { - exit(APEXIT_INIT); /* XXX need to return an error from this function */ - } - memset(sb_shared, 0, scoreboard_size); - ap_init_scoreboard(sb_shared); - } - else if (sb_type == SB_SHARED_CHILD) { - void *sb_shared; - rv = reopen_scoreboard(p, 1); - if (rv || !(sb_shared = apr_shm_baseaddr_get(ap_scoreboard_shm))) { - exit(APEXIT_INIT); /* XXX need to return an error from this function */ - } - ap_init_scoreboard(sb_shared); + if (sb_type == SB_SHARED) { + void *sb_shared; + rv = open_scoreboard(p); + if (rv || !(sb_shared = apr_shm_baseaddr_get(ap_scoreboard_shm))) { + return HTTP_INTERNAL_SERVER_ERROR; } - else + memset(sb_shared, 0, scoreboard_size); + ap_init_scoreboard(sb_shared); + } + else #endif - { - /* A simple malloc will suffice */ - void *sb_mem = calloc(1, scoreboard_size); - if (sb_mem == NULL) { - ap_log_error(APLOG_MARK, APLOG_CRIT | APLOG_NOERRNO, 0, NULL, - "(%d)%s: cannot allocate scoreboard", - errno, strerror(errno)); - exit(APEXIT_INIT); /* XXX need to return an error from this function */ - } - ap_init_scoreboard(sb_mem); + { + /* A simple malloc will suffice */ + void *sb_mem = calloc(1, scoreboard_size); + if (sb_mem == NULL) { + ap_log_error(APLOG_MARK, APLOG_CRIT, 0, ap_server_conf, + "(%d)%s: cannot allocate scoreboard", + errno, strerror(errno)); + return HTTP_INTERNAL_SERVER_ERROR; } + ap_init_scoreboard(sb_mem); } - /* can't just memset() */ - if (sb_type != SB_SHARED_CHILD) { - ap_scoreboard_image->global->sb_type = sb_type; - ap_scoreboard_image->global->running_generation = running_gen; - apr_pool_cleanup_register(p, NULL, ap_cleanup_scoreboard, - apr_pool_cleanup_null); - } - ap_restart_time = apr_time_now(); + + ap_scoreboard_image->global->sb_type = sb_type; + ap_scoreboard_image->global->running_generation = 0; + ap_scoreboard_image->global->restart_time = apr_time_now(); + + apr_pool_cleanup_register(p, NULL, ap_cleanup_scoreboard, apr_pool_cleanup_null); + + return OK; } /* Routines called to deal with the scoreboard image @@ -306,40 +355,29 @@ void ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type) * anyway. */ -void ap_sync_scoreboard_image(void) -{ -} - AP_DECLARE(int) ap_exists_scoreboard_image(void) { return (ap_scoreboard_image ? 1 : 0); } -static APR_INLINE void put_scoreboard_info(int child_num, int thread_num, - worker_score *new_score_rec) -{ - /* XXX - needs to be fixed to account for threads */ -#ifdef SCOREBOARD_FILE - lseek(scoreboard_fd, sizeof(global_score) - + (long)child_num * sizeof(worker_score), 0); - force_write(scoreboard_fd, new_score_rec, sizeof(worker_score)); -#endif -} - -void update_scoreboard_global(void) -{ -#ifdef SCOREBOARD_FILE - lseek(scoreboard_fd, 0, 0); - force_write(scoreboard_fd, &ap_scoreboard_image->global, - sizeof ap_scoreboard_image->global); -#endif -} - AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t *sb, request_rec *r) { worker_score *ws; + apr_off_t bytes; + + if (!sb) + return; ws = &ap_scoreboard_image->servers[sb->child_num][sb->thread_num]; + if (pfn_ap_logio_get_last_bytes != NULL) { + bytes = pfn_ap_logio_get_last_bytes(r->connection); + } + else if (r->method_number == M_GET && r->method[0] == 'H') { + bytes = 0; + } + else { + bytes = r->bytes_sent; + } #ifdef HAVE_TIMES times(&ws->times); @@ -347,14 +385,12 @@ AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t *sb, request_rec *r) ws->access_count++; ws->my_access_count++; ws->conn_count++; - ws->bytes_served += r->bytes_sent; - ws->my_bytes_served += r->bytes_sent; - ws->conn_bytes += r->bytes_sent; - - put_scoreboard_info(sb->child_num, sb->thread_num, ws); + ws->bytes_served += bytes; + ws->my_bytes_served += bytes; + ws->conn_bytes += bytes; } -AP_DECLARE(int) find_child_by_pid(apr_proc_t *pid) +AP_DECLARE(int) ap_find_child_by_pid(apr_proc_t *pid) { int i; int max_daemons_limit; @@ -378,29 +414,64 @@ AP_DECLARE(void) ap_create_sb_handle(ap_sb_handle_t **new_sbh, apr_pool_t *p, (*new_sbh)->thread_num = thread_num; } -AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num, - int thread_num, - int status, - request_rec *r) +static void copy_request(char *rbuf, apr_size_t rbuflen, request_rec *r) +{ + char *p; + + if (r->the_request == NULL) { + apr_cpystrn(rbuf, "NULL", rbuflen); + return; /* short circuit below */ + } + + if (r->parsed_uri.password == NULL) { + p = r->the_request; + } + else { + /* Don't reveal the password in the server-status view */ + p = apr_pstrcat(r->pool, r->method, " ", + apr_uri_unparse(r->pool, &r->parsed_uri, + APR_URI_UNP_OMITPASSWORD), + r->assbackwards ? NULL : " ", r->protocol, NULL); + } + + /* now figure out if we copy over the 1st rbuflen chars or the last */ + if (!ap_mod_status_reqtail) { + apr_cpystrn(rbuf, p, rbuflen); + } + else { + apr_size_t slen = strlen(p); + if (slen < rbuflen) { + /* it all fits anyway */ + apr_cpystrn(rbuf, p, rbuflen); + } + else { + apr_cpystrn(rbuf, p+(slen-rbuflen+1), rbuflen); + } + } +} + +static int update_child_status_internal(int child_num, + int thread_num, + int status, + conn_rec *c, + request_rec *r) { int old_status; worker_score *ws; process_score *ps; - - if (child_num < 0) { - return -1; - } + int mpm_generation; ws = &ap_scoreboard_image->servers[child_num][thread_num]; old_status = ws->status; ws->status = status; ps = &ap_scoreboard_image->parent[child_num]; - + if (status == SERVER_READY && old_status == SERVER_STARTING) { - ws->thread_num = child_num * server_limit + thread_num; - ps->generation = ap_my_generation; + ws->thread_num = child_num * thread_limit + thread_num; + ap_mpm_query(AP_MPMQ_GENERATION, &mpm_generation); + ps->generation = mpm_generation; } if (ap_extended_status) { @@ -413,72 +484,107 @@ AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num, ws->my_access_count = 0L; ws->my_bytes_served = 0L; } - ws->conn_count = (unsigned short)0; - ws->conn_bytes = (unsigned long)0; + ws->conn_count = 0; + ws->conn_bytes = 0; } if (r) { - conn_rec *c = r->connection; apr_cpystrn(ws->client, ap_get_remote_host(c, r->per_dir_config, REMOTE_NOLOOKUP, NULL), sizeof(ws->client)); - if (r->the_request == NULL) { - apr_cpystrn(ws->request, "NULL", sizeof(ws->request)); - } else if (r->parsed_uri.password == NULL) { - apr_cpystrn(ws->request, r->the_request, sizeof(ws->request)); - } else { - /* Don't reveal the password in the server-status view */ - apr_cpystrn(ws->request, apr_pstrcat(r->pool, r->method, " ", - apr_uri_unparse(r->pool, &r->parsed_uri, - APR_URI_UNP_OMITPASSWORD), - r->assbackwards ? NULL : " ", r->protocol, NULL), - sizeof(ws->request)); + copy_request(ws->request, sizeof(ws->request), r); + if (r->server) { + apr_cpystrn(ws->vhost, r->server->server_hostname, + sizeof(ws->vhost)); } - apr_cpystrn(ws->vhost, r->server->server_hostname, - sizeof(ws->vhost)); + } + else if (c) { + apr_cpystrn(ws->client, ap_get_remote_host(c, NULL, + REMOTE_NOLOOKUP, NULL), sizeof(ws->client)); + ws->request[0]='\0'; + ws->vhost[0]='\0'; } } - - put_scoreboard_info(child_num, thread_num, ws); + return old_status; } +AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num, + int thread_num, + int status, + request_rec *r) +{ + if (child_num < 0) { + return -1; + } + + return update_child_status_internal(child_num, thread_num, status, + r ? r->connection : NULL, + r); +} + AP_DECLARE(int) ap_update_child_status(ap_sb_handle_t *sbh, int status, request_rec *r) { - return ap_update_child_status_from_indexes(sbh->child_num, sbh->thread_num, - status, r); + if (!sbh) + return -1; + + return update_child_status_internal(sbh->child_num, sbh->thread_num, + status, + r ? r->connection : NULL, + r); +} + +AP_DECLARE(int) ap_update_child_status_from_conn(ap_sb_handle_t *sbh, int status, + conn_rec *c) +{ + if (!sbh) + return -1; + + return update_child_status_internal(sbh->child_num, sbh->thread_num, + status, c, NULL); } -void ap_time_process_request(int child_num, int thread_num, int status) +AP_DECLARE(void) ap_time_process_request(ap_sb_handle_t *sbh, int status) { worker_score *ws; - if (child_num < 0) { + if (!sbh) + return; + + if (sbh->child_num < 0) { return; } - ws = &ap_scoreboard_image->servers[child_num][thread_num]; + ws = &ap_scoreboard_image->servers[sbh->child_num][sbh->thread_num]; if (status == START_PREQUEST) { - ws->start_time = apr_time_now(); + ws->start_time = apr_time_now(); } else if (status == STOP_PREQUEST) { - ws->stop_time = apr_time_now(); + ws->stop_time = apr_time_now(); } - put_scoreboard_info(child_num, thread_num, ws); } -AP_DECLARE(worker_score *) ap_get_scoreboard_worker(int x, int y) +AP_DECLARE(worker_score *) ap_get_scoreboard_worker_from_indexes(int x, int y) { - if (((x < 0) || (server_limit < x)) || - ((y < 0) || (thread_limit < y))) { + if (((x < 0) || (x >= server_limit)) || + ((y < 0) || (y >= thread_limit))) { return(NULL); /* Out of range */ } return &ap_scoreboard_image->servers[x][y]; } +AP_DECLARE(worker_score *) ap_get_scoreboard_worker(ap_sb_handle_t *sbh) +{ + if (!sbh) + return NULL; + + return ap_get_scoreboard_worker_from_indexes(sbh->child_num, + sbh->thread_num); +} + AP_DECLARE(process_score *) ap_get_scoreboard_process(int x) { - if ((x < 0) || (server_limit < x)) { + if ((x < 0) || (x >= server_limit)) { return(NULL); /* Out of range */ } return &ap_scoreboard_image->parent[x];