From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Thu, 3 Feb 2005 23:47:36 +0000 (+0000)
Subject: Start keeping track of the amount of time taken to process a request again.
X-Git-Tag: 2.0.53~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aced7706e4e58f737c8b8e8c640ac8665b604652;p=thirdparty%2Fapache%2Fhttpd.git

Start keeping track of the amount of time taken to process a request again.
Results in the 'Req' field in mod_status no longer being bogus.

MFC: 149550
Reviewed by: jim, stas, geoff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151258 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 3243249b955..fa8b1be7e77 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.53
 
+) *) Start keeping track of time-taken-to-process-request again for
+     mod_status if ExtendedStatus is enabled. [Jim Jagielski]
+
   *) mod_proxy: Handle client-aborted connections correctly.  PR 32443.
      [Janne Hietamäki, Joe Orton]
 
diff --git a/include/scoreboard.h b/include/scoreboard.h
index beb75e513a2..abd5171303e 100644
--- a/include/scoreboard.h
+++ b/include/scoreboard.h
@@ -163,7 +163,7 @@ AP_DECLARE(int) 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);
 AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num, int thread_num,
                                                     int status, request_rec *r);
-void ap_time_process_request(int child_num, int thread_num, int status);
+void ap_time_process_request(ap_sb_handle_t *sbh, int status);
 
 AP_DECLARE(worker_score *) ap_get_scoreboard_worker(int x, int y);
 AP_DECLARE(process_score *) ap_get_scoreboard_process(int x);
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index f9f82566363..3b989cccfd5 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -239,6 +239,8 @@ void ap_process_request(request_rec *r)
      * Use this hook with extreme care and only if you know what you are 
      * doing.
      */
+    if (ap_extended_status)
+        ap_time_process_request(r->connection->sbh, START_PREQUEST);
     access_status = ap_run_quick_handler(r, 0);  /* Not a look-up request */
     if (access_status == DECLINED) {
         access_status = ap_process_request_internal(r);
@@ -269,6 +271,8 @@ void ap_process_request(request_rec *r)
     check_pipeline_flush(r);
     ap_update_child_status(r->connection->sbh, SERVER_BUSY_LOG, r);
     ap_run_log_transaction(r);
+    if (ap_extended_status)
+        ap_time_process_request(r->connection->sbh, STOP_PREQUEST);
 }
 
 static apr_table_t *rename_original_env(apr_pool_t *p, apr_table_t *t)
diff --git a/server/scoreboard.c b/server/scoreboard.c
index da1bf95fd6c..421b99eb68d 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -423,15 +423,15 @@ AP_DECLARE(int) ap_update_child_status(ap_sb_handle_t *sbh, int status,
                                                status, r);
 }
 
-void ap_time_process_request(int child_num, int thread_num, int status)
+void ap_time_process_request(ap_sb_handle_t *sbh, int status)
 {
     worker_score *ws;
 
-    if (child_num < 0) {
+    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();