--------------------- PatchSet 2385 Date: 2001/05/27 14:43:14 Author: serassio Branch: cygwin Tag: (none) Log: Added PSAPI.DLL support for memory usage informations Members: acconfig.h:1.4.10.4->1.4.10.5 configure.in:1.8.2.8->1.8.2.9 doc/win32-relnotes.txt:1.1->1.1.2.1 Index: squid/acconfig.h =================================================================== RCS file: /cvsroot/squid-sf//squid/Attic/acconfig.h,v retrieving revision 1.4.10.4 retrieving revision 1.4.10.5 diff -u -r1.4.10.4 -r1.4.10.5 --- squid/acconfig.h 28 Apr 2001 10:02:36 -0000 1.4.10.4 +++ squid/acconfig.h 27 May 2001 14:43:14 -0000 1.4.10.5 @@ -23,7 +23,7 @@ #ifndef __CONFIGURE_H__ #define __CONFIGURE_H__ @TOP@ -/* $Id: acconfig.h,v 1.4.10.4 2001/04/28 10:02:36 serassio Exp $ */ +/* $Id: acconfig.h,v 1.4.10.5 2001/05/27 14:43:14 serassio Exp $ */ /********************************* * START OF CONFIGURABLE OPTIONS * @@ -197,6 +197,9 @@ /* Define if you have struct rusage */ #undef HAVE_STRUCT_RUSAGE +/* Define if you have PSAPI.DLL on Windows systems */ +#undef HAVE_WIN32_PSAPI + /* * This makes warnings go away. If you have socklen_t defined in your * /usr/include files, then this should remain undef'd. Otherwise it Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.8.2.8 retrieving revision 1.8.2.9 diff -u -r1.8.2.8 -r1.8.2.9 --- squid/configure.in 6 May 2001 17:18:13 -0000 1.8.2.8 +++ squid/configure.in 27 May 2001 14:43:14 -0000 1.8.2.9 @@ -3,13 +3,13 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.8.2.8 2001/05/06 17:18:13 serassio Exp $ +dnl $Id: configure.in,v 1.8.2.9 2001/05/27 14:43:14 serassio Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.8.2.8 $)dnl +AC_REVISION($Revision: 1.8.2.9 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AC_CONFIG_AUX_DIR(cfgaux) @@ -31,19 +31,29 @@ dnl (adding an option like --enable-cygwin-support doesn't make sense :]) - R Collins 2001 case "$host_os" in cygwin|cygwin32|os2) + AC_PATH_PROG(WIN32_PSAPI, psapi.dll, none) + if test "$ac_cv_path_WIN32_PSAPI" = "none"; then + echo "PSAPI.DLL is reccommended to run Squid on Windows NT Platform" + echo "Please see PSAPI.DLL section on doc/win32-relnotes.txt." + else + AC_DEFINE(HAVE_WIN32_PSAPI) + fi exec_suffix=".exe" cgi_suffix=".exe" WIN32_OBJS="win32.o" + WIN32_LIBS="-lpsapi" ;; *) exec_suffix="" cgi_suffix=".cgi" WIN32_OBJS="" + WIN32_LIBS="" ;; esac AC_SUBST(exec_suffix) AC_SUBST(cgi_suffix) AC_SUBST(WIN32_OBJS) +AC_SUBST(WIN32_LIBS) if test -z "$CACHE_HTTP_PORT"; then CACHE_HTTP_PORT="3128" --- /dev/null Wed Feb 14 00:52:54 2007 +++ squid/doc/win32-relnotes.txt Wed Feb 14 00:53:28 2007 @@ -0,0 +1,18 @@ +WIN32 Squid Relese Notes + + + +PSAPI.DLL (Process Status Helper) Considerations + +The process status helper functions make it easier for you to obtain information about +processes and device drivers running on Microsoft® Windows NT®/Windows® 2000. These +functions are available in PSAPI.DLL, which is distributed in the Microsoft® Platform +Software Development Kit (SDK). The same information is generally available through the +performance data in the registry, but it is more difficult to get to it. +PSAPI.DLL is available only on Windows NT, 2000 and XP. The implementation in Squid is +aware of this, and try to use it only on the rigth platform. +On Windows NT PSAPI.DLL can be found as component of many applications, if you need it, +you can find it on Windows NT Resource KIT. If you have problem, you can You can +download it here: http://www.serassio.it/download/psapi.zip +On Windows 2000 it is available installing the Windows 2000 Support Tools, located on the +Support\Tools folder of the installation Windows 2000 CD-ROM.