--- parser3/src/targets/cgi/parser3.C 2003/03/20 08:11:15 1.216.2.30.2.3 +++ parser3/src/targets/cgi/parser3.C 2003/11/06 09:56:17 1.220 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2003/03/20 08:11:15 $"; +static const char* IDENT_PARSER3_C="$Date: 2003/11/06 09:56:17 $"; #include "pa_config_includes.h" @@ -29,7 +29,6 @@ static const char* IDENT_PARSER3_C="$Dat # include #endif -//#define DEBUG_POOL_MALLOC //#define DEBUG_MAILRECEIVE "mailreceive.eml" // consts @@ -44,7 +43,6 @@ static const char* argv0; static const char* config_filespec_cstr=0; static bool fail_on_config_read_problem=true; -static bool force_header_output=false; static bool cgi; ///< we were started as CGI? static bool mail_received=false; ///< we were started with -m option? [asked to parse incoming message to $mail:received] @@ -115,12 +113,6 @@ void SAPI::log(SAPI_Info&, const char* f } static void die_or_abort(const char* fmt, va_list args, bool write_core) { - //_asm int 3; -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(); - log_pool_stats(SAPI_info); -#endif - // log // logging is more important than user @@ -150,10 +142,12 @@ static void die_or_abort(const char* fmt // exit & try to produce core dump[unix] or invoke debugger[Win32 Debug version] if(write_core) { #if defined(WIN32) && !defined(_DEBUG) - //_asm int 3; // IIS with abort failes to show STDOUT, it just barks "abnormal program termination" exit(1); #else +#if _MSC_VER + _asm int 3; +#endif abort(); #endif } @@ -175,14 +169,14 @@ void SAPI::abort(const char* fmt, ...) { va_end(args); } -char* SAPI::get_envSAPI_Info& , const char* name) { +char* SAPI::get_env(SAPI_Info& , const char* name) { if(char *local=getenv(name)) - return pool.copy(local); + return pa_strdup(local); else return 0; } -const char* const *SAPI::environment(SAPI_Info&, Pool&) { +const char* const *SAPI::environment(SAPI_Info&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -206,13 +200,13 @@ size_t SAPI::read_post(SAPI_Info& , char } void SAPI::add_header_attribute(SAPI_Info& , const char* dont_store_key, const char* dont_store_value) { - if(cgi || force_header_output) + if(cgi) printf("%s: %s\n", dont_store_key, dont_store_value); } /// @todo intelligent cache-control void SAPI::send_header(SAPI_Info& ) { - if(cgi || force_header_output) { + if(cgi) { // puts("expires: Fri, 23 Mar 2001 09:32:23 GMT"); // header | body delimiter @@ -233,7 +227,7 @@ static void full_file_spec(const char* f || file_name[0] && file_name[1]==':' #endif ) - strncpy(buf, file_name, buf_size); + strncpy(buf, file_name, buf_size); else { char cwd[MAX_STRING]; getcwd(cwd, MAX_STRING); snprintf(buf, buf_size, "%s/%s", cwd, file_name); @@ -247,12 +241,11 @@ static void full_file_spec(const char* f static void log_signal(const char* signal_name) { if(request_info) - SAPI::log(SAPI_info, "%s received while %s. uri=%s, method=%s, qs=%s, cl=%u", + SAPI::log(SAPI_info, "%s received while %s. uri=%s, method=%s, cl=%u", signal_name, request?"executing code":"reading data", request_info->uri, request_info->method, - request_info->query_string, request_info->content_length); else SAPI::log(SAPI_info, "%s received before or after processing request", @@ -282,23 +275,19 @@ main workhorse to do that we need to consult metabase, wich is tested but seems slow. */ -static void real_parser_handler( - const char* filespec_to_process, - const char* request_method, bool header_only) { +static void real_parser_handler(const char* filespec_to_process, + const char* request_method, bool header_only) { // init socks pa_init_socks(); // init global variables pa_globals_init(); - // request must be different ptr from global [used in VStateless_class.add_method] - Pool request_pool; - if(!filespec_to_process || !*filespec_to_process) SAPI::die("Parser/%s", PARSER_VERSION); // Request info - Request_info request_info; + Request_info request_info; memset(&request_info, 0, sizeof(request_info)); char document_root_buf[MAX_STRING]; if(cgi) { if(const char* env_document_root=getenv("DOCUMENT_ROOT")) @@ -334,9 +323,9 @@ static void real_parser_handler( request_info.uri=env_request_uri; else if(query_string) { - const char* reconstructed_uri(new char[ + char* reconstructed_uri=new(PointerFreeGC) char[ strlen(path_info)+1/*'?'*/+ - strlen(query_string)+1/*0*/]); + strlen(query_string)+1/*0*/]; strcpy(reconstructed_uri, path_info); strcat(reconstructed_uri, "?"); strcat(reconstructed_uri, query_string); @@ -395,14 +384,9 @@ static void real_parser_handler( SAPI::die("Execution canceled"); // prepare to process request - Request request(request_SAPI_info, + Request request(SAPI_info, request_info, -/*#ifdef _DEBUG - String::UL_HTML|String::UL_OPTIMIZE_BIT -#else*/ - cgi ? String::UL_HTML|String::UL_OPTIMIZE_BIT : String::UL_AS_IS -/*#endif*/ - , + cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS, true /* status_allowed */); // get request ptr for signal handlers @@ -444,11 +428,6 @@ static void real_parser_handler( // pa_done_socks(); - -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(); - log_pool_stats(request_pool); -#endif } #if _MSC_VER && !defined(_DEBUG) @@ -466,8 +445,8 @@ Parser_executed void #endif call_real_parser_handler__do_SEH_return_it( - const char* filespec_to_process, - const char* request_method, bool header_only) { + const char* filespec_to_process, + const char* request_method, bool header_only) { #ifdef PA_USE___TRY Parser_executed result={false}; __try { @@ -480,7 +459,6 @@ call_real_parser_handler__do_SEH_return_ } __except ( (result.system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { - //_asm int 3; result.with_system_exception=true; } return result; @@ -488,8 +466,8 @@ call_real_parser_handler__do_SEH_return_ } static void call_real_parser_handler__do_SEH( - const char* filespec_to_process, - const char* request_method, bool header_only) { + const char* filespec_to_process, + const char* request_method, bool header_only) { #ifdef PA_USE___TRY Parser_executed executed= #endif @@ -532,6 +510,26 @@ static void usage(const char* program) { } int main(int argc, char *argv[]) { + GC_java_finalization=0; + +#ifndef PA_DEBUG_DISABLE_GC + // Dont collect unless explicitly requested + // this is quicker (~30% ), but less memory-efficient(~8%) + // so deciding for speed + GC_dont_gc=1; +#endif +/* + + Array test; + test+=3; + test+=4; +// int a=test.count(); + int i=0; + scanf("%d", &i); + int b=test.get(i); +// int b=test.get(10); + printf("%d", b);//test.count());*/ + #ifdef SIGUSR1 if(signal(SIGUSR1, SIGUSR1_handler)==SIG_ERR) SAPI::die("Can not set handler for SIGUSR1"); @@ -549,9 +547,8 @@ int main(int argc, char *argv[]) { #endif #ifdef _DEBUG - //_crtBreakAlloc=4042; + //_crtBreakAlloc=46; #endif - //_asm int 3; argv0=argv[0]; umask(2); @@ -618,7 +615,7 @@ int main(int argc, char *argv[]) { // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); - _CrtSetBreakAlloc(62143); //147302 +// _CrtSetBreakAlloc(61); _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); @@ -638,10 +635,31 @@ int main(int argc, char *argv[]) { // don't allocate anything on pool here: // possible pool' exception not catch-ed now // and there could be out-of-memory exception + const char* body=e.comment(); + char buf[MAX_STRING]; + snprintf(buf, MAX_STRING, "exception in request exception handler: %s", + body); + // log it + SAPI::log(SAPI_info, "%s", buf); + + // + int content_length=strlen(buf); + + // prepare header + SAPI::add_header_attribute(SAPI_info, "content-type", "text/plain"); + char content_length_cstr[MAX_NUMBER]; + snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); + SAPI::add_header_attribute(SAPI_info, "content-length", content_length_cstr); + + // send header + SAPI::send_header(SAPI_info); + + // send body + if(!header_only) + SAPI::send_body(SAPI_info, buf, content_length); - SAPI::die("exception in request exception handler: %s", e.comment()); + // unsuccessful finish } -// _asm int 3; return 0; }