httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roo...@apache.org
Subject svn commit: r380878 - in /httpd/httpd/trunk: CHANGES server/mpm/experimental/event/event.c
Date Sat, 25 Feb 2006 00:59:06 GMT
Author: rooneg
Date: Fri Feb 24 16:59:04 2006
New Revision: 380878

URL: http://svn.apache.org/viewcvs?rev=380878&view=rev
Log:
Fill in the scoreboard's tid field in the event MPM, just like we do in
other MPMs.

Submitted by: Chris Darroch <chrisd pearsoncmg.com>
Issue: 38736

* server/mpm/experimental/event/event.c
  (worker_thread): Fill in the scoreboard's tid field.

* CHANGES: Note change.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/mpm/experimental/event/event.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=380878&r1=380877&r2=380878&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Feb 24 16:59:04 2006
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) Event MPM: Fill in the scoreboard's tid field. PR 38736.
+     [Chris Darroch <chrisd pearsoncmg.com>]
+
   *) mod_charset_lite: Remove Content-Length when output filter can 
      invalidate it.  Warn when input filter can invalidate it.
      [Jeff Trawick]

Modified: httpd/httpd/trunk/server/mpm/experimental/event/event.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/experimental/event/event.c?rev=380878&r1=380877&r2=380878&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/experimental/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/experimental/event/event.c Fri Feb 24 16:59:04 2006
@@ -1137,6 +1137,7 @@
     free(ti);
 
     ap_scoreboard_image->servers[process_slot][thread_slot].pid = ap_my_pid;
+    ap_scoreboard_image->servers[process_slot][thread_slot].tid = apr_os_thread_current();
     ap_scoreboard_image->servers[process_slot][thread_slot].generation = ap_my_generation;
     ap_update_child_status_from_indexes(process_slot, thread_slot,
                                         SERVER_STARTING, NULL);



Mime
View raw message