--- parser3/src/targets/cgi/parser3.C 2020/12/15 10:25:17 1.327 +++ parser3/src/targets/cgi/parser3.C 2020/12/16 14:51:27 1.337 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.327 2020/12/15 10:25:17 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.337 2020/12/16 14:51:27 moko Exp $"; #include "pa_config_includes.h" @@ -14,6 +14,7 @@ volatile const char * IDENT_PARSER3_C="$ #include "pa_common.h" #include "pa_request.h" #include "pa_version.h" +#include "pa_threads.h" #include "pa_vconsole.h" #include "pa_sapi_info.h" @@ -21,6 +22,13 @@ volatile const char * IDENT_PARSER3_C="$ #include #include #include + +extern "C" HANDLE WINAPI GC_CreateThread(LPSECURITY_ATTRIBUTES, DWORD, LPTHREAD_START_ROUTINE, LPVOID, DWORD, LPDWORD); + +#else + +extern "C" int GC_pthread_create(pthread_t *, const pthread_attr_t *, void *(*)(void *), void * /* arg */); + #endif // defines @@ -45,16 +53,13 @@ static bool mail_received = false; // -m static char* parser3_filespec = 0; // argv[0] static char** argv_extra = NULL; -// for signal handlers -static THREAD_LOCAL Request *request=0; - // for error logging static THREAD_LOCAL Request_info request_info; // global for correct log() reporting static const char* filespec_4log = NULL; // null only if system-wide auto.p used // SAPI -static void log(const char* fmt, va_list args) { +static void pa_log(const char* fmt, va_list args) { bool opened=false; FILE *f=0; @@ -94,7 +99,7 @@ static void log(const char* fmt, va_list time_t t=time(0); if(const char* stamp=ctime(&t)) { // never saw that if(size_t len=strlen(stamp)) // saw once stamp being ="" - fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)getpid() ); + fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)pa_get_thread_id() ); } // message @@ -114,20 +119,18 @@ static void log(const char* fmt, va_list fflush(f); } -#ifdef PA_DEBUG_CGI_ENTRY_EXIT -static void log(const char* fmt, ...) { +void pa_log(const char* fmt, ...) { va_list args; va_start(args,fmt); - log(fmt, args); + pa_log(fmt, args); va_end(args); } -#endif // appends to parser3.log located next to the config file if openable, to stderr otherwize void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); - ::log(fmt, args); + pa_log(fmt, args); va_end(args); } @@ -136,7 +139,7 @@ void SAPI::die(const char* fmt, ...) { // logging first, first vsnprintf va_start(args,fmt); - ::log(fmt, args); + pa_log(fmt, args); va_end(args); // inform user, second vsnprintf @@ -302,26 +305,23 @@ static void config_handler(SAPI_Info &in // prepare to process request Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); - { - // initing ::request ptr for signal handlers - RequestController rc(&r); - // only once - config_filespec = locate_config(config_filespec, parser3_filespec); - // process main auto.p only - r.core(config_filespec, false, String::Empty); - // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory - } + // only once + config_filespec = locate_config(config_filespec, parser3_filespec); + // process main auto.p only + r.core(config_filespec, false, String::Empty); } static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) { try { - connection.read_header(); + memset(&request_info, 0, sizeof(request_info)); + + if(!connection.read_header()) + return; // ignore "void" connections info.populate_env(); char document_root_buf[MAX_STRING]; full_disk_path("", document_root_buf, sizeof(document_root_buf)); - memset(&request_info, 0, sizeof(request_info)); request_info.document_root = document_root_buf; request_info.path_translated = filespec_to_process; request_info.method = connection.method(); @@ -335,20 +335,21 @@ static void connection_handler(SAPI_Info // prepare to process request Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); - { - // initing ::request ptr for signal handlers - RequestController rc(&r); - // process the request - r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); - // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory - } + // process the request + r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); } catch(const Exception& e) { // exception in connection handling or unhandled exception SAPI::log(info, "%s", e.comment()); - SAPI::send_error(info, e.comment(), info.exception_http_status(e.type())); + const char *status = info.exception_http_status(e.type()); + if(status) + SAPI::send_error(info, e.comment(), status); } } +#ifdef _MSC_VER +DWORD WINAPI connection_thread(void *arg){ +#else static void *connection_thread(void *arg){ +#endif HTTPD_Connection &connection=*(HTTPD_Connection*)arg; SAPI_Info_HTTPD info(connection); @@ -359,7 +360,7 @@ static void *connection_thread(void *arg } delete(&connection); - return NULL; + return 0; } static void httpd_mode() { @@ -375,15 +376,23 @@ static void httpd_mode() { #endif while(1){ +#ifndef _MSC_VER pid_t pid=1; - +#endif try { + request_info.method=NULL; // wipe previous request for correct logging HTTPD_Connection connection; if(!connection.accept(sock, 5)) continue; switch (HTTPD_Server::mode) { case HTTPD_Server::MULTITHREADED: +#ifdef _MSC_VER + if (!GC_CreateThread(0, 0, connection_thread, new HTTPD_Connection(connection), 0, 0)) + throw Exception("httpd.fork", 0, "thread creation failed"); + connection.sock = -1; + break; +#else pthread_t thread; pthread_attr_t attr; pthread_attr_init(&attr); @@ -393,7 +402,6 @@ static void httpd_mode() { throw Exception("httpd.fork", 0, "thread creation failed (%d)", result); connection.sock=-1; break; -#ifndef _MSC_VER case HTTPD_Server::PARALLEL: pid=fork(); if(pid<0) @@ -411,8 +419,10 @@ static void httpd_mode() { SAPI::log(*sapiInfo, "%s", e.comment()); } +#ifndef _MSC_VER if(pid==0) // fork child exit(0); +#endif } } @@ -552,7 +562,7 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] [file]\n"