--- parser3/src/targets/isapi/parser3isapi.C 2002/04/16 14:41:40 1.69 +++ parser3/src/targets/isapi/parser3isapi.C 2002/05/07 07:39:19 1.71 @@ -4,7 +4,7 @@ Copyright (c) 2000,2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: parser3isapi.C,v 1.69 2002/04/16 14:41:40 paf Exp $ + $Id: parser3isapi.C,v 1.71 2002/05/07 07:39:19 paf Exp $ */ #ifndef _MSC_VER @@ -215,6 +215,9 @@ int failed_new(size_t size) { return 0; // not reached } +#ifdef _DEBUG +static Pool_storage *global_pool_storagep; +#endif static bool parser_init() { static bool globals_inited=false; if(globals_inited) @@ -224,6 +227,9 @@ static bool parser_init() { _set_new_handler(failed_new); static Pool_storage pool_storage; +#ifdef _DEBUG + global_pool_storagep=&pool_storage; +#endif static Pool pool(&pool_storage); // global pool try { // init socks @@ -311,7 +317,12 @@ void real_parser_handler(Pool& pool, LPE Request request(pool, request_info, String::UL_HTML|String::UL_OPTIMIZE_BIT, - false /* status_allowed */); +#ifdef _DEBUG + true +#else + false +#endif + /* status_allowed */); // some root-controlled location // c:\windows @@ -372,8 +383,7 @@ void call_real_parser_handler__do_SEH(Po #endif } - -DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { +inline DWORD RealHttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { Pool_storage pool_storage; Pool pool(&pool_storage); // no allocations until assigned context [for reporting] SAPI_func_context ctx={ @@ -382,7 +392,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI 200 // default http_response_code }; pool.set_context(&ctx);// no allocations before this line! - + bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; try { // global try call_real_parser_handler__do_SEH(pool, lpECB, header_only); @@ -456,10 +466,38 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI lpECB->WriteClient(lpECB->ConnID, (void *)body, &num_bytes, HSE_IO_SYNC); */ - return HSE_STATUS_SUCCESS_AND_KEEP_CONN; } +#ifdef _DEBUG +//for memory leaks detection only +#undef _WINDOWS_ +#include +#endif +DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { +// Declare the variables needed +#ifdef _DEBUG +// _crtBreakAlloc=97779;//97777; //997; + + CMemoryState oldMemState, newMemState, diffMemState; + oldMemState.Checkpoint(); + //global_pool_storagep->fbreak_on_alloc=true; +#endif + + DWORD result=RealHttpExtensionProc(lpECB); + +#ifdef _DEBUG + newMemState.Checkpoint(); + if( diffMemState.Difference( oldMemState, newMemState ) ) + { + TRACE( "Memory leaked!\n" ); + diffMemState.DumpStatistics( ); + diffMemState.DumpAllObjectsSince(); + } +#endif + return result; +} + BOOL WINAPI DllMain( HINSTANCE hinstDLL, // handle to the DLL module DWORD fdwReason, // reason for calling function