--------------------- PatchSet 3728 Date: 2006/09/13 07:11:36 Author: serassio Branch: nt Tag: (none) Log: Removed not useful cachemgr functionality Members: src/Makefile.am:1.26.2.92->1.26.2.93 src/WinSvc.cc:1.1.2.1->1.1.2.2 src/cache_manager.cc:1.5.2.16->1.5.2.17 src/ufsdump.cc:1.3.2.7->1.3.2.8 src/tests/testCacheManager.cc:1.1.2.2->1.1.2.3 src/tests/testEvent.cc:1.1.2.4->1.1.2.5 src/tests/testEventLoop.cc:1.1.2.5->1.1.2.6 src/tests/testHttpRequest.cc:1.1.2.2->1.1.2.3 src/tests/testURL.cc:1.1.2.3->1.1.2.4 src/tests/test_http_range.cc:1.1.2.2->1.1.2.3 Index: squid3/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v retrieving revision 1.26.2.92 retrieving revision 1.26.2.93 diff -u -r1.26.2.92 -r1.26.2.93 --- squid3/src/Makefile.am 5 Sep 2006 21:00:09 -0000 1.26.2.92 +++ squid3/src/Makefile.am 13 Sep 2006 07:11:36 -0000 1.26.2.93 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.26.2.92 2006/09/05 21:00:09 serassio Exp $ +# $Id: Makefile.am,v 1.26.2.93 2006/09/13 07:11:36 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -140,11 +140,15 @@ SSL_SOURCE = endif -WIN32_ALL_SOURCE = win32.cc +WIN32_ALL_SOURCE = \ + win32.cc \ + WinSvc.cc if ENABLE_WIN32SPECIFIC -WIN32_SOURCE = $(WIN32_ALL_SOURCE) +WIN32_SOURCE = win32.cc +WINSVC_SOURCE = WinSvc.cc else -WIN32_SOURCE = +WIN32_SOURCE = +WINSVC_SOURCE = endif if USE_IPC_WIN32 @@ -608,7 +612,8 @@ whois.cc \ wordlist.cc \ wordlist.h \ - $(WIN32_SOURCE) + $(WIN32_SOURCE) \ + $(WINSVC_SOURCE) noinst_HEADERS = ACLChecklist.cci \ AuthUser.cci \ @@ -1350,6 +1355,7 @@ wais.cc \ wccp2.cc \ whois.cc \ + $(WIN32_SOURCE) \ wordlist.cc nodist_tests_testCacheManager_SOURCES = \ repl_modules.cc \ @@ -1500,6 +1506,7 @@ wais.cc \ wccp2.cc \ whois.cc \ + $(WIN32_SOURCE) \ wordlist.cc nodist_tests_testEvent_SOURCES = \ repl_modules.cc \ @@ -1650,6 +1657,7 @@ wais.cc \ wccp2.cc \ whois.cc \ + $(WIN32_SOURCE) \ wordlist.cc nodist_tests_testEventLoop_SOURCES = \ repl_modules.cc \ @@ -1830,6 +1838,7 @@ wais.cc \ wccp2.cc \ whois.cc \ + $(WIN32_SOURCE) \ wordlist.cc \ Packer.cc \ MemBuf.cc @@ -1979,6 +1988,7 @@ wais.cc \ wccp2.cc \ whois.cc \ + $(WIN32_SOURCE) \ wordlist.cc nodist_tests_testHttpRequest_SOURCES = \ repl_modules.cc \ @@ -2125,7 +2135,6 @@ $(DISKIO_SOURCE) SWAP_TEST_LDADD = \ - libsquid.la \ libauth.la \ DiskIO/Blocking/BlockingDiskIOModule.o \ repl/lru/store_repl_lru.o \ @@ -2309,6 +2318,7 @@ wais.cc \ wccp2.cc \ whois.cc \ + $(WIN32_SOURCE) \ wordlist.cc nodist_tests_testURL_SOURCES = \ repl_modules.cc \ @@ -2316,6 +2326,7 @@ tests_testURL_LDADD = \ libsquid.la \ libauth.la \ + @REGEXLIB@ \ @REPL_OBJS@ \ @ICAP_LIBS@ \ @SNMPLIB@ \ Index: squid3/src/WinSvc.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/WinSvc.cc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/src/WinSvc.cc 11 Sep 2006 19:27:07 -0000 1.1.2.1 +++ squid3/src/WinSvc.cc 13 Sep 2006 07:11:36 -0000 1.1.2.2 @@ -1,6 +1,6 @@ /* - * $Id: WinSvc.cc,v 1.1.2.1 2006/09/11 19:27:07 serassio Exp $ + * $Id: WinSvc.cc,v 1.1.2.2 2006/09/13 07:11:36 serassio Exp $ * * Windows support * AUTHOR: Guido Serassio @@ -65,7 +65,6 @@ static void Win32SockCleanup(void); SQUIDCEXTERN LPCRITICAL_SECTION dbg_mutex; void WIN32_ExceptionHandlerCleanup(void); -static LPTOP_LEVEL_EXCEPTION_FILTER Win32_Old_ExceptionHandler = NULL; static int s_iInitCount = 0; #endif Index: squid3/src/cache_manager.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/cache_manager.cc,v retrieving revision 1.5.2.16 retrieving revision 1.5.2.17 diff -u -r1.5.2.16 -r1.5.2.17 --- squid3/src/cache_manager.cc 25 Aug 2006 20:11:29 -0000 1.5.2.16 +++ squid3/src/cache_manager.cc 13 Sep 2006 07:11:36 -0000 1.5.2.17 @@ -1,6 +1,6 @@ /* - * $Id: cache_manager.cc,v 1.5.2.16 2006/08/25 20:11:29 serassio Exp $ + * $Id: cache_manager.cc,v 1.5.2.17 2006/09/13 07:11:36 serassio Exp $ * * DEBUG: section 16 Cache Manager Objects * AUTHOR: Duane Wessels @@ -64,10 +64,6 @@ static const char *cachemgrActionProtection(const CacheManagerAction * at); static OBJH cachemgrShutdown; static OBJH cachemgrReconfigure; -static OBJH cachemgrRotate; -#if defined(_SQUID_MSWIN_) && defined(_DEBUG) -static OBJH cachemgrBreak; -#endif static OBJH cachemgrMenu; static OBJH cachemgrOfflineToggle; @@ -82,15 +78,6 @@ registerAction("reconfigure", "Reconfigure the Squid Process", cachemgrReconfigure, 1, 1); - registerAction("rotate", - "Rotate Squid Logs", - cachemgrRotate, 1, 1); -#if defined(_SQUID_MSWIN_) && defined(_DEBUG) - - registerAction("break", - "Break the Squid Process", - cachemgrBreak, 1, 1); -#endif registerAction("offline_toggle", "Toggle offline_mode setting", cachemgrOfflineToggle, 1, 1); @@ -372,25 +359,6 @@ } static void -cachemgrRotate(StoreEntry * sentry) -{ - debug(16, 0) ("Rotate by command.\n"); - rotate_logs(SIGUSR1); - storeAppendPrintf(sentry, "Rotating Squid Logs ...."); -} - -#if defined(_SQUID_MSWIN_) && defined(_DEBUG) -static void -cachemgrBreak(StoreEntry * sentry) -{ - debug(16, 0) ("Break by command.\n"); - sigusr2_handle(SIGUSR2); - storeAppendPrintf(sentry, "Breaking Squid Process ...."); -} - -#endif - -static void cachemgrOfflineToggle(StoreEntry * sentry) { Config.onoff.offline = !Config.onoff.offline; Index: squid3/src/ufsdump.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ufsdump.cc,v retrieving revision 1.3.2.7 retrieving revision 1.3.2.8 diff -u -r1.3.2.7 -r1.3.2.8 --- squid3/src/ufsdump.cc 29 May 2006 17:04:06 -0000 1.3.2.7 +++ squid3/src/ufsdump.cc 13 Sep 2006 07:11:36 -0000 1.3.2.8 @@ -1,6 +1,6 @@ /* - * $Id: ufsdump.cc,v 1.3.2.7 2006/05/29 17:04:06 serassio Exp $ + * $Id: ufsdump.cc,v 1.3.2.8 2006/09/13 07:11:36 serassio Exp $ * * DEBUG: section 0 UFS Store Dump * AUTHOR: Robert Collins @@ -44,25 +44,14 @@ #include #include -#if USE_WIN32_SERVICE -#include "squid_windows.h" -#endif - /* stub functions for parts of squid not factored to be dynamic yet */ void shut_down(int) {} -#if USE_WIN32_SERVICE -void -rotate_logs(int) -{} - void reconfigure(int) {} -#endif - #if WHENITMINIMAL void eventAdd(const char *name, EVH * func, void *arg, double when, int, bool cbdata) @@ -96,18 +85,8 @@ } }; -#if USE_WIN32_SERVICE -/* When USE_WIN32_SERVICE is defined, the main function is placed in win32.cc */ -extern "C" void WINAPI - SquidWinSvcMain(int, char **) -{} - -int -SquidMain(int argc, char *argv[]) -#else int main(int argc, char *argv[]) -#endif { int fd = -1; StoreMeta *metadata = NULL; Index: squid3/src/tests/testCacheManager.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/tests/testCacheManager.cc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/src/tests/testCacheManager.cc 29 May 2006 17:04:06 -0000 1.1.2.2 +++ squid3/src/tests/testCacheManager.cc 13 Sep 2006 07:11:37 -0000 1.1.2.3 @@ -13,6 +13,10 @@ shut_down(int) {} +void +reconfigure(int) +{} + /* end stubs */ /* init memory pools */ Index: squid3/src/tests/testEvent.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/tests/testEvent.cc,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid3/src/tests/testEvent.cc 22 Aug 2006 10:26:06 -0000 1.1.2.4 +++ squid3/src/tests/testEvent.cc 13 Sep 2006 07:11:37 -0000 1.1.2.5 @@ -15,6 +15,10 @@ shut_down(int) {} +void +reconfigure(int) +{} + /* end stubs */ /* init legacy static-initialized modules */ Index: squid3/src/tests/testEventLoop.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/tests/testEventLoop.cc,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -r1.1.2.5 -r1.1.2.6 --- squid3/src/tests/testEventLoop.cc 2 Sep 2006 20:07:09 -0000 1.1.2.5 +++ squid3/src/tests/testEventLoop.cc 13 Sep 2006 07:11:37 -0000 1.1.2.6 @@ -16,6 +16,10 @@ shut_down(int) {} +void +reconfigure(int) +{} + /* end stubs */ /* init legacy static-initialized modules */ Index: squid3/src/tests/testHttpRequest.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/tests/testHttpRequest.cc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/src/tests/testHttpRequest.cc 3 May 2006 19:01:10 -0000 1.1.2.2 +++ squid3/src/tests/testHttpRequest.cc 13 Sep 2006 07:11:37 -0000 1.1.2.3 @@ -13,6 +13,10 @@ shut_down(int) {} +void +reconfigure(int) +{} + /* end stubs */ /* init memory pools */ Index: squid3/src/tests/testURL.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/tests/testURL.cc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/src/tests/testURL.cc 2 Sep 2006 09:11:24 -0000 1.1.2.3 +++ squid3/src/tests/testURL.cc 13 Sep 2006 07:11:37 -0000 1.1.2.4 @@ -14,6 +14,10 @@ shut_down(int) {} +void +reconfigure(int) +{} + /* end stubs */ /* init memory pools */ Index: squid3/src/tests/test_http_range.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/tests/test_http_range.cc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/src/tests/test_http_range.cc 21 May 2006 17:08:37 -0000 1.1.2.2 +++ squid3/src/tests/test_http_range.cc 13 Sep 2006 07:11:37 -0000 1.1.2.3 @@ -1,6 +1,6 @@ /* - * $Id: test_http_range.cc,v 1.1.2.2 2006/05/21 17:08:37 serassio Exp $ + * $Id: test_http_range.cc,v 1.1.2.3 2006/09/13 07:11:37 serassio Exp $ * * DEBUG: section 64 HTTP Range Header * AUTHOR: Alex Rousskov @@ -45,6 +45,10 @@ shut_down(int) {} +void +reconfigure(int) +{} + SQUIDCEXTERN void httpHeaderPutStr(HttpHeader * hdr, http_hdr_type type, const char *str) { fatal ("dummy function\n");