--- parser3/src/main/pa_request.C 2003/02/03 11:55:33 1.245.2.12 +++ parser3/src/main/pa_request.C 2003/02/20 16:09:01 1.245.2.26 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_REQUEST_C="$Date: 2003/02/03 11:55:33 $"; +static const char* IDENT_REQUEST_C="$Date: 2003/02/20 16:09:01 $"; #include "pa_sapi.h" #include "pa_common.h" @@ -37,25 +37,25 @@ const char* ORIGINS_CONTENT_TYPE="text/p // defines for globals #define MAIN_METHOD_NAME "main" +#define AUTO_METHOD_NAME "auto" +#define BODY_NAME "body" // globals StringPtr main_method_name(new String(MAIN_METHOD_NAME)); +StringPtr auto_method_name(new String(AUTO_METHOD_NAME)); StringPtr content_disposition_name(new String(CONTENT_DISPOSITION_NAME)); StringPtr content_disposition_value(new String(CONTENT_DISPOSITION_VALUE)); StringPtr content_disposition_filename_name(new String(CONTENT_DISPOSITION_FILENAME_NAME)); +StringPtr body_name(new String(BODY_NAME)); // defines for statics #define CHARSETS_NAME "CHARSETS" -#define MAIN_CLASS_NAME "MAIN" #define MIME_TYPES_NAME "MIME-TYPES" #define ORIGINS_MODE_NAME "ORIGINS" -#define AUTO_FILE_NAME "auto.p" #define CONF_METHOD_NAME "conf" -#define AUTO_METHOD_NAME "auto" #define POST_PROCESS_METHOD_NAME "postprocess" -#define BODY_NAME "body" #define DOWNLOAD_NAME "download" #define CLASS_PATH_NAME "CLASS_PATH" @@ -66,9 +66,7 @@ static StringPtr main_class_name(new Str static StringPtr mime_types_name(new String(MIME_TYPES_NAME)); static StringPtr origins_mode_name(new String(ORIGINS_MODE_NAME)); static StringPtr conf_method_name(new String(CONF_METHOD_NAME)); -static StringPtr auto_method_name(new String(AUTO_METHOD_NAME)); static StringPtr post_process_method_name(new String(POST_PROCESS_METHOD_NAME)); -static StringPtr body_name(new String(BODY_NAME)); static StringPtr download_name(new String(DOWNLOAD_NAME)); static StringPtr class_path_name(new String(CLASS_PATH_NAME)); @@ -77,27 +75,47 @@ static StringPtr class_path_name(new Str // op.C VStateless_classPtr VClassMAIN_create(); // op.C -VHashPtr exception2vhash(const Exception& e); - -void lock_system_class(HashStringValue::key_type key, HashStringValue::value_type value, int) { - if(VStateless_class *value_class=value->get_class()) - value_class->lock(); -} +VHashPtr exception2vhash(Pool& pool, const Exception& e); // -Request::Request(SAPI_Info& asapi_info, Request_info& arequest_info, +Request::Request(Pool& apool, SAPI_Info& asapi_info, Request_info& arequest_info, uchar adefault_lang, bool status_allowed): + // private + fpool(apool), + anti_endless_execute_recoursion(0), + + // public + method_frame(0), + rcontext(0), + wcontext(0), + flang(adefault_lang), + fconnection(0), + finterrupted(false), + + // public +#ifdef RESOURCES_DEBUG + sql_connect_time(0), + sql_request_time(0), +#endif + + // public sapi_info(asapi_info), request_info(arequest_info), - fdefault_lang(adefault_lang), flang(adefault_lang), - - main_class(VClassMAIN_create()), charsets(pool(), *UTF8_charset, *UTF8_charset, *UTF8_charset), // default charsets - response(new VResponse(fpool, arequest_info, charsets)), + main_class(VClassMAIN_create()), form(new VForm), mail(new VMail), - cookie(new VCookie) + response(new VResponse(fpool, arequest_info, charsets)), + cookie(new VCookie), + + // private + configure_admin_done(false), + + // private defaults + fdefault_lang(adefault_lang), + // private mime types + mime_types(0) { // maybe expire old caches cache_managers.maybe_expire(); @@ -107,7 +125,7 @@ Request::Request(SAPI_Info& asapi_info, classes().put(main_class->name(), main_class); // classes: // table, file, random, mail, image, ... - methoded_array.register_directly_used(*this); + methoded_array().register_directly_used(*this); /// methodless // env class @@ -137,10 +155,6 @@ Request::Request(SAPI_Info& asapi_info, ValuePtr math(new VMail); classes().put(math->get_class()->base_class()->name(), math); } - - // prevent system classes from modification [calling add_method] - // ^process[$string:CLASS]{@method} prohibited from now on... - classes().for_each(lock_system_class, 0); } Request::~Request() { @@ -185,7 +199,7 @@ void Request::configure_admin(VStateless // configure method_frame options // until someone with less privileges have overriden them - methoded_array.configure_admin(*this); + methoded_array().configure_admin(*this); } /** @@ -210,8 +224,6 @@ struct timeval mt[10]; gettimeofday(&mt[0],NULL); #endif try { - char *auto_filespec=(char *)malloc(MAX_STRING); - // loading config if(config_filespec) { StringPtr filespec(new String); @@ -262,7 +274,7 @@ gettimeofday(&mt[0],NULL); configure_admin(*main_class, StringPtr(0)); // configure not-method_frame=user options - methoded_array.configure_user(*this); + methoded_array().configure_user(*this); // $MAIN:MIME-TYPES if(ValuePtr element=main_class->get_element(mime_types_name, *main_class, false)) @@ -302,7 +314,7 @@ gettimeofday(&mt[2],NULL); if(const Method *method=junction->method) { // preparing to pass parameters to // @postprocess[data] - VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/); + VMethodFrame frame(pool(), method->name, *junction, 0/*no parent*/); frame.ref(); frame.set_self(main_class); frame.store_param(body_vstring_before_post_process); @@ -312,7 +324,7 @@ gettimeofday(&mt[2],NULL); bool lorigins_mode=origins_mode(); - VFilePtr body_file=body_vstring_after_post_process->as_vfile( + VFilePtr body_file=body_vstring_after_post_process->as_vfile(pool(), String::UL_UNSPECIFIED, lorigins_mode); // extract response body @@ -369,7 +381,7 @@ t[9]-t[3] problem_source->origin().file?problem_source->origin().file:"global", problem_source->origin().line, #endif - problem_source->cstr(), + problem_source->cstr().get(), e.comment(), e.type() ); @@ -400,20 +412,20 @@ t[9]-t[3] if(const Method *method=junction->method) { // preparing to pass parameters to // @unhandled_exception[exception;stack] - VMethodFrame frame(pool(), method->name, *junction, 0/*no caller*/); + VMethodFrame frame(pool(), method->name, *junction, 0/*no caller*/); frame.ref(); frame.set_self(main_class); // $exception - frame.store_param(exception2vhash(e)); + frame.store_param(exception2vhash(pool(), e)); // $stack[^table::set{name origin}] - Table::columns_type stack_trace_columns; + Table::columns_type stack_trace_columns(new ArrayString); *stack_trace_columns+=StringPtr(new String("name")); *stack_trace_columns+=StringPtr(new String("file")); *stack_trace_columns+=StringPtr(new String("lineno")); TablePtr stack_trace(new Table(Exception::undefined_source, stack_trace_columns)); Array_iterator tracei(exception_trace); while(tracei.has_next()) { - Table::element_type row; + Table::element_type row(new ArrayString); StringPtr name=tracei.next(); *row+=name; // name column @@ -421,9 +433,9 @@ t[9]-t[3] const String_fragment::Origin& origin=name->origin(); if(origin.file) { *row+=StringPtr(new String(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+=StringPtr(new String(buf, buf_size, true)); // line column + *row+=StringPtr(new String( + pool().format_integer(1+origin.line), + 0, true)); // line column } #endif *stack_trace+=row; @@ -441,7 +453,7 @@ t[9]-t[3] // doing that ugly // make up result: $origin $source $comment $type $code - char *buf=(char *)malloc(MAX_STRING); + char *buf=new(pool()) char[MAX_STRING]; size_t printed=0; if(StringPtr problem_source=e.problem_source()) { #ifndef NO_STRING_ORIGIN @@ -453,7 +465,7 @@ t[9]-t[3] ); #endif printed+=snprintf(buf+printed, MAX_STRING-printed, "'%s' ", - problem_source->cstr()); + problem_source->cstr().get()); } if(const char* comment=e.comment(true)) printed+=snprintf(buf+printed, MAX_STRING-printed, "%s", comment); @@ -468,7 +480,7 @@ t[9]-t[3] } VString body_vstring(body_string); - VFilePtr body_file=body_vstring.as_vfile(); + VFilePtr body_file=body_vstring.as_vfile(pool()); // ERROR. write it out output_result(body_file, header_only, false); @@ -483,7 +495,7 @@ VStateless_classPtr Request::use_file(VS bool fail_on_read_problem, bool fail_on_file_absence) { // cyclic dependence check if(used_files.get(file_name)) - return 0; + return VStateless_classPtr(0); used_files.put(file_name, true); StringPtr file_spec; @@ -495,12 +507,12 @@ VStateless_classPtr Request::use_file(VS file_spec=StringPtr(0); if(ValuePtr element=main_class->get_element(class_path_name, *main_class, false)) { if(element->is_string()) { - file_spec=file_readable(absolute(element->as_string(&pool())), file_name); // found at class_path? + file_spec=file_readable(*absolute(element->as_string(&pool())), *file_name); // found at class_path? } else if(Table *table=element->get_table()) { int size=table->count(); for(int i=size; i--; ) { StringPtr path=(*table->get(i))[0]; - if(file_spec=file_readable(absolute(path), file_name)) + if(file_spec=file_readable(*absolute(path), *file_name)) break; // found along class_path } } else @@ -520,12 +532,12 @@ VStateless_classPtr Request::use_file(VS if(fail_on_read_problem && !fail_on_file_absence) // ignore file absence if asked for if(!entry_exists(file_spec)) - return 0; + return VStateless_classPtr(0); if(const char *source=file_read_text(pool(), charsets.source(), file_spec, fail_on_read_problem)) return use_buf(aclass, source, file_spec, file_spec->cstr(pool())); else - return 0; + return VStateless_classPtr(0); } @@ -542,18 +554,17 @@ VStateless_classPtr Request::use_buf(VSt // locate and execute possible @conf[] static VStringPtr vfilespec(new VString(filespec)); - const Method *method_called; - execute_nonvirtual_method(cclass, + Execute_nonvirtual_method_result executed=execute_nonvirtual_method(cclass, conf_method_name, vfilespec, - false/*no result needed*/, &method_called); - if(method_called) - configure_admin(cclass, method_called->name); + false/*no string result needed*/); + if(executed.method) + configure_admin(cclass, executed.method->name); // locate and execute possible @auto[] static execute_nonvirtual_method(cclass, auto_method_name, vfilespec, - 0/*no result needed*/); - return &cclass; + false/*no result needed*/); + return VStateless_classPtr(&cclass); } StringPtr Request::relative(const char* apath, StringPtr relative_name) { @@ -606,7 +617,7 @@ void Request::output_result(VFilePtr bod // content-disposition if(ValuePtr vfile_name=body_file->fields().get(name_name)) - if(*vfile_name->get_string(&Pool())!=NONAME_DAT) { + if(*vfile_name->get_string(&fpool)!=NONAME_DAT) { VHashPtr hash(new VHash); HashStringValue &h=hash->hash(Exception::undefined_source); if(as_attachment)