--- parser3/src/targets/cgi/parser3.C 2003/02/21 10:11:14 1.216.2.12 +++ parser3/src/targets/cgi/parser3.C 2003/05/30 09:47:11 1.216.2.30.2.26 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_PARSER3_C="$Date: 2003/02/21 10:11:14 $"; +static const char* IDENT_PARSER3_C="$Date: 2003/05/30 09:47:11 $"; #include "pa_config_includes.h" @@ -20,6 +20,8 @@ static const char* IDENT_PARSER3_C="$Dat #include "pa_socks.h" #include "pa_version.h" + + #ifdef WIN32 # include # include "getopt.h" @@ -27,7 +29,6 @@ static const char* IDENT_PARSER3_C="$Dat # include #endif -//#define DEBUG_POOL_MALLOC //#define DEBUG_MAILRECEIVE "mailreceive.eml" // consts @@ -47,6 +48,8 @@ static bool mail_received=false; ///< we // for signal handlers Request *request=0; +Request_info *request_info=0; +bool execution_canceled=false; // SAPI @@ -109,15 +112,7 @@ void SAPI::log(SAPI_Info&, const char* f va_end(args); } -void SAPI::die(const char* fmt, ...) { - //_asm int 3; -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(Pool& pool); - log_pool_stats(SAPI_info); -#endif - - va_list args; - va_start(args,fmt); +static void die_or_abort(const char* fmt, va_list args, bool write_core) { // log // logging is more important than user @@ -130,8 +125,6 @@ void SAPI::die(const char* fmt, ...) { char body[MAX_STRING]; int content_length=vsnprintf(body, MAX_STRING, fmt, args); - va_end(args); - // prepare header // let's be honest, that's bad we couldn't produce valid output SAPI::add_header_attribute(SAPI_info, "status", "500"); @@ -146,28 +139,44 @@ void SAPI::die(const char* fmt, ...) { // body SAPI::send_body(SAPI_info, body, content_length); -#ifdef WIN32 - //_asm int 3; - // IIS with abort failes to show STDOUT, it just barks "abnormal program termination" - exit(1); + // exit & try to produce core dump[unix] or invoke debugger[Win32 Debug version] + if(write_core) { +#if defined(WIN32) && !defined(_DEBUG) + // IIS with abort failes to show STDOUT, it just barks "abnormal program termination" + exit(1); #else - // exit & try to produce core dump - abort(); +#if _MSC_VER + _asm int 3; +#endif + abort(); #endif + } + else + exit(1); } -CharPtr SAPI::get_env(SAPI_Info& , const char* name) { - if(char *local=getenv(name)) { - size_t size=strlen(local)+1; - char *heap=new char[size]; - memcpy(heap, local, size); - return CharPtr(heap); - } +void SAPI::die(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + die_or_abort(fmt, args, false/*write core?*/); + va_end(args); +} + +void SAPI::abort(const char* fmt, ...) { + va_list args; + va_start(args, fmt); + die_or_abort(fmt, args, true/*write core?*/); + va_end(args); +} + +char* SAPI::get_env(SAPI_Info& , const char* name) { + if(char *local=getenv(name)) + return pa_strdup(local); else - return CharPtr(0); + 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; @@ -231,11 +240,17 @@ static void full_file_spec(const char* f } static void log_signal(const char* signal_name) { - SAPI::log(SAPI_info, request? "%s received. uri=%s, qs=%s" - :"%s received. no request being processed", - signal_name, - request && request->request_info.uri?request->request_info.uri:"-", - request && request->request_info.query_string?request->request_info.query_string:"-"); + if(request_info) + SAPI::log(SAPI_info, "%s received while %s. uri=%s, method=%s, qs=%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", + signal_name); } #ifdef SIGUSR1 @@ -247,8 +262,9 @@ static void SIGUSR1_handler(int /*sig*/) #ifdef SIGPIPE static void SIGPIPE_handler(int /*sig*/){ log_signal("SIGPIPE"); + execution_canceled=true; if(request) - request->interrupt(); + request->set_interrupted(true); } #endif @@ -259,7 +275,6 @@ main workhorse IIS: remove trailing default-document[index.html] from $request.uri. to do that we need to consult metabase, wich is tested but seems slow. - IIS5 todo find out proper 'illegal call' check */ static void real_parser_handler( const char* filespec_to_process, @@ -270,26 +285,23 @@ static void real_parser_handler( // init global variables pa_globals_init(); - // request pool, 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(CharPtr env_document_root=SAPI::get_env(SAPI_info, "DOCUMENT_ROOT")) + if(const char* env_document_root=getenv("DOCUMENT_ROOT")) request_info.document_root=env_document_root; - else if(const char* path_info=SAPI::get_env(SAPI_info, "PATH_INFO")) { + else if(const char* path_info=getenv("PATH_INFO")) { // IIS size_t len=min(sizeof(document_root_buf)-1, strlen(filespec_to_process)-strlen(path_info)); memcpy(document_root_buf, filespec_to_process, len); document_root_buf[len]=0; request_info.document_root=document_root_buf; } else throw Exception("parser.runtime", - Exception::undefined_source, + 0, "CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)"); } else { full_file_spec("", document_root_buf, sizeof(document_root_buf)); @@ -297,23 +309,23 @@ static void real_parser_handler( } request_info.path_translated=filespec_to_process; request_info.method=request_method ? request_method : "GET"; - CharPtr query_string=SAPI::get_env(SAPI_info, "QUERY_STRING"); + const char* query_string=getenv("QUERY_STRING"); request_info.query_string=query_string; if(cgi) { // few absolute obligatory - const char* path_info=SAPI::get_env(SAPI_info, "PATH_INFO"); + const char* path_info=getenv("PATH_INFO"); if(!path_info) SAPI::die("CGI: illegal call (missing PATH_INFO)"); - const char* script_name=SAPI::get_env(SAPI_info, "SCRIPT_NAME"); + const char* script_name=getenv("SCRIPT_NAME"); if(!script_name) SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); - const char* env_request_uri=SAPI::get_env(SAPI_info, "REQUEST_URI"); + const char* env_request_uri=getenv("REQUEST_URI"); if(env_request_uri) request_info.uri=env_request_uri; else if(query_string) { - char *reconstructed_uri=new(request_pool) char[ + char* reconstructed_uri=new(PointerFreeGC) char[ strlen(path_info)+1/*'?'*/+ strlen(query_string)+1/*0*/]; strcpy(reconstructed_uri, path_info); @@ -362,20 +374,24 @@ static void real_parser_handler( } else request_info.uri=""; - request_info.content_type=SAPI::get_env(SAPI_info, "CONTENT_TYPE"); - const char* content_length=SAPI::get_env(SAPI_info, "CONTENT_LENGTH"); + request_info.content_type=getenv("CONTENT_TYPE"); + const char* content_length=getenv("CONTENT_LENGTH"); request_info.content_length=(content_length?atoi(content_length):0); - request_info.cookie=SAPI::get_env(SAPI_info, "HTTP_COOKIE"); + request_info.cookie=getenv("HTTP_COOKIE"); request_info.mail_received=mail_received; + // get request_info ptr for signal handlers + ::request_info=&request_info; + if(execution_canceled) + SAPI::die("Execution canceled"); // prepare to process request - Request request(request_pool, SAPI_info, + Request request(SAPI_info, request_info, /*#ifdef _DEBUG - String::UL_HTML|String::UL_OPTIMIZE_BIT + String::L_HTML|String::L_OPTIMIZE_BIT #else*/ - cgi ? String::UL_HTML|String::UL_OPTIMIZE_BIT : String::UL_AS_IS + cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS /*#endif*/ , true /* status_allowed */); @@ -419,20 +435,15 @@ static void real_parser_handler( // pa_done_socks(); - -#ifdef DEBUG_POOL_MALLOC - extern void log_pool_stats(Pool& pool); - log_pool_stats(request_pool); -#endif } -//#if _MSC_VER && !defined(_DEBUG) +#if _MSC_VER && !defined(_DEBUG) # define PA_USE___TRY struct Parser_executed { bool with_system_exception; LPEXCEPTION_POINTERS system_exception; }; -//#endif +#endif static #ifdef PA_USE___TRY @@ -441,8 +452,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 { @@ -455,7 +466,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; @@ -463,8 +473,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 @@ -475,16 +485,16 @@ static void call_real_parser_handler__do if(executed.with_system_exception) if(executed.system_exception) if(_EXCEPTION_RECORD *er=executed.system_exception->ExceptionRecord) - throw Exception(Exception::undefined_type, - Exception::undefined_source, + throw Exception(0, + 0, "Exception 0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); else - throw Exception(Exception::undefined_type, - Exception::undefined_source, + throw Exception(0, + 0, "Exception "); else - throw Exception(Exception::undefined_type, - Exception::undefined_source, + throw Exception(0, + 0, "Exception "); #endif } @@ -507,6 +517,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"); @@ -526,7 +556,6 @@ int main(int argc, char *argv[]) { #ifdef _DEBUG //_crtBreakAlloc=4042; #endif - //_asm int 3; argv0=argv[0]; umask(2); @@ -584,21 +613,19 @@ int main(int argc, char *argv[]) { setmode(fileno(stderr), _O_BINARY); #endif -#if _MSC_VER - -#ifdef _DEBUG +#if defined(_MSC_VER) && defined(_DEBUG) // Get current flag int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ); // Turn on leak-checking bit -// tmpFlag |= _CRTDBG_LEAK_CHECK_DF; + tmpFlag |= _CRTDBG_LEAK_CHECK_DF; // Set flag to the new value _CrtSetDbgFlag( tmpFlag ); -// _CrtSetBreakAlloc(471); - -#endif +// _CrtSetBreakAlloc(61); + _CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE ); + _CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR ); #endif char filespec_to_process[MAX_STRING]; @@ -615,10 +642,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; }