--- parser3/src/main/pa_request.C 2001/10/03 12:20:58 1.166 +++ parser3/src/main/pa_request.C 2001/11/01 15:45:28 1.174 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: pa_request.C,v 1.166 2001/10/03 12:20:58 parser Exp $ + $Id: pa_request.C,v 1.174 2001/11/01 15:45:28 paf Exp $ */ #include "pa_config_includes.h" @@ -70,7 +70,8 @@ Request::Request(Pool& apool, main_class(0), connection(0), classes_conf(apool), - anti_endless_execute_recoursion(0) + anti_endless_execute_recoursion(0), + trace(apool) { /// directly used // operators @@ -111,8 +112,7 @@ void Request::core( 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 @@ -132,10 +132,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"); } @@ -201,13 +201,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()) @@ -228,7 +226,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"); @@ -266,10 +264,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()) @@ -282,19 +279,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) @@ -312,8 +311,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); @@ -325,11 +324,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 @@ -373,8 +371,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); } } @@ -394,18 +417,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 @@ -420,21 +443,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, @@ -465,16 +477,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"); } @@ -528,7 +540,7 @@ static void add_header_attribute(const H 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) { @@ -551,7 +563,7 @@ 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); } @@ -585,7 +597,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"); }