AIX patches

Hi,

Would you mind reviewing/considering the following patches? First, I've
noticed my cachemgr is reporting huge values for Maximum Resident Size. The
following patch against 2.5S2 corrects the problem. Tested on AIX 5.

The second patch is a repost of one I submitted a few months ago (Robert - I
have GNU diff now :-) It's also against 2.5S2 but s/1573/1802/g if it would
be more appropriate for HEAD.

Also, I'm just thinking out loud here, but as AIX becomes more Linux-like,
things like the XOPEN_SOURCE defines in squid.h will become unnecessary
(works without them on AIX 5 with limited testing) but should probably stay
for the sake of AIX4. But its probably not worth putting in conditionals for
AIX<5 there, do you think?

--- src/tools.c.orig 2003-02-08 12:31:10.000000000 +1000
+++ src/tools.c 2003-04-29 11:40:38.000000000 +1000
@@ -199,20 +199,22 @@

 int
 rusage_maxrss(struct rusage *r)
 {
 #if defined(_SQUID_SGI_) && _ABIAPI
     return r->ru_pad[0];
 #elif defined(_SQUID_SGI_)
     return r->ru_maxrss;
 #elif defined(_SQUID_OSF_)
     return r->ru_maxrss;
+#elif defined(_SQUID_AIX_)
+ return r->ru_maxrss;
 #elif defined(BSD4_4)
     return r->ru_maxrss;
 #elif defined(HAVE_GETPAGESIZE) && HAVE_GETPAGESIZE != 0
     return (r->ru_maxrss * getpagesize()) >> 10;
 #elif defined(PAGESIZE)
     return (r->ru_maxrss * PAGESIZE) >> 10;
 #else
     return r->ru_maxrss;
 #endif
 }

--- configure.in.orig 2003-04-10 10:13:17.000000000 +1000
+++ configure.in 2003-04-29 12:05:16.000000000 +1000
@@ -1573,13 +1573,17 @@
         *-ibm-aix*)
                 echo "Removing -lbsd for AIX..."
                 LIBS=`echo $LIBS | sed -e s/-lbsd//`
+ case "$host" in
 dnl From: mlaster@metavillage.com (Mike Laster)
 dnl AIX 4.1.4.x does not have header files for snprintf/vsnprintf
 dnl So using the internal versions generates a load of warnings
 dnl during compile.
- echo "disabling snprintf/vsnprintf for $host"
- ac_cv_func_snprintf=no
- ac_cv_func_vsnprintf=no
+ *-ibm-aix4*)
+ echo "disabling snprintf/vsnprintf for $host"
+ ac_cv_func_snprintf=no
+ ac_cv_func_vsnprintf=no
+ ;;
+ esac
                 ;;
         *m88k*)
                 CFLAGS="$CFLAGS -D_SQUID_MOTOROLA_"
Received on Tue Apr 29 2003 - 03:42:06 MDT