Log of /httpd/httpd/trunk/modules/generators/mod_status.c
Parent Directory
|
Revision Log
Revision
1918482 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 21 09:48:12 2024 UTC
(9 months, 3 weeks ago)
by
ylavic
File length: 40397 byte(s)
Diff to
previous 1918127
(
colored)
mpm_event,mod_http2,mod_status: Follow up to r1918257: CONN_STATE_ASYNC_WAITIO.
Per discussion on PR #449, have a separate state for returning the connection
to the MPM to wait for an IO (namely CONN_STATE_ASYNC_WAITIO), rather than
(ab)using CONN_STATE_PROCESSING.
This removes the need for AGAIN added in r1918257 (for now), and AP_MPMQ_CAN_AGAIN
is renamed to AP_MPMQ_CAN_WAITIO.
This is also the state that mod_status accounts for, so rename ->processing
to ->wait_io in process_score (shows as "wait-io" in mod_status and mod_lua).
Revision
1918098 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 1 15:08:46 2024 UTC
(10 months, 2 weeks ago)
by
ylavic
File length: 40415 byte(s)
Diff to
previous 1909606
(
colored)
mpm_event, mod_status: Separate processing and write completion queues.
As a follow up to r1918022 which handled the new CONN_STATE_PROCESS(ing) and
existing CONN_STATE_WRITE_COMPLETION in the same async queue, let's now have
two separates ones which allows more relevant async accounting in mod_status.
Rename CONN_STATE_PROCESS to CONN_STATE_PROCESSING as it's how it will be
called in mod_status.
* include/ap_mmn.h:
MMN minor bump for process_score->processing counter.
* include/httpd.h:
Rename CONN_STATE_PROCESS to CONN_STATE_PROCESSING.
* include/scoreboard.h:
Add process_score->processing field.
* include/httpd.h, modules/http/http_core.c, modules/http2/h2_c1.c,
server/mpm/event/event.c, server/mpm/motorz/motorz.c,
server/mpm/simple/simple_io.c:
Rename CONN_STATE_PROCESS to CONN_STATE_PROCESSING.
* server/mpm/event/event.c:
Restore write_completion_q to handle connections in CONN_STATE_WRITE_COMPLETION.
Use processing_q (renamed from process_q) solely for CONN_STATE_PROCESSING.
Update process_score->processing according to the length of processing_q.
* modules/generators/mod_status.c:
Show the value of process_score->processing in the stats.
Revision
1909429 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 26 10:08:42 2023 UTC
(23 months, 3 weeks ago)
by
rjung
File length: 40090 byte(s)
Diff to
previous 1897760
(
colored)
mod_status: Remove duplicate keys "BusyWorkers" and "IdleWorkers".
Resolve inconsistency between the previous two occurrences by
counting workers in state SERVER_GRACEFUL no longer as busy,
but instead in a new counter "GracefulWorkers" (or on HTML
view as "workers gracefully restarting"). Also add the graceful
counter as a new column to the existing HTML per process table
for async MPMs.
PR 63300
Revision
1897760 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 4 12:22:26 2022 UTC
(3 years, 2 months ago)
by
icing
File length: 40130 byte(s)
Diff to
previous 1897281
(
colored)
*) core/mod_ssl/mpm_event: reverting changes to nonblocing SSL handshakes
to stabilize CI tests again. Previous revision of trunk has been copied
to branches/trunk-ssl-handshake-unblocking to make those into a PR where
changes can be discussed and tested separately.
Revision
1897281 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Jan 21 00:09:24 2022 UTC
(3 years, 2 months ago)
by
minfrin
File length: 40368 byte(s)
Diff to
previous 1873397
(
colored)
event: Add support for non blocking behaviour in the
CONN_STATE_READ_REQUEST_LINE phase, in addition to the existing
CONN_STATE_WRITE_COMPLETION phase. Update mod_ssl to perform non blocking
TLS handshakes.
Revision
1873397 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Jan 31 02:38:05 2020 UTC
(5 years, 2 months ago)
by
covener
File length: 40130 byte(s)
Diff to
previous 1839780
(
colored)
PR62989: DOCTYPE tags in server-generated HTML.
Submitted By: Andra Farkas <deepbluemistake gmail.com>, Giovanni Bechis <giovanni paclan.it>
Revision
1837595 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Aug 7 13:04:05 2018 UTC
(6 years, 8 months ago)
by
rjung
File length: 40097 byte(s)
Diff to
previous 1837590
(
colored)
mod_status: Cumulate CPU time of exited child
processes in the "cu" and "cs" values.
Add CPU time of the parent process to the
"c" and "s" values.
Revision
1837589 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Aug 7 10:25:31 2018 UTC
(6 years, 8 months ago)
by
rjung
File length: 38724 byte(s)
Diff to
previous 1837225
(
colored)
mod_status: Complete the data shown for async
MPMs in "auto" mode. Added number of processes,
number of stopping processes and number
of busy and idle workers.
Revision
1837225 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 1 11:27:28 2018 UTC
(6 years, 8 months ago)
by
jim
File length: 38388 byte(s)
Diff to
previous 1796352
(
colored)
Fix PR54848 in a 2.4.x backportable format. Ideally deprecating the use
of ->client in whatever version of 2.4 this is added into would be
more logical.
Revision
1796352 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri May 26 21:50:33 2017 UTC
(7 years, 10 months ago)
by
covener
File length: 38384 byte(s)
Diff to
previous 1792169
(
colored)
remove r1792169 taint checks from proxy and status modules
Both of these checks are problematic without further
work.
status: even a .htaccess with no SetHandler blocks the handler.
proxy: RewriteRule ... ... [P] in htaccess is blocked.
Revision
1757029 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat Aug 20 20:21:39 2016 UTC
(8 years, 7 months ago)
by
sf
File length: 38388 byte(s)
Diff to
previous 1757011
(
colored)
mod_status: note stopping procs in async info table
* add new column "stopping", denoting if a process is shutting down
* add additional "(old gen)", if a process is from before a graceful reload
* add counts of processes and stopping processes to summary line
Revision
1757010 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat Aug 20 15:50:22 2016 UTC
(8 years, 7 months ago)
by
jailletc36
File length: 37738 byte(s)
Diff to
previous 1757009
(
colored)
Delay some memory allocation in order to save 272 bytes in the 'request' memory pool if mod_status handler is triggered and is not able to handle the request
Revision
1757009 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat Aug 20 15:36:12 2016 UTC
(8 years, 7 months ago)
by
jailletc36
File length: 37718 byte(s)
Diff to
previous 1756848
(
colored)
Fix the number of column for 'Async connections'.
There are only 3 columns (writing, keep-alive, closing), not 4.
Try to improve the code layout for it to be more readable.
Each <th> is on its own line so keep the corresponding "colspan" <td> fields grouped together.
r1738628 introduced a new column, 'Slot'.
Add an empty cell for it in the last line of the table, in order to fix the layout of the Totals.
Revision
1671396 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sun Apr 5 13:34:01 2015 UTC
(10 years ago)
by
rjung
File length: 37206 byte(s)
Diff to
previous 1610491
(
colored)
Add more data to "?auto" view of server-status.
Although mod_status source code calls this the
"short_report", the docs and the API flag call
it "Machine Readable" resp. "STAT_OPT_AUTO".
So IMHO the data shown should be on par with
the html version.
Revision
1610491 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon Jul 14 19:26:00 2014 UTC
(10 years, 9 months ago)
by
jorton
File length: 35768 byte(s)
Diff to
previous 1450998
(
colored)
SECURITY (CVE-2014-0226): Fix a race condition in scoreboard handling,
which could lead to a heap buffer overflow. Thanks to Marek Kroemeke
working with HP's Zero Day Initiative for reporting this.
* include/scoreboard.h: Add ap_copy_scoreboard_worker.
* server/scoreboard.c (ap_copy_scoreboard_worker): New function.
* modules/generators/mod_status.c (status_handler): Use it.
* modules/lua/lua_request.c (lua_ap_scoreboard_worker): Likewise.
Reviewed by: trawick, jorton, covener, jim
Submitted by: jorton, covener
Revision
1389564 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 20:50:58 2012 UTC
(12 years, 6 months ago)
by
jim
File length: 35619 byte(s)
Diff to
previous 1389506
(
colored)
Break out loadavg from Apache load.... one is quick, the other
isn't so much, and so why load things up when wanting just
the server loadavg?
Revision
1389481 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 16:56:58 2012 UTC
(12 years, 6 months ago)
by
jim
File length: 35640 byte(s)
Diff to
previous 1369904
(
colored)
Would be nice to have some sort of canonical definition
of server loading for Apache. So create a struct that
holds some useful data. The hope is that for those
platforms that lack getloadavg(), people will write
replacements.
Revision
1137413 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sun Jun 19 18:50:12 2011 UTC
(13 years, 10 months ago)
by
sf
File length: 35426 byte(s)
Diff to
previous 1137360
(
colored)
Code cleanup: replace apr_table_set with non-copying apr_table_setn
in a few places
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
Revision
1097070 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 27 10:31:06 2011 UTC
(13 years, 11 months ago)
by
trawick
File length: 31777 byte(s)
Diff to
previous 1087331
(
colored)
Follow on to 1057048:
In the map of active workers, don't print spaces for scoreboard
slots which aren't used due to ThreadsPerChild < ThreadLimit or
MaxClients/ThreadsPerChild < ServerLimit; simply omit those slots
from the display. Workers in those slots which are gracefully
exiting (from a previous generation with a different MPM config)
will be displayed, and the map will shrink as those workers exit.
Revision
1057048 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sun Jan 9 23:00:33 2011 UTC
(14 years, 3 months ago)
by
sf
File length: 31528 byte(s)
Diff to
previous 1024462
(
colored)
mod_status: Don't show slots which are disabled by MaxClients as open.
PR: 47022
Submitted by: Jordi Prats <jordi prats gmail com>, Stefan Fritsch
Revision
903020 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 26 00:05:37 2010 UTC
(15 years, 2 months ago)
by
wrowe
File length: 30751 byte(s)
Diff to
previous 807930
(
colored)
Refactor mod_status out of the ExtendedStatus toggle picture, as other
modules can and should be able to use this scoreboard information.
Rename suggestions for such a directive are welcomed.
Note that mod_status toggles the default, to present the ExtendedStatus
for server operators, whenever it is loaded. Docs changes to follow.
Revision
757853 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Mar 24 15:43:59 2009 UTC
(16 years ago)
by
trawick
File length: 31768 byte(s)
Diff to
previous 645455
(
colored)
Introduce a new set of APIs to allow MPMs to be proper modules instead
of integral parts which share global variables, functions, and macros
with the rest of httpd.
Converted now:
prefork, worker, event, simple, WinNT*
*WinNT hasn't been built or tested, and relies on a hack to include the
WinNT mpm.h to disable Unixy MPM support routines in mpm_common.c
Revision
590641 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 31 12:19:54 2007 UTC
(17 years, 5 months ago)
by
jim
File length: 31902 byte(s)
Diff to
previous 587770
(
colored)
Add in SeeRequestTail directive, to handle the shortcoming
of only storing 63 bytes of the request, when the requests
are longer than that and only vary towards the end; eg:
GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/apples.jpg
GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/pears.jpg
GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/plums.jpg
Revision
587770 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 24 03:50:24 2007 UTC
(17 years, 5 months ago)
by
wrowe
File length: 31447 byte(s)
Diff to
previous 562492
(
colored)
MMN major bump required; this API is altogether inconsistent, transparent
types should be opaque, opaque types should be transparent.
Solve one aspect, follow the _by_indexes() example for ap_get_scoreboard_worker
family of functions, and the primary one will now accept the abstracted conn_rec
value of sbh to find that connections slot.
Revision
549159 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 20 17:29:24 2007 UTC
(17 years, 10 months ago)
by
jorton
File length: 31464 byte(s)
Diff to
previous 440337
(
colored)
Fix CVE-2006-5752:
* modules/generators/mod_status.c (status_handler): Specify charset in
content-type to prevent browsers doing charset "detection", which
allows an XSS attack. Use logitem-escaping on the request string to
make it charset-neutral.
Reported by: Stefan Esser <sesser hardened-php.net>
Revision
440337 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 5 13:08:15 2006 UTC
(18 years, 7 months ago)
by
trawick
File length: 31235 byte(s)
Diff to
previous 420983
(
colored)
Replace ap_get_server_version with ap_get_server_banner() and
ap_get_server_description().
High-level summary:
The full server version information is now included in the error log at
startup as well as server status reports, irrespective of the setting
of the ServerTokens directive.
Third-party modules must now use ap_get_server_banner() or
ap_get_server_description() in place of ap_get_server_version().
Revision
332306 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 10 15:11:44 2005 UTC
(19 years, 5 months ago)
by
jim
File length: 31084 byte(s)
Diff to
previous 156274
(
colored)
No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines
Revision
156274 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat Mar 5 20:06:55 2005 UTC
(20 years, 1 month ago)
by
trawick
File length: 31226 byte(s)
Diff to
previous 151408
(
colored)
worker MPM/mod_status: Support per-worker tracking of pid and
generation in the scoreboard so that mod_status can accurately
represent workers in processes which are gracefully terminating.
New child processes with worker MPM can take over slots of
individual threads within gracefully terminating processes.
Sometimes this is a problem (too many of these gracefully
terminating processes), so it is helpful to have mod_status
provide the information required to recognize these processes.
Revision
101614 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 29 20:56:28 2003 UTC
(21 years, 5 months ago)
by
trawick
File length: 32969 byte(s)
Diff to
previous 100737
(
colored)
mod_status: Report total CPU time accurately when using a threaded
MPM.
Note: It worked before with linuxthreads and it still does. But now
it works with normal thread implementations too.
PR: 23795
Revision
100724 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon Jul 21 14:48:02 2003 UTC
(21 years, 9 months ago)
by
jorton
File length: 31445 byte(s)
Diff to
previous 98573
(
colored)
Add optional hook to extend mod_status output.
* configure.in: Add modules/generators to include path.
* Makefile.in: Install mod_status.h.
* modules/generators/mod_status.h: New file.
* modules/generators/mod_status.c: Implement ap_run_status_hook.
(status_handler): Run status hooks.
Revision
95272 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri May 24 20:15:07 2002 UTC
(22 years, 11 months ago)
by
gregames
File length: 30939 byte(s)
Diff to
previous 95151
(
colored)
tweak "requests currently being processed". It is confusing to not have
old generation requests included after a graceful restart. But we
shouldn't count workers who are starting up.
OTOH, the "ready" counter needs to pay attention to the generation, so it
stays in sync with how p_i_s_m counts idle workers.
Revision
94745 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 22 04:48:11 2002 UTC
(23 years ago)
by
brianp
File length: 30873 byte(s)
Diff to
previous 94579
(
colored)
Skip a potentially heavyweight call to sysconf, plus some
local variable initializations, in the common case where the
request is not for the server status page
Revision
94579 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Apr 9 11:18:41 2002 UTC
(23 years ago)
by
trawick
File length: 30746 byte(s)
Diff to
previous 94558
(
colored)
move a loop-invariant computation out of the thread loop and
at the same time quiet a gcc warning (it assumed that thread_limit
could be zero, which would leave ps_record uninitialized when
referenced after the end of the thread loop)
Revision
94056 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 20 17:41:55 2002 UTC
(23 years, 1 month ago)
by
stoddard
File length: 30683 byte(s)
Diff to
previous 94027
(
colored)
Commit 1 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length
Revision
93954 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 15 15:16:27 2002 UTC
(23 years, 1 month ago)
by
trawick
File length: 31319 byte(s)
Diff to
previous 93951
(
colored)
Factor out a bunch of commonality between the HAVE_TIMES path and
the !HAVE_TIMES path. This will help avoid future errors similar
to the ones fixed earlier today.
The code change also has the benefit of getting the paren-matching
feature of some editors to work properly.
Revision
93951 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 15 12:40:39 2002 UTC
(23 years, 1 month ago)
by
trawick
File length: 32468 byte(s)
Diff to
previous 93950
(
colored)
fix a couple of formatting bugs in the !HAVE_TIMES path
(somebody forgot to convert floating point format to
long integer format when APR-izing the time)
Revision
93950 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 15 12:04:58 2002 UTC
(23 years, 1 month ago)
by
trawick
File length: 32470 byte(s)
Diff to
previous 93918
(
colored)
make mod_status a little faster by checking for an active server sooner in
the main loop
clean up the main loop by continuing when the server isn't active instead
of introducing yet another level of nesting
Revision
93901 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 13 12:40:59 2002 UTC
(23 years, 1 month ago)
by
trawick
File length: 33362 byte(s)
Diff to
previous 93695
(
colored)
fix the calculation of request time in mod_status
(currently nobody sets the start/stop times so this fix isn't
immediately apparent)
Submitted by: Stas Bekman
Reviewed by: Jeff Trawick
Revision
93502 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Feb 19 21:09:27 2002 UTC
(23 years, 2 months ago)
by
stoddard
File length: 26312 byte(s)
Diff to
previous 92791
(
colored)
This fixes a bug in mod_status on Windows where restart time was not
properly initialized.
Move ap_restart_time into the scoreboard global area so the child process
on non-forking platforms can have access to it.
Revision
92791 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 10 00:28:00 2002 UTC
(23 years, 3 months ago)
by
wrowe
File length: 26260 byte(s)
Diff to
previous 92510
(
colored)
This patch eliminated from the _SHARED_ segment of the scoreboard all
pointer math. This is required for portable scoreboards.
vhost becomes the 'vhost name string' so it now survives ap_generation
clicks. next was apparently never used.
This patch also accounts for the changes to the apr_shm api, and gives
Win32 the magic of a shared scoreboard.
Breakage aplenty on non-win32 platforms, I suspect, but this radical
surgery, and culling of unused functions, was really, really needed.
Revision
92510 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Dec 18 04:59:13 2001 UTC
(23 years, 4 months ago)
by
trawick
File length: 26463 byte(s)
Diff to
previous 92144
(
colored)
Stop using HARD_SERVER_LIMIT/HARD_THREAD_LIMIT all over the place
and instead use the mpm query function to retrieve those limits and
use those dynamically-retrieved values when walking the scoreboard.
Revision
92144 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 23 16:35:22 2001 UTC
(23 years, 4 months ago)
by
ianh
File length: 26247 byte(s)
Diff to
previous 91435
(
colored)
Modify post_config hook so that it can return a error,
causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully
PR:
Obtained from:
Submitted by:
Reviewed by: (Idea only Jeff Trawick)
Revision
89821 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 31 06:22:32 2001 UTC
(23 years, 8 months ago)
by
gregames
File length: 26214 byte(s)
Diff to
previous 89820
(
colored)
don't count workers in processes which aren't actively serving requests.
it is necessary to check for the generation as well as "quiescing", in the
case of a restart where no workers have seen the PoD yet.
Revision
89820 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 31 05:35:06 2001 UTC
(23 years, 8 months ago)
by
gregames
File length: 26129 byte(s)
Diff to
previous 89752
(
colored)
mod_status: don't include workers from dead or quiescing processes in the
"requests currently being processed" or "idle" counts
also, change term from "servers" to "workers" - servers sounds like what
you call the whole thing
Revision
89752 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat Jul 28 01:25:24 2001 UTC
(23 years, 8 months ago)
by
wrowe
File length: 25894 byte(s)
Diff to
previous 89712
(
colored)
More pendantic changes for HTML 3.2/4.01 Transitional compliance, and
XHTML 1.0 legibility. One XHTML issue remains, <td nowrap>, which has
an issue that "attribute minimization is not supported in XML". Since
?notables drops that thorny issue, I'm ignoring this for now.
Revision
89712 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Jul 25 21:15:54 2001 UTC
(23 years, 8 months ago)
by
wrowe
File length: 25250 byte(s)
Diff to
previous 89542
(
colored)
Some cast magic for intentional float/int transformations, but I have
no idea what exactly this computation was trying to accomplish...
req_time = (long)(((ws_record.stop_time - ws_record.start_time) * 1000)
+ ((ws_record.stop_time - ws_record.start_time) / 1000));
Revision
89542 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu Jul 12 03:20:50 2001 UTC
(23 years, 9 months ago)
by
gregames
File length: 25062 byte(s)
Diff to
previous 89534
(
colored)
scratch an old itch - give lingering close its own state in the scoreboard.
clean up SERVER_ACCEPTING and SERVER_QUEUEING (never set) while I'm at it.
Revision
89534 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 10 22:50:54 2001 UTC
(23 years, 9 months ago)
by
gregames
File length: 24802 byte(s)
Diff to
previous 89249
(
colored)
fix pid numbers in mod_status output when using a threaded mpm. pid_buffer was
being indexed by worker slot during initialization, then by process slot when
generating output.
This saves a little storage and a few cycles, too.
Revision
89249 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu May 31 18:10:04 2001 UTC
(23 years, 10 months ago)
by
trawick
File length: 24829 byte(s)
Diff to
previous 89248
(
colored)
handle the SERVER_IDLE_KILL state in some of the ExtendedStatus=On
output
I don't have 100% confidence in my guess as to why some of the state labels
are in bold and some aren't (e.g., "<b>Write</b>" vs. "Graceful". Hopefully
any rhyme or reason to it is maintained with my change.
Revision
89248 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed May 30 14:14:26 2001 UTC
(23 years, 10 months ago)
by
trawick
File length: 24565 byte(s)
Diff to
previous 89115
(
colored)
a worker being cleaned up is not processing a request; filter out such
workers when counting the number of requests being processed
we won't count such workers as idle either, since they aren't available
to process new requests
Revision
89115 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue May 15 02:38:17 2001 UTC
(23 years, 11 months ago)
by
rederpj
File length: 24538 byte(s)
Diff to
previous 89048
(
colored)
Make first phase changes to the scoreboard data structures in
preparation for the rewriting of the scoreboard per my posted
design notes. [Paul J. Reder]
Revision
89048 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon May 7 16:24:14 2001 UTC
(23 years, 11 months ago)
by
trawick
File length: 24677 byte(s)
Diff to
previous 89047
(
colored)
minor scoreboard/status improvements:
. get the SS field in extended status output formatted correctly
(seconds since beginning of request shouldn't be a huge
negative number :) )
. use APR_OS_PID_T_FMT and pid_t where appropriate in mod_status
to avoid casting, some of which may have been broken on some
architectures
Revision
89047 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon May 7 15:49:42 2001 UTC
(23 years, 11 months ago)
by
trawick
File length: 24459 byte(s)
Diff to
previous 88741
(
colored)
Get rid of some Apache 1.x OPTIMIZE_TIMEOUTS cruft. Other logic
in 1.3 which used this stuff would send SIGALRM to children in
certain circumstances.
Revision
88741 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Apr 6 20:12:09 2001 UTC
(24 years ago)
by
rederpj
File length: 24632 byte(s)
Diff to
previous 88397
(
colored)
Changes required to make prefork clean up idle children properly. There was a window during which a starting worker deadlocks when an idle cleanup arrives before it completes init. Apache then keeps trying to cleanup the same deadlocked worker forever (until higher pids come along, but it still will never reduce below the deadlocked pid). Thus the number of children would not reduce to the correct idle level.
Revision
88397 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 28 18:41:44 2001 UTC
(24 years, 1 month ago)
by
trawick
File length: 24513 byte(s)
Diff to
previous 88390
(
colored)
Fix a problem displaying status when a threaded MPM is used.
The line
int indx = (i * HARD_THREAD_LIMIT) + j;
in the vicinity of the change was bad; k needed to be added
instead of j.
I swapped the use of j and k in this section so that i and j
had the same meaning as in an earlier nested loop. I suspect
that the difference in meaning is what led to the bug.
Revision
88265 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 21 21:02:57 2001 UTC
(24 years, 2 months ago)
by
stoddard
File length: 24542 byte(s)
Diff to
previous 88184
(
colored)
Performance: apr_now() was being called for -all- requests. Call it only
for calls to server-status. This module is still a mess...
Revision
88176 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 15 19:22:02 2001 UTC
(24 years, 2 months ago)
by
rbb
File length: 24535 byte(s)
Diff to
previous 88170
(
colored)
Fix the seg fault in mod_status.c. This changes the up_time to an
interval_time. The segfault is caused by apr_vformatter not understanding
%lld, so we also had to change that to %qd, which solves that problem.
Revision
88152 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 14 03:49:17 2001 UTC
(24 years, 2 months ago)
by
stoddard
File length: 24523 byte(s)
Diff to
previous 88070
(
colored)
PR:
Obtained from:
Submitted by:
Get req/sec and bytes/sec status reporting working. Still lots of type
warnings but this is a bit better than before.
Revision
88022 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 8 13:16:00 2001 UTC
(24 years, 2 months ago)
by
trawick
File length: 24491 byte(s)
Diff to
previous 88019
(
colored)
get _SC_CLK_TCK defined on Tru64 (and probably some other systems
as well); it works without it on systems which define HZ or don't
have times
Revision
87959 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 2 21:32:34 2001 UTC
(24 years, 2 months ago)
by
stoddard
File length: 24338 byte(s)
Diff to
previous 87958
(
colored)
Begin restructuring scoreboard code to enable adding back in
the ability to use IPC other than shared memory.
Get mod_status working on Windows again.
Still to do:
Rename some of the function APIs. Replace all calls to reinit_scoreboard with
ap_create_scoreboard. Add back in support for scoreboard files.
Revision
87958 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 2 19:28:06 2001 UTC
(24 years, 2 months ago)
by
stoddard
File length: 24333 byte(s)
Diff to
previous 87949
(
colored)
Should consider APRizing the entire module. For now, use HAVE_TIMES
to indicate if we have the necessary structures. This is part of getting
mod_status working on Windows
Revision
87949 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 1 21:55:16 2001 UTC
(24 years, 2 months ago)
by
rbb
File length: 24308 byte(s)
Diff to
previous 87876
(
colored)
Bring mod_status for 2.0 back in line with mod_status for 1.3. This is
basically a straight port of the 1.3 module to 2.0. The MPMs need to be
modified a bit to work with mod_status, but prefork, mpmt_pthread, and
dexter have already been changed. I will fix perchild tonight. There
is a lot of common code that can be abstracted, and there seems to be a
small bug with regard to what mpmt_pthread and dexter report as current
connections. ExtendedStatus does work again, although until the bug
mentioned above is fixed, it isn't as useful on mpmt_pthread and dexter.
Next week, I will look at allowing other modules to add data to the
STATUS page and possibly to the scoreboard itself.
Revision
87731 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Jan 19 07:04:36 2001 UTC
(24 years, 3 months ago)
by
wrowe
File length: 5168 byte(s)
Diff to
previous 87697
(
colored)
The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
for the quick glance at symbols changed.
Revision
87697 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Jan 17 15:52:12 2001 UTC
(24 years, 3 months ago)
by
wrowe
File length: 5167 byte(s)
Diff to
previous 87617
(
colored)
Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
which they may have been dynamically loaded.
Revision
87617 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon Jan 8 23:55:12 2001 UTC
(24 years, 3 months ago)
by
dougm
File length: 5158 byte(s)
Diff to
previous 86609
(
colored)
adjust remaining modules to use the new handler hook method (Alan Edwards)
bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:
Revision
86609 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 16 06:05:15 2000 UTC
(24 years, 6 months ago)
by
wrowe
File length: 5127 byte(s)
Diff to
previous 85976
(
colored)
Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
All _VAR_ flavors changes to _DATA to be absolutely clear.
Thank you Greg, for the most obvious suggestion.
Revision
85318 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat May 27 22:40:44 2000 UTC
(24 years, 10 months ago)
by
wrowe
File length: 5114 byte(s)
Diff to
previous 85309
(
colored)
PR:
Obtained from:
Submitted by:
Reviewed by:
Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT
names for linkage (API_, CORE_, and MODULE_).
Revision
85309 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sat May 27 05:28:02 2000 UTC
(24 years, 10 months ago)
by
wrowe
File length: 5114 byte(s)
Diff to
previous 84879
(
colored)
This patch corrects the issues from the AP_EXPORT and linkage
specification arguments to the ap_hooks.h declarations. As with
the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.
I will be happy to revert the inclusion of ap_config.h from
httpd.h if this bothers anyone. More individual modules need
to be patched if we do so.
The API_EXPORTs all moved into central storage in the ap_config.h
header. Without WIN32 or API_STATIC compile time declarations,
these macros remain no-ops.
This patch also moves the following data from http_main to http_config:
const char *ap_server_argv0;
const char *ap_server_root;
ap_array_header_t *ap_server_pre_read_config;
ap_array_header_t *ap_server_post_read_config;
ap_array_header_t *ap_server_config_defines;
And the following variables had already moved into ap_hooks.c:
ap_pool_t *g_pHookPool; (initialized now in http_config)
int g_bDebugHooks; (out of http_config)
const char *g_szCurrentHookName; (out of http_config)
The changes to http_main.c are in preparation for that module to
move out to a seperate .exe for win32. Other platforms will be
unaffected, outside of these changes.
Revision
84725 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 10 00:07:37 2000 UTC
(25 years, 1 month ago)
by
rbb
File length: 5259 byte(s)
Diff to
previous 84492
(
colored)
Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license
Revision
84492 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 18 23:41:56 2000 UTC
(25 years, 3 months ago)
by
rbb
File length: 5133 byte(s)
Diff to
previous 84413
(
colored)
This is a huge change to the configure system. Basically, this name space
protects most, if not all, of the Apache macros. This has been tested on
Linux using all of the Unix MPM's. The biggest push was that Apache's
httpd.h header file can no longer include the ap_config.h file. Most of the
other files include this themselves now.
Submitted by: Ryan Bloom and Manoj Kasichainula
Revision
84413 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Sun Jan 9 05:18:31 2000 UTC
(25 years, 3 months ago)
by
dgaudet
File length: 5116 byte(s)
Diff to
previous 84386
(
colored)
time overhaul:
- ap_time_t is a 64-bit scalar, microseconds since epoch
- ap_exploded_time_t corresponds to struct tm with a few extras
probably broken on anything except linux.
Revision
84386 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Fri Dec 31 20:32:36 1999 UTC
(25 years, 3 months ago)
by
rbb
File length: 5214 byte(s)
Diff to
previous 84383
(
colored)
A few more tweaks to finish the modules work. Now, all of the modules
compile correctly with Apache 2.0. This does run, but it hasn't been tested
any more than simply compiling and running the server.
Revision
83982 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 13 05:24:16 1999 UTC
(25 years, 6 months ago)
by
manoj
File length: 5148 byte(s)
Diff to
previous 83852
(
colored)
Add a connection status table to replace the old function of the
scoreboard. It allows MPMs to implement their own mechanism for the
status table and allows any module to add its own per-connection status
entries.
Revision
83852 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Tue Aug 31 05:35:52 1999 UTC
(25 years, 7 months ago)
by
rbb
File length: 24771 byte(s)
Diff to
previous 83794
(
colored)
Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly.
Revision
83794 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 26 17:34:28 1999 UTC
(25 years, 7 months ago)
by
fielding
File length: 24748 byte(s)
Diff to
previous 83751
(
colored)
Changes to mod_status so that the two new states for threads are recognized
and reported properly.
Submitted by: Ryan Bloom
Revision
83751 -
(
view)
(
download)
(
annotate)
-
[select for diffs]
Added
Tue Aug 24 06:55:44 1999 UTC
(25 years, 8 months ago)
by
fielding
File length: 23768 byte(s)
Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group
This form allows you to request diffs between any two revisions of this file.
For each of the two "sides" of the diff,
enter a numeric revision.