From 89631bcc6773953e9b1217f9e68e9823a6d92efc Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 22 Jan 1998 23:11:51 +0000 Subject: [PATCH] Submitted by: Jim Jagielski Do make the code a bit clearer, some minor #define changes (and the resultant flow-thru in the docs). SAFE_UNSERIALIZED_ACCEPT -> SINGLE_LISTEN_UNSERIALIZED_ACCEPT HAVE_MMAP -> USE_MMAP_SCOREBOARD HAVE_SHMGET -> USE_SHMGET_SCOREBOARD git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@79959 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/misc/FAQ.html | 4 ++-- docs/manual/misc/perf-tuning.html | 10 +++++----- docs/manual/mod/core.html | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/manual/misc/FAQ.html b/docs/manual/misc/FAQ.html index 0dfd307e65..556933d75e 100644 --- a/docs/manual/misc/FAQ.html +++ b/docs/manual/misc/FAQ.html @@ -15,7 +15,7 @@

Apache Server Frequently Asked Questions

- $Revision: 1.96 $ ($Date: 1997/12/16 16:52:19 $) + $Revision: 1.97 $ ($Date: 1998/01/22 23:11:48 $)

The latest version of this FAQ is always available from the main @@ -1803,7 +1803,7 @@ Linux newsgroup/mailing list. As a last-resort workaround, you can - comment out the #define HAVE_SHMGET definition in the + comment out the #define USE_SHMGET_SCOREBOARD definition in the LINUX section of src/conf.h and rebuild the server. This will produce a server which is slower and less reliable. diff --git a/docs/manual/misc/perf-tuning.html b/docs/manual/misc/perf-tuning.html index da61fddcbb..65b2ecd7a6 100644 --- a/docs/manual/misc/perf-tuning.html +++ b/docs/manual/misc/perf-tuning.html @@ -415,7 +415,7 @@ decrease in requests per second over unserialized single-socket. But unserialized single-socket showed an extra 100ms latency on each request. This latency is probably a wash on long haul lines, and only an issue on LANs. If you want to override the single socket -serialization you can define SAFE_UNSERIALIZED_ACCEPT +serialization you can define SINGLE_LISTEN_UNSERIALIZED_ACCEPT and then single-socket servers will not serialize at all.

Lingering Close

@@ -493,8 +493,8 @@ access to, or have been given detailed ports for, it typically is implemented using shared memory. The rest default to using an on-disk file. The on-disk file is not only slow, but it is unreliable (and less featured). Peruse the src/main/conf.h file -for your architecture and look for either HAVE_MMAP or -HAVE_SHMGET. Defining one of those two enables the +for your architecture and look for either USE_MMAP_SCOREBOARD or +USE_SHMGET_SCOREBOARD. Defining one of those two enables the supplied shared memory code. If your system has another type of shared memory then edit the file src/main/http_main.c and add the hooks necessary to use it in Apache. (Send us back a patch @@ -570,7 +570,7 @@ flock(18, LOCK_EX) = 0 These two calls can be removed by defining -SAFE_UNSERIALIZED_ACCEPT as described earlier. +SINGLE_LISTEN_UNSERIALIZED_ACCEPT as described earlier.

Notice the SIGUSR1 manipulation: @@ -751,7 +751,7 @@ close(3) = 0 which were described earlier.

Let's apply some of these optimizations: --DSAFE_UNSERIALIZED_ACCEPT -DBUFFERED_LOGS and +-DSINGLE_LISTEN_UNSERIALIZED_ACCEPT -DBUFFERED_LOGS and Rule STATUS=no. Here's the final trace: 

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 43f668bb1d..612af35025 100644
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -1477,12 +1477,12 @@ about log file placement and
 
 Apache 1.2 and above:

 
-Linux 1.x users might be able to add -DHAVE_SHMGET to
+Linux 1.x users might be able to add -DUSE_SHMGET_SCOREBOARD to
 the EXTRA_CFLAGS in your Configuration.  This
 might work with some 1.x installations, but won't work with all of
 them.

 
-SVR4 users should consider adding -DHAVE_SHMGET to the
+SVR4 users should consider adding -DUSE_SHMGET_SCOREBOARD to the
 EXTRA_CFLAGS in your Configuration.  This
 is believed to work, but we were unable to test it in time for 1.2
 release.

-- 
2.50.1