--- parser3/src/main/pa_request.C 2001/10/02 11:07:45 1.165 +++ parser3/src/main/pa_request.C 2001/11/08 11:04:13 1.178 @@ -2,12 +2,17 @@ Parser: request class main part. @see compile.C and execute.C. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: pa_request.C,v 1.165 2001/10/02 11:07:45 parser Exp $ + $Id: pa_request.C,v 1.178 2001/11/08 11:04:13 paf Exp $ */ #include "pa_config_includes.h" + +//#include "pcre.h" +//#include "internal.h" +extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c + #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -21,6 +26,7 @@ #include "pa_vfile.h" #include "pa_dictionary.h" #include "pa_charset_manager.h" +#include "pa_charset_connection.h" /// content type of exception response, when no @MAIN:exception handler defined const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; @@ -36,7 +42,8 @@ static void load_charset(const Hash::Key Value& value=*static_cast(avalue); Hash& CTYPE=*static_cast(info); - Charset_connection& connection=charset_manager->get_connection(akey, value.as_string()); + Charset_connection& connection= + charset_manager->get_connection(akey, value.as_string()); // charset->pcre_tables CTYPE.put(akey, connection.pcre_tables()); @@ -49,6 +56,7 @@ Request::Request(Pool& apool, stack(apool), OP(*MOP_create(apool)), env(apool), + status(apool), form(apool), math(apool), request(apool, *this), @@ -65,8 +73,12 @@ Request::Request(Pool& apool, main_class(0), connection(0), classes_conf(apool), - anti_endless_execute_recoursion(0) + anti_endless_execute_recoursion(0), + trace(apool) { + // maybe expire old caches + cache_managers->maybe_expire(); + /// directly used // operators OP.register_directly_used(*this); @@ -77,6 +89,8 @@ Request::Request(Pool& apool, /// methodless // env class classes().put(*NEW String(pool(), ENV_CLASS_NAME), &env); + // status class + classes().put(*NEW String(pool(), STATUS_CLASS_NAME), &status); // request class classes().put(*NEW String(pool(), REQUEST_CLASS_NAME), &request); // cookie class @@ -105,9 +119,7 @@ void Request::core( const char *root_config_filespec, bool root_config_fail_on_read_problem, const char *site_config_filespec, bool site_config_fail_on_read_problem, bool header_only) { - //_asm { int 3 } - bool need_rethrow=false; Exception rethrow_me; - TRY { + try { char *auto_filespec=(char *)malloc(MAX_STRING); // loading root config @@ -127,10 +139,10 @@ void Request::core( ] */ if(Value *vcharsets=main_class->get_element(*charsets_name)) { - if(Hash *charsets=vcharsets->get_hash()) + if(Hash *charsets=vcharsets->get_hash(0)) charsets->for_each(load_charset, &CTYPE); else - THROW(0, 0, + throw Exception(0, 0, &vcharsets->name(), "must be hash"); } @@ -196,13 +208,11 @@ void Request::core( // value must be allocated on request's pool for that pool used on // meaning constructing @see attributed_meaning_to_string default_content_type=defaults?defaults->get_element(*content_type_name):0; -#ifdef XML // record default charset if(default_content_type) - if(Hash *hash=default_content_type->get_hash()) + if(Hash *hash=default_content_type->get_hash(0)) if(Value *vcharset=(Value *)hash->get(*charset_name)) pool().set_charset(vcharset->as_string()); -#endif if(Value *element=main_class->get_element(*user_html_name)) if(Table *table=element->get_table()) @@ -223,7 +233,7 @@ void Request::core( const String *body_string=execute_virtual_method( *main_class, *main_method_name); if(!body_string) - THROW(0,0, + throw Exception(0,0, 0, "'"MAIN_METHOD_NAME"' method not found"); @@ -261,10 +271,9 @@ void Request::core( // OK. write out the result output_result(*body_file, header_only); - } - CATCH(e) { // request handling problem + } catch(const Exception& e) { // request handling problem // we're returning not result, but error explanation - TRY { + try { // log the beast const String *problem_source=e.problem_source(); if(problem_source && problem_source->size()) @@ -277,19 +286,21 @@ void Request::core( problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif - problem_source->cstr(String::UL_AS_IS), + problem_source->cstr(), e.comment(), - e.type()?e.type()->cstr(String::UL_AS_IS):"-", - e.code()?e.code()->cstr(String::UL_AS_IS):"-" + e.type()?e.type()->cstr():"-", + e.code()?e.code()->cstr():"-" ); else SAPI::log(pool(), "%s [%s %s]", e.comment(), - e.type()?e.type()->cstr(String::UL_AS_IS):"-", - e.code()?e.code()->cstr(String::UL_AS_IS):"-" + e.type()?e.type()->cstr():"-", + e.code()?e.code()->cstr():"-" ); + /// @test log stack trace + // reset language to default flang=fdefault_lang; if(flang==String::UL_USER_HTML) @@ -307,8 +318,8 @@ void Request::core( if(Value *value=main_class->get_element(*exception_method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { - // preparing to pass parameters to - // @exception[origin;source;comment;type;code] + // preparing to pass parameters to + // @exception[origin;source;comment;type;code;stack] VMethodFrame frame(pool(), value->name(), *junction); frame.set_self(*main_class); @@ -320,11 +331,10 @@ void Request::core( const Origin& origin=problem_source->origin(); if(origin.file) { char *buf=(char *)malloc(MAX_STRING); - size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d):", + size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d)", origin.file, 1+origin.line); - String *origin_file_line=NEW String(pool(), - buf, buf_size, true); - origin_value=NEW VString(*origin_file_line); + origin_value=NEW VString(*NEW String(pool(), + buf, buf_size, true)); } } #endif @@ -368,8 +378,33 @@ void Request::core( code_value=NEW VVoid(pool()); frame.store_param(method->name, code_value); + // $stack[^table::set{name origin}] + Array& stack_trace_columns=*NEW Array(pool()); + stack_trace_columns+=NEW String(pool(), "name"); + stack_trace_columns+=NEW String(pool(), "origin"); + Table& stack_trace=*NEW Table(pool(), 0, &stack_trace_columns); + Array_iter tracei(trace); + while(tracei.has_next()) { + Array& row=*NEW Array(pool()); + + const String *name=(const String *)tracei.next(); + row+=name; // name column +#ifndef NO_STRING_ORIGIN + const Origin& origin=name->origin(); + if(origin.file) { + char *buf=(char *)malloc(MAX_STRING); + size_t buf_size=snprintf(buf, MAX_STRING, "%s(%d)", + origin.file, 1+origin.line); + row+=NEW String(pool(), buf, buf_size, true); // origin column + } +#endif + stack_trace+=&row; + } + frame.store_param(method->name, + NEW VTable(pool(), &stack_trace)); + // future $response:body= - // execute ^exception[origin;source;comment;type;code] + // execute ^exception[origin;source;comment;type;code;stack] body_string=execute_method(frame, *method); } } @@ -389,18 +424,18 @@ void Request::core( origin.file, 1+origin.line); #endif printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr(String::UL_AS_IS)); + problem_source->cstr()); } printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", e.comment()); const String *type=e.type(); if(type) { printed+=snprintf(buf+printed, MAX_STRING-printed, " type: %s", - type->cstr(String::UL_AS_IS)); + type->cstr()); const String *code=e.code(); if(code) printed+=snprintf(buf+printed, MAX_STRING-printed, ", code: %s", - code->cstr(String::UL_AS_IS)); + code->cstr()); } // future $response:content-type @@ -415,21 +450,10 @@ void Request::core( // ERROR. write it out output_result(*body_file, header_only); + } catch(const Exception& ) { + /*re*/throw; } - CATCH(e) { - // exception in request exception handler - // remember to rethrow it - rethrow_me=e; need_rethrow=true; - } - END_CATCH } - END_CATCH // do not use pool() after this point - no exception handler set - // any throw() would try to use zero exception() pointer - - if(need_rethrow) // were there an exception for us to rethrow? - THROW(rethrow_me.type(), rethrow_me.code(), - rethrow_me.problem_source(), - rethrow_me.comment()); } VStateless_class *Request::use_file(const String& file_name, @@ -460,16 +484,16 @@ VStateless_class *Request::use_file(cons break; // found along class_path } } else - THROW(0, 0, + throw Exception(0, 0, &element->name(), "must be string or table"); if(!file_spec) - THROW(0, 0, + throw Exception(0, 0, &file_name, "not found along " MAIN_CLASS_NAME ":" CLASS_PATH_NAME); } if(!file_spec) - THROW(0, 0, + throw Exception(0, 0, &file_name, "usage failed - no " MAIN_CLASS_NAME ":" CLASS_PATH_NAME " were specified"); } @@ -515,15 +539,15 @@ const String& Request::absolute(const St static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, void *info) { - String *attribute_to_exclude=static_cast(info); - if(aattribute==*attribute_to_exclude) + Request& r=*static_cast(info); + if(aattribute==*body_name) return; Value& lmeaning=*static_cast(ameaning); Pool& pool=lmeaning.pool(); SAPI::add_header_attribute(pool, - aattribute.cstr(String::UL_AS_IS), + aattribute.cstr(), attributed_meaning_to_string(lmeaning, String::UL_HTTP_HEADER).cstr()); } void Request::output_result(const VFile& body_file, bool header_only) { @@ -546,12 +570,12 @@ void Request::output_result(const VFile& if(VString *vfile_name=static_cast(body_file.fields().get(*name_name))) if(vfile_name->string()!=NONAME_DAT) { VHash& vhash=*NEW VHash(pool()); - vhash.hash().put(*content_disposition_filename_name, vfile_name); + vhash.hash(0).put(*content_disposition_filename_name, vfile_name); response.fields().put(*content_disposition_name, &vhash); } // prepare header: $response:fields without :body - response.fields().for_each(add_header_attribute, /*excluding*/ body_name); + response.fields().for_each(add_header_attribute, this); // prepare... const void *body=body_file.value_ptr(); @@ -580,7 +604,7 @@ const String& Request::mime_type_of(cons if(const String *result=mime_types->item(1)) return *result; else - THROW(0, 0, + throw Exception(0, 0, mime_types->origin_string(), "MIME-TYPE table column elements must not be empty"); } @@ -588,5 +612,10 @@ const String& Request::mime_type_of(cons } const unsigned char *Request::pcre_tables() { - return (const unsigned char *)CTYPE.get(pool().get_charset()); + if(unsigned char *result=(unsigned char *)CTYPE.get(pool().get_charset())) + return result; + + // this is not for pcre itself, + // it can do default, it's for string.lower&co + return pcre_default_tables; }