--- parser3/src/main/pa_request.C 2001/10/22 08:27:44 1.171 +++ parser3/src/main/pa_request.C 2001/12/15 21:28:21 1.186 @@ -2,17 +2,11 @@ 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.171 2001/10/22 08:27:44 parser Exp $ + $Id: pa_request.C,v 1.186 2001/12/15 21:28:21 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" @@ -25,7 +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_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"; @@ -37,30 +32,29 @@ const char *ORIGINS_CONTENT_TYPE="text/p Methoded *MOP_create(Pool&); static void load_charset(const Hash::Key& akey, Hash::Val *avalue, - void *info) { + void *) { 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()); + if(!charsets->get(akey)) // don't we know that charset? + charsets->put(akey, + new(charsets->pool()) Charset(charsets->pool(), akey, &value.as_string())); } // Request::Request(Pool& apool, Info& ainfo, - String::Untaint_lang adefault_lang) : Pooled(apool), + uchar adefault_lang, + bool status_allowed) : Pooled(apool), stack(apool), OP(*MOP_create(apool)), env(apool), + status(apool), form(apool), math(apool), request(apool, *this), response(apool), cookie(apool), fclasses(apool), - CTYPE(apool), fdefault_lang(adefault_lang), flang(adefault_lang), info(ainfo), post_data(0), post_size(0), @@ -72,7 +66,17 @@ Request::Request(Pool& apool, classes_conf(apool), anti_endless_execute_recoursion(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(); + /// directly used // operators OP.register_directly_used(*this); @@ -83,6 +87,9 @@ Request::Request(Pool& apool, /// methodless // env class classes().put(*NEW String(pool(), ENV_CLASS_NAME), &env); + // status class + if(status_allowed) + classes().put(*NEW String(pool(), STATUS_CLASS_NAME), &status); // request class classes().put(*NEW String(pool(), REQUEST_CLASS_NAME), &request); // cookie class @@ -106,12 +113,21 @@ Request::Request(Pool& apool, the file user requested us to process all located classes become children of one another, composing class we name 'MAIN' + + @test log stack trace + */ 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 } + +#ifdef RESOURCES_DEBUG +//measures +struct timeval mt[10]; +//measure:before all +gettimeofday(&mt[0],NULL); +#endif try { char *auto_filespec=(char *)malloc(MAX_STRING); @@ -124,7 +140,8 @@ void Request::core( 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] @@ -132,15 +149,14 @@ void Request::core( ] */ if(Value *vcharsets=main_class->get_element(*charsets_name)) { - if(Hash *charsets=vcharsets->get_hash()) - charsets->for_each(load_charset, &CTYPE); + if(Hash *charsets=vcharsets->get_hash(0)) + 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); @@ -196,21 +212,6 @@ void Request::core( 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()) - if(Value *vcharset=(Value *)hash->get(*charset_name)) - pool().set_charset(vcharset->as_string()); - - if(Value *element=main_class->get_element(*user_html_name)) - if(Table *table=element->get_table()) - pool().set_tag(NEW Dictionary(*table)); - // $MAIN:MIME-TYPES if(Value *element=main_class->get_element(*mime_types_name)) if(Table *table=element->get_table()) @@ -222,6 +223,10 @@ void Request::core( // 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); @@ -230,9 +235,13 @@ void Request::core( 0, "'"MAIN_METHOD_NAME"' method not found"); +#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 if(Value *value=main_class->get_element(*post_process_method_name)) if(Junction *junction=value->get_junction()) @@ -262,8 +271,32 @@ void Request::core( 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 + // OK. write out the result output_result(*body_file, header_only); + +#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(), "rmeasure: %s,%.2f,%.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, +t[9]-t[3] +); +#endif } catch(const Exception& e) { // request handling problem // we're returning not result, but error explanation try { @@ -272,32 +305,28 @@ void Request::core( if(problem_source && problem_source->size()) SAPI::log(pool(), #ifndef NO_STRING_ORIGIN - "%s(%d): " + ORIGIN_FILE_LINE_FORMAT": " #endif "'%s' %s [%s %s]", #ifndef NO_STRING_ORIGIN 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):"-" - ); - - /// @test log stack trace + e.type()?e.type()->cstr():"-", + e.code()?e.code()->cstr():"-" + ); // reset language to default flang=fdefault_lang; - if(flang==String::UL_USER_HTML) - flang=String::UL_HTML; // no _ & Co conversions in @exception[params] // reset response response.fields().clear(); @@ -324,7 +353,7 @@ 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, ORIGIN_FILE_LINE_FORMAT, origin.file, 1+origin.line); origin_value=NEW VString(*NEW String(pool(), buf, buf_size, true)); @@ -386,7 +415,7 @@ void Request::core( const Origin& origin=name->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, ORIGIN_FILE_LINE_FORMAT, origin.file, 1+origin.line); row+=NEW String(pool(), buf, buf_size, true); // origin column } @@ -413,22 +442,24 @@ void Request::core( #ifndef NO_STRING_ORIGIN const Origin& origin=problem_source->origin(); if(origin.file) - printed+=snprintf(buf+printed, MAX_STRING-printed, "%s(%d): ", - origin.file, 1+origin.line); + printed+=snprintf(buf+printed, MAX_STRING-printed, + ORIGIN_FILE_LINE_FORMAT": ", + 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 @@ -532,15 +563,16 @@ 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 + || aattribute==CHARSET_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) { @@ -563,21 +595,25 @@ 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(); - 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); } @@ -586,7 +622,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) { @@ -603,12 +639,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; -}