dgaudet 98/03/02 17:22:11
Modified: htdocs/manual new_features_1_3.html htdocs/manual/misc perf-tuning.html src CHANGES Configure src/include conf.h Log: Fall back to USE_FCNTL_SERIALIZED_ACCEPT for Solaris. It's foolish us wasting resources trying to solve what may end up being bugs in solaris. PR: 1779, 1854, 1904 Revision Changes Path 1.47 +1 -2 apache-1.3/htdocs/manual/new_features_1_3.html Index: new_features_1_3.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- new_features_1_3.html 1998/02/23 08:27:35 1.46 +++ new_features_1_3.html 1998/03/03 01:21:55 1.47 @@ -305,8 +305,7 @@ performed for each hit, now it is performed only once per second. This should be noticeable on servers running with hundreds of children and high loads. - <LI>New serialization choices improve performance on Linux, Solaris, - and IRIX. + <LI>New serialization choices improve performance on Linux, and IRIX. <LI><CODE><A HREF="mod/mod_log_config.html">mod_log_config</A></CODE> can be compile-time configured to buffer writes. <LI>Replaced <CODE>strncpy()</CODE> with <CODE>ap_cpystrn()</CODE>, a 1.9 +4 -2 apache-1.3/htdocs/manual/misc/perf-tuning.html Index: perf-tuning.html =================================================================== RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-tuning.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perf-tuning.html 1998/02/05 21:19:57 1.8 +++ perf-tuning.html 1998/03/03 01:21:56 1.9 @@ -371,8 +371,10 @@ <DT><CODE>USE_PTHREAD_SERIALIZED_ACCEPT</CODE> <DD>(1.3 or later) This method uses POSIX mutexes and should work on any architecture implementing the full POSIX threads specification, -however appears to only work on Solaris (2.5 or later). This is the -default for Solaris 2.5 or later. +however appears to only work on Solaris (2.5 or later), and even then +only in certain configurations. If you experiment with this you should +watch out for your server hanging and not responding. Static content +only servers may work just fine. </DL> <P>If your system has another method of serialization which isn't in the 1.678 +8 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.677 retrieving revision 1.678 diff -u -r1.677 -r1.678 --- CHANGES 1998/03/02 10:57:57 1.677 +++ CHANGES 1998/03/03 01:22:03 1.678 @@ -1,5 +1,13 @@ Changes with Apache 1.3b6 + *) USE_PTHREAD_SERIALIZED_ACCEPT has proven unreliable depending on + the rev of Solaris and what mixture of modules are in use. So + it has been disabled, and Solaris is back to using + USE_FCNTL_SERIALIZED_ACCEPT. Users may experiment with + USE_PTHREAD_SERIALIZED_ACCEPT at their own risk, it may speed + up static content only servers. Or it may fail unpredictably. + [Dean Gaudet] PR#1779, 1854, 1904 + *) mod_test_util_uri.c created which tests the logic in util_uri.c. [Dean Gaudet] 1.193 +0 -5 apache-1.3/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- Configure 1998/03/01 12:56:02 1.192 +++ Configure 1998/03/03 01:22:06 1.193 @@ -425,11 +425,6 @@ OS="Solaris $PLATOSVERS" CFLAGS="$CFLAGS -DSOLARIS2=$PLATOSVERS" LIBS="$LIBS -lsocket -lnsl" - case "$PLATOSVERS" in - 2[56789]*) - LIBS="$LIBS -lpthread" - ;; - esac DBM_LIB="" case "$PLATOSVERS" in 2[01234]*) 1.186 +2 -6 apache-1.3/src/include/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v retrieving revision 1.185 retrieving revision 1.186 diff -u -r1.185 -r1.186 --- conf.h 1998/02/28 15:39:32 1.185 +++ conf.h 1998/03/03 01:22:10 1.186 @@ -138,13 +138,9 @@ #undef NO_SETSID #define HAVE_SYS_RESOURCE_H #define bzero(a,b) memset(a,0,b) -#if SOLARIS2 < 250 -#define USE_FCNTL_SERIALIZED_ACCEPT -#else #if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) && \ - !defined(USE_FCNTL_SERIALIZED_ACCEPT) -#define USE_PTHREAD_SERIALIZED_ACCEPT -#endif + !defined(USE_PTHREAD_SERIALIZED_ACCEPT) +#define USE_FCNTL_SERIALIZED_ACCEPT #endif #define NEED_UNION_SEMUN #define HAVE_MMAP