--- parser3/src/main/pa_request.C 2001/12/04 17:36:26 1.182.2.1 +++ parser3/src/main/pa_request.C 2002/03/18 15:29:46 1.195 @@ -1,16 +1,12 @@ /** @file Parser: request class main part. @see compile.C and execute.C. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_request.C,v 1.182.2.1 2001/12/04 17:36:26 paf Exp $ + $Id: pa_request.C,v 1.195 2002/03/18 15:29:46 paf Exp $ */ -#include "pa_config_includes.h" - -extern "C" unsigned char pcre_default_tables[]; // pcre/chartables.c - #include "pa_sapi.h" #include "pa_common.h" #include "pa_request.h" @@ -23,8 +19,8 @@ extern "C" unsigned char pcre_default_ta #include "pa_vtable.h" #include "pa_vfile.h" #include "pa_dictionary.h" -#include "pa_charset_manager.h" -#include "pa_charset_connection.h" +#include "pa_charsets.h" +#include "pa_charset.h" /// content type of exception response, when no @MAIN:exception handler defined const char *UNHANDLED_EXCEPTION_CONTENT_TYPE="text/plain"; @@ -34,17 +30,12 @@ const char *DEFAULT_CONTENT_TYPE="text/h const char *ORIGINS_CONTENT_TYPE="text/plain"; Methoded *MOP_create(Pool&); +// op.C +VHash& exception2vhash(Pool& pool, const Exception& e); static void load_charset(const Hash::Key& akey, Hash::Val *avalue, - void *info) { - Value& value=*static_cast(avalue); - Hash& CTYPE=*static_cast(info); - - Charset_connection& connection= - charset_manager->get_connection(akey, value.as_string()); - - // charset->pcre_tables - CTYPE.put(akey, connection.pcre_tables()); + void *) { + charsets->load_charset(akey, static_cast(avalue)->as_string()); } // @@ -62,7 +53,6 @@ Request::Request(Pool& apool, response(apool), cookie(apool), fclasses(apool), - CTYPE(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), post_data(0), post_size(0), @@ -70,12 +60,18 @@ Request::Request(Pool& apool, default_content_type(0), mime_types(0), main_class(0), - connection(0), + fconnection(0), classes_conf(apool), anti_endless_execute_recoursion(0), - trace(apool), - sql_connect_time(0),sql_request_time(0) + trace(apool) +#ifdef RESOURCES_DEBUG + ,sql_connect_time(0),sql_request_time(0) +#endif { + // default charsets + pool().set_source_charset(*utf8_charset); + pool().set_client_charset(*utf8_charset); + // maybe expire old caches cache_managers->maybe_expire(); @@ -108,6 +104,17 @@ Request::Request(Pool& apool, classes().put(math.get_class()->base()->name(), &math); } +Request::~Request() { +#ifdef XML + // if for some strange reason xml generic errors failed to be reported, free them up + if(const char *xml_generic_errors=xmlGenericErrors()) { + SAPI::log(pool(), "warning: unreported xmlGenericErrors: %s", xml_generic_errors); + free((void *)xml_generic_errors); + } +#endif +} + + /** load MAIN class, execute @main. MAIN class consists of all the auto.p files we'd manage to find @@ -124,11 +131,12 @@ void Request::core( const char *site_config_filespec, bool site_config_fail_on_read_problem, bool header_only) { +#ifdef RESOURCES_DEBUG //measures struct timeval mt[10]; - //measure:before all gettimeofday(&mt[0],NULL); +#endif try { char *auto_filespec=(char *)malloc(MAX_STRING); @@ -141,7 +149,8 @@ gettimeofday(&mt[0],NULL); true/*ignore class_path*/, root_config_fail_on_read_problem, main_class_name, main_class); } - + // charsets must only be specified in root config + // so that users would not interfere if(main_class) { /* $MAIN:CHARSETS[ $.charsetname1[/full/path/to/charset/file.cfg] @@ -150,14 +159,13 @@ gettimeofday(&mt[0],NULL); */ if(Value *vcharsets=main_class->get_element(*charsets_name)) { if(Hash *charsets=vcharsets->get_hash(0)) - charsets->for_each(load_charset, &CTYPE); + charsets->for_each(load_charset); else throw Exception(0, 0, &vcharsets->name(), "must be hash"); } } - // configure root options // until someone with less privileges have overriden them OP.configure_admin(*this); @@ -213,17 +221,6 @@ gettimeofday(&mt[0],NULL); OP.configure_user(*this); methoded_array->configure_user(*this); - // $MAIN:DEFAULTS - Value *defaults=main_class->get_element(*defaults_name); - // 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; - // record default charset - if(default_content_type) - if(Hash *hash=default_content_type->get_hash(0)) - if(Value *vcharset=(Value *)hash->get(*charset_name)) - pool().set_charset(vcharset->as_string()); - // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) if(Table *table=element->get_table()) @@ -235,18 +232,22 @@ gettimeofday(&mt[0],NULL); // filling cookies cookie.fill_fields(*this); +#ifdef RESOURCES_DEBUG //measure:after compile gettimeofday(&mt[1],NULL); - +#endif // execute @main[] - const String *body_string=execute_virtual_method( - *main_class, *main_method_name); + const String *body_string=execute_virtual_method(*main_class, *main_method_name); if(!body_string) throw Exception(0,0, 0, "'"MAIN_METHOD_NAME"' method not found"); -//measure:after main + +#ifdef RESOURCES_DEBUG + //measure:after main gettimeofday(&mt[2],NULL); +#endif + VString body_vstring_before_post_process(*body_string); VString *body_vstring_after_post_process=&body_vstring_before_post_process; // @postprocess @@ -261,7 +262,7 @@ gettimeofday(&mt[2],NULL); frame.store_param(method->name, &body_vstring_before_post_process); body_vstring_after_post_process= - NEW VString(*execute_method(frame, *method)); + NEW VString(execute_method(frame, *method)); } bool origins_mode=main_class->get_element(*origins_mode_name)!=0; @@ -278,29 +279,24 @@ gettimeofday(&mt[2],NULL); response.fields().put(*content_type_name, NEW VString(*NEW String(pool(), ORIGINS_CONTENT_TYPE))); +#ifdef RESOURCES_DEBUG //measure:after postprocess gettimeofday(&mt[3],NULL); +#endif -double t[10]; -for(int i=0;i<9;i++) - t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0; - -//measure:log1 compile,main,postprocess connect,request -SAPI::log(pool(), "measure1: %s,%.2f,%.2f,%.2f %.2f,%.2f", -info.uri, -t[1]-t[0], -t[2]-t[1], -t[3]-t[2], -sql_connect_time,sql_request_time -); // OK. write out the result output_result(*body_file, header_only); -//measure:after output_result + +#ifdef RESOURCES_DEBUG + //measure:after output_result gettimeofday(&mt[9],NULL); t[9]=mt[9].tv_sec+mt[9].tv_usec/1000000.0; +double t[10]; +for(int i=0;i<10;i++) + t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0; //measure:log2 compile,main,postprocess,output -SAPI::log(pool(), "measure1: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f", +SAPI::log(pool(), "rmeasure: %s,%.2f,%.2f,%.2f %.2f,%.2f %.2f", info.uri, t[1]-t[0], t[2]-t[1], @@ -308,6 +304,7 @@ t[3]-t[2], sql_connect_time,sql_request_time, t[9]-t[3] ); +#endif } catch(const Exception& e) { // request handling problem // we're returning not result, but error explanation try { @@ -348,7 +345,7 @@ t[9]-t[3] if(main_class) { // we've managed to end up with some main_class // maybe we'd be lucky enough as to report an error // in a gracefull way... - if(Value *value=main_class->get_element(*exception_method_name)) + if(Value *value=main_class->get_element(*unhandled_exception_method_name)) if(Junction *junction=value->get_junction()) if(const Method *method=junction->method) { // preparing to pass parameters to @@ -356,65 +353,12 @@ t[9]-t[3] VMethodFrame frame(pool(), value->name(), *junction); frame.set_self(*main_class); - const String *problem_source=e.problem_source(); - // origin - Value *origin_value=0; -#ifndef NO_STRING_ORIGIN - if(problem_source && problem_source->size()) { - const Origin& origin=problem_source->origin(); - if(origin.file) { - char *buf=(char *)malloc(MAX_STRING); - size_t buf_size=snprintf(buf, MAX_STRING, ORIGIN_FILE_LINE_FORMAT, - origin.file, 1+origin.line); - origin_value=NEW VString(*NEW String(pool(), - buf, buf_size, true)); - } - } -#endif - frame.store_param(method->name, - origin_value?origin_value:NEW VVoid(pool())); - - // source - Value *source_value=0; - if(problem_source && problem_source->size()) { - String& problem_source_copy=*NEW String(pool()); - problem_source_copy.append(*problem_source, - flang, true); - source_value=NEW VString(problem_source_copy); - } - frame.store_param(method->name, - source_value?source_value:NEW VVoid(pool())); - - // comment - String *comment_value=NEW String(pool(), - e.comment(), 0, true); - frame.store_param(method->name, - NEW VString(*comment_value)); - - // type - Value *type_value; - if(e.type()) { - String& type_copy=*NEW String(pool()); - type_value=NEW VString(type_copy.append(*e.type(), - flang, true)); - } else - type_value=NEW VVoid(pool()); - frame.store_param(method->name, type_value); - - // code - Value *code_value; - if(e.code()) { - String& code_copy=*NEW String(pool()); - code_value=NEW VString(code_copy.append(*e.code(), - flang, true)); - } else - code_value=NEW VVoid(pool()); - frame.store_param(method->name, code_value); - + frame.store_param(method->name, &exception2vhash(pool(), e)); // $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"); + stack_trace_columns+=NEW String(pool(), "file"); + stack_trace_columns+=NEW String(pool(), "lineno"); Table& stack_trace=*NEW Table(pool(), 0, &stack_trace_columns); Array_iter tracei(trace); while(tracei.has_next()) { @@ -425,10 +369,10 @@ t[9]-t[3] #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, ORIGIN_FILE_LINE_FORMAT, - origin.file, 1+origin.line); - row+=NEW String(pool(), buf, buf_size, true); // origin column + row+=NEW String(pool(), origin.file, 0, true); // file column + char *buf=(char *)malloc(MAX_NUMBER); + size_t buf_size=snprintf(buf, MAX_NUMBER, "%d", 1+origin.line); + row+=NEW String(pool(), buf, buf_size, true); // line column } #endif stack_trace+=&row; @@ -438,7 +382,7 @@ t[9]-t[3] // future $response:body= // execute ^exception[origin;source;comment;type;code;stack] - body_string=execute_method(frame, *method); + body_string=&execute_method(frame, *method); } } @@ -510,12 +454,12 @@ VStateless_class *Request::use_file(cons if(main_class) if(Value *element=main_class->get_element(*class_path_name)) { if(element->is_string()) { - file_spec=file_readable(element->as_string(), file_name); // found at class_path? + file_spec=file_readable(absolute(element->as_string()), file_name); // found at class_path? } else if(Table *table=element->get_table()) { int size=table->size(); for(int i=size; i--; ) { const String& path=*static_cast(table->get(i))->get_string(0); - if(file_spec=file_readable(path, file_name)) + if(file_spec=file_readable(absolute(path), file_name)) break; // found along class_path } } else @@ -575,7 +519,8 @@ const String& Request::absolute(const St static void add_header_attribute(const Hash::Key& aattribute, Hash::Val *ameaning, void *info) { Request& r=*static_cast(info); - if(aattribute==*body_name) + if(aattribute==BODY_NAME + || aattribute==CHARSET_NAME) return; Value& lmeaning=*static_cast(ameaning); @@ -612,14 +557,18 @@ void Request::output_result(const VFile& // prepare header: $response:fields without :body response.fields().for_each(add_header_attribute, this); - // prepare... - const void *body=body_file.value_ptr(); - size_t content_length=body_file.value_size(); + // transcode + const void *client_body; + size_t client_content_length; + Charset::transcode(pool(), + pool().get_source_charset(), body_file.value_ptr(), body_file.value_size(), + pool().get_client_charset(), client_body, client_content_length + ); // prepare header: content-length - if(content_length) { // useful for redirecting [header "location: http://..."] + if(client_content_length) { // useful for redirecting [header "location: http://..."] char content_length_cstr[MAX_NUMBER]; - snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length); + snprintf(content_length_cstr, MAX_NUMBER, "%u", client_content_length); SAPI::add_header_attribute(pool(), "content-length", content_length_cstr); } @@ -628,7 +577,7 @@ void Request::output_result(const VFile& // send body if(!header_only) - SAPI::send_body(pool(), body, content_length); + SAPI::send_body(pool(), client_body, client_content_length); } const String& Request::mime_type_of(const char *user_file_name_cstr) { @@ -645,12 +594,3 @@ const String& Request::mime_type_of(cons } return *NEW String(pool(), "application/octet-stream"); } - -const unsigned char *Request::pcre_tables() { - 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; -}