--- parser3/src/classes/op.C 2003/07/24 11:31:20 1.129 +++ parser3/src/classes/op.C 2005/02/17 14:56:54 1.151 @@ -1,22 +1,24 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_OP_C="$Date: 2003/07/24 11:31:20 $"; +static const char * const IDENT_OP_C="$Date: 2005/02/17 14:56:54 $"; #include "classes.h" #include "pa_vmethod_frame.h" #include "pa_common.h" +#include "pa_os.h" #include "pa_request.h" #include "pa_vint.h" #include "pa_sql_connection.h" #include "pa_vdate.h" #include "pa_vmethod_frame.h" #include "pa_vclass.h" +#include "pa_charset.h" // limits @@ -25,6 +27,9 @@ static const char* IDENT_OP_C="$Date: 20 // defines #define CASE_DEFAULT_VALUE "DEFAULT" +#define PROCESS_MAIN_OPTION_NAME "main" +#define PROCESS_FILE_OPTION_NAME "file" +#define PROCESS_LINENO_OPTION_NAME "lineno" // class @@ -48,20 +53,23 @@ static const String cache_data_name(CACH static const String exception_var_name(EXCEPTION_VAR_NAME); +// local defines + +#define CACHE_EXCEPTION_HANDLED_CACHE_NAME "cache" + // helpers -class Untaint_lang_name2enum: public Hash { +class Untaint_lang_name2enum: public Hash { public: Untaint_lang_name2enum() { #define ULN(name, LANG) \ - put(StringBody(name), (value_type)(String::L_##LANG)); + put(String::Body(name), (value_type)(String::L_##LANG)); ULN("as-is", AS_IS); ULN("optimized-as-is", AS_IS|String::L_OPTIMIZE_BIT); ULN("file-spec", FILE_SPEC); ULN("http-header", HTTP_HEADER); ULN("mail-header", MAIL_HEADER); ULN("uri", URI); - ULN("table", TABLE); ULN("sql", SQL); ULN("js", JS); ULN("xml", XML); @@ -78,7 +86,6 @@ static void _if(Request& r, MethodParams Value& condition_code=params.as_junction(0, "condition must be expression"); bool condition=r.process_to_value(condition_code, - /*0/*no name* /,*/ false/*don't intercept string*/).as_bool(); if(condition) r.write_pass_lang(r.process(params.as_junction(1, "'then' parameter must be code"))); @@ -158,23 +165,54 @@ static void _process(Request& r, MethodP // temporary zero @auto so it wouldn't be auto-called in Request::use_buf Temp_method temp_method_auto(*target_class, auto_method_name, 0); - size_t main_alias_index=index+1; - const String* main_alias=0; - if(main_alias_indexget(PROCESS_MAIN_OPTION_NAME)) { + valid_options++; + main_alias=&vmain_alias->as_string(); + } + if(Value* vfile_alias=options->get(PROCESS_FILE_OPTION_NAME)) { + valid_options++; + file_alias=&vfile_alias->as_string(); + } + if(Value* vline_no_alias_offset=options->get(PROCESS_LINENO_OPTION_NAME)) { + valid_options++; + line_no_alias_offset=vline_no_alias_offset->as_int(); + } + + if(valid_options!=options->count()) + throw Exception("parser.runtime", + 0, + "called with invalid option"); } + uint processe_file_no=file_alias? + r.register_file(r.absolute(*file_alias)) + : pseudo_file_no__process; + // process...{string} + Value& vjunction=params.as_junction(index, "body must be code"); + // evaluate source to process + const String& source=r.process_to_string(vjunction); + r.use_buf(*target_class, + source.cstr(String::L_UNSPECIFIED, r.connection(false)), + main_alias, + processe_file_no, + line_no_alias_offset); + // main_method main_method=target_class->get_method(main_method_name); } @@ -188,7 +226,7 @@ static void _process(Request& r, MethodP } } -static void _rem(Request& r, MethodParams& params) { +static void _rem(Request&, MethodParams& params) { params.as_junction(0, "body must be code"); } @@ -205,7 +243,6 @@ static void _while(Request& r, MethodPar "endless loop detected"); bool condition=r.process_to_value(vcondition, - /*0/*no name* /,*/ false/*don't intercept string*/).as_bool(); if(!condition) // ...condition is true break; @@ -253,7 +290,6 @@ static void _eval(Request& r, MethodPara Value& expr=params.as_junction(0, "need expression"); // evaluate expresion Value& value_result=r.process_to_value(expr, - /*0/*no name YET* /,*/ true/*don't intercept string*/).as_expr_result(); if(params.count()>1) { Value& fmt=params.as_no_junction(1, "fmt must not be code"); @@ -281,8 +317,9 @@ struct timeval mt[2]; gettimeofday(&mt[0],NULL); #endif // connect - SQL_Connection* connection=SQL_driver_manager.get_connection(url.as_string(), - protocol2driver_and_client); + SQL_Connection* connection=SQL_driver_manager->get_connection(url.as_string(), + protocol2driver_and_client, + r.charsets.source().NAME().cstr()); #ifdef RESOURCES_DEBUG //measure:after connect @@ -321,18 +358,15 @@ public: #endif static void _switch(Request& r, MethodParams& params) { Switch_data* data=new Switch_data(r, r.process_to_value(params[0])); - Temp_hash_value + Temp_hash_value switch_data_setter(r.classes_conf, switch_data_name, data); Value& cases_code=params.as_junction(1, "switch cases must be code"); // execution of found ^case[...]{code} must be in context of ^switch[...]{code} // because of stacked WWrapper used there as wcontext r.process(cases_code, true/*intercept_string*/); - if(Value* selected_code=data->found? data->found: data->_default) { - // setting code context, would execute in ^switch[...]{>>context<<} - //selected_code->get_junction()->change_context(cases_code.get_junction()); + if(Value* selected_code=data->found? data->found: data->_default) r.write_pass_lang(r.process(*selected_code)); - } } static void _case(Request& r, MethodParams& params) { @@ -345,10 +379,6 @@ static void _case(Request& r, MethodPara int count=params.count(); Value& code=params.as_junction(--count, "case result must be code"); - // killing context for safety, would execute in ^switch[...]{>>context<<} - // reason: context is stacked, and it would become invalid afterwards - //code->get_junction()->change_context(0); - for(int i=0; i +static Try_catch_result try_catch(Request& r, + StringOrValue body_code(Request&, I), I info, + Value* catch_code) +{ + Try_catch_result result; + if(!catch_code) { + result.processed_code=body_code(r, info); + return result; + } + + // taking snapshot of try-context + Request_context_saver try_context(r); + try { + result.processed_code=body_code(r, info); + } catch(const Exception& e) { + Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error] + Request::Exception_details details=r.get_details(e); + try_context.restore(); // restoring try-context to perform catch-code + + Junction* junction=catch_code->get_junction(); + Value* method_frame=junction->method_frame; + Value* saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false); + junction->method_frame->put_element(exception_var_name, &details.vhash, false); + result.processed_code=r.process(*catch_code); + + // retriving $exception.handled, restoring $exception var + Value* vhandled=details.vhash.hash().get(exception_handled_part_name); + junction->method_frame->put_element(exception_var_name, saved_exception_var_value, false); + + bool bhandled=false; + if(vhandled) { + if(vhandled->is_string()) { // not simple $exception.handled(1/0)? + result.exception_should_be_handled=vhandled->get_string(); // considering 'recovered' and let the caller recover + return result; + } + + bhandled=vhandled->as_bool(); + } + + if(!bhandled) { + throw_context.restore(); // restoring throw-context [exception were not handled] + rethrow; + } + } + return result; +} // cache-- // consts -const int DATA_STRING_SERIALIZED_VERSION=0x0004; +const int DATA_STRING_SERIALIZED_VERSION=0x0005; // helper types @@ -395,16 +482,25 @@ void cache_delete(const String& file_spe } #ifndef DOXYGEN -class Cache_data: public PA_Object { +struct Cache_scope { public: time_t expires; + const String* body_from_disk; }; struct Locked_process_and_cache_put_action_info { Request *r; - Cache_data *data; - Value* body_code; const String* evaluated_body; + Cache_scope *scope; + Value* body_code; Value* catch_code; + const String* processed_code; }; #endif + + + +static StringOrValue process_cache_body_code(Request& r, Value* body_code) { + return StringOrValue(&r.process_to_string(*body_code), 0); +} + /* @todo maybe network order worth spending some effort? don't bothering myself with network byte order, am not planning to be able to move resulting file across platforms @@ -414,31 +510,48 @@ static void locked_process_and_cache_put *static_cast(context); // body->process - info.evaluated_body=&info.r->process_to_string(*info.body_code); + Try_catch_result result=try_catch(*info.r, + process_cache_body_code, info.body_code, + info.catch_code); + + if(result.exception_should_be_handled) { + if(*result.exception_should_be_handled==CACHE_EXCEPTION_HANDLED_CACHE_NAME) { + if(const String* body_from_disk=info.scope->body_from_disk) // we have something old? + info.processed_code=body_from_disk; + else + throw Exception(0, + new String("$"EXCEPTION_VAR_NAME"."EXCEPTION_HANDLED_PART_NAME"["CACHE_EXCEPTION_HANDLED_CACHE_NAME"]"), + "fallback failed - there is no old cached body"); + } else + throw Exception("parser.runtime", + result.exception_should_be_handled, + "$"EXCEPTION_VAR_NAME"."EXCEPTION_HANDLED_PART_NAME" value must be " + "either boolean or string '"CACHE_EXCEPTION_HANDLED_CACHE_NAME"'"); + } else + info.processed_code=&result.processed_code.as_string(); // expiration time not spoiled by ^cache(0) or something? - if(info.data->expires > time(0)) { + if(info.scope->expires > time(0)) { // string -serialize> buffer - String::Cm serialized=info.evaluated_body->serialize( + String::Cm serialized=info.processed_code->serialize( sizeof(Data_string_serialized_prolog)); Data_string_serialized_prolog& prolog= *reinterpret_cast(serialized.str); prolog.version=DATA_STRING_SERIALIZED_VERSION; - prolog.expires=info.data->expires; + prolog.expires=info.scope->expires; // buffer -write> file write(f, serialized.str, serialized.length); } else // expired! - info.data->expires=0; // flag it so that could be easily checked by caller + info.scope->expires=0; // flag it so that could be easily checked by caller } const String* locked_process_and_cache_put(Request& r, Value& body_code, - Cache_data& data, - const String& file_spec) { - Locked_process_and_cache_put_action_info info={0}; - info.r=&r; - info.data=&data; - info.body_code=&body_code; + Value* catch_code, + Cache_scope& scope, + const String& file_spec) +{ + Locked_process_and_cache_put_action_info info={&r, &scope, &body_code, catch_code, 0}; const String* result=file_write_action_under_lock( file_spec, @@ -446,13 +559,21 @@ const String* locked_process_and_cache_p false/*as_text*/, false/*do_append*/, false/*block*/, - false/*fail on lock problem*/) ? info.evaluated_body: 0; + false/*fail on lock problem*/) ? info.processed_code: 0; time_t now=time(0); - if(data.expires<=now) + if(scope.expires<=now) cache_delete(file_spec); return result; } -const String* cache_get(Request_charsets& charsets, const String& file_spec, time_t now) { +#ifndef DOXYGEN +struct Cache_get_result { + const String* body; + bool expired; +}; +#endif +static Cache_get_result cache_get(Request_charsets& charsets, const String& file_spec, time_t now) { + Cache_get_result result={0, false}; + File_read_result file=file_read(charsets, file_spec, false/*as_text*/, 0, //no params @@ -463,16 +584,18 @@ const String* cache_get(Request_charsets Data_string_serialized_prolog& prolog= *reinterpret_cast(file.str); - String* result=new String; + String* body=new String; if( file.length>=sizeof(Data_string_serialized_prolog) - && prolog.version==DATA_STRING_SERIALIZED_VERSION - && prolog.expires > now - && result->deserialize(sizeof(Data_string_serialized_prolog), file.str, file.length)) - return result; + && prolog.version==DATA_STRING_SERIALIZED_VERSION) { + if(body->deserialize(sizeof(Data_string_serialized_prolog), file.str, file.length)) { + result.body=body; + result.expired=prolog.expires <= now; + } + } } - return 0; + return result; } static time_t as_expires(Request& r, MethodParams& params, int index, time_t now) { @@ -498,29 +621,35 @@ static void _cache(Request& r, MethodPar } // secods|expires date - Cache_data* data=static_cast(r.classes_conf.get(cache_data_name)); - if(!data) + Cache_scope* scope=static_cast(r.classes_conf.get(cache_data_name)); + if(!scope) throw Exception("parser.runtime", 0, "expire-time reducing instruction without cache"); time_t expires=as_expires(r, params, 0, now); - if(expires < data->expires) - data->expires=expires; + if(expires < scope->expires) + scope->expires=expires; return; - } + } else if(params.count()<3) + throw Exception("parser.runtime", + 0, + "invalid number of parameters"); // file_spec, expires, body code const String& file_spec=r.absolute(params.as_string(0, "filespec must be string")); - Cache_data* data=new Cache_data; - Temp_hash_value - cache_data_setter(r.classes_conf, cache_data_name, data); - data->expires=as_expires(r, params, 1, now); - Value& body_code=params.as_junction(2, "body must be code"); + Cache_scope scope={as_expires(r, params, 1, now), 0}; + + Temp_hash_value + cache_scope_setter(r.classes_conf, cache_data_name, &scope); + Value& body_code=params.as_junction(2, "body_code must be code"); + Value* catch_code=0; + if(params.count()>3) + catch_code=¶ms.as_junction(3, "catch_code must be code"); - if(data->expires>now) { // valid 'expires' specified? try cached copy... + if(scope.expires>now) { // valid 'expires' specified? try cached copy... // hence we don't hope to have unary create/lockEX // we need some plan to live in a life like that, so... // worst races plan: @@ -538,24 +667,30 @@ static void _cache(Request& r, MethodPar // |lockSH succeeds; ... for(int retry=0; retry<2; retry++) { - if(const String* cached_body=cache_get(r.charsets, file_spec, now)) { // have cached copy? - // write it out - r.write_assign_lang(*cached_body); - // happy with it - return; + Cache_get_result cached=cache_get(r.charsets, file_spec, now); + if(cached.body) { // have cached copy + if(cached.expired) + scope.body_from_disk=cached.body; // storing for user to retrive it with ^cache[] + else // and it's not expired yet + { + // write it out + r.write_assign_lang(*cached.body); + // happy with it + return; + } } - // non-blocked lock; process; cache it - if(const String* processed_body= - locked_process_and_cache_put(r, body_code, *data, file_spec)) { - // write it out - r.write_assign_lang(*processed_body); - // happy with it - return; - } else { // somebody writing result right now - pa_sleep(0, 500000); // waiting half a second - retry=0; // prolonging our wait, than could cache_get it, without processing body_code - } + // non-blocked lock; process; cache it + if(const String* processed_body= + locked_process_and_cache_put(r, body_code, catch_code, scope, file_spec)) { + // write it out + r.write_assign_lang(*processed_body); + // happy with it + return; + } else { // somebody writing result right now + pa_sleep(0, 500000); // waiting half a second + retry=0; // prolonging our wait, than could cache_get it, without processing body_code + } } throw Exception(0, &file_spec, @@ -573,46 +708,27 @@ static void _cache(Request& r, MethodPar // never reached } - - -// also used in pa_request.C to pass param to @unhandled_exception - +static StringOrValue process_try_body_code(Request& r, Value* body_code) { + return r.process(*body_code); +} static void _try_operator(Request& r, MethodParams& params) { Value& body_code=params.as_junction(0, "body_code must be code"); Value& catch_code=params.as_junction(1, "catch_code must be code"); - StringOrValue result; - // taking snapshot of try-context - Request_context_saver try_context(r); - try { - result=r.process(body_code); - } catch(const Exception& e) { - Request::Exception_details details=r.get_details(e); - - Request_context_saver throw_context(r); // taking snapshot of throw-context [stack trace contains error] - try_context.restore(); // restoring try-context to perform catch-code - - Junction* junction=catch_code.get_junction(); - Value* method_frame=junction->method_frame; - Value* saved_exception_var_value=method_frame->get_element(exception_var_name, *method_frame, false); - junction->method_frame->put_element(exception_var_name, &details.vhash, false); - result=r.process(catch_code); - bool handled=false; - if(Value* value= - details.vhash.hash().get(exception_handled_part_name)) - handled=value->as_bool(); - junction->method_frame->put_element(exception_var_name, saved_exception_var_value, false); + Try_catch_result result=try_catch(r, + process_try_body_code, &body_code, + &catch_code); + + if(result.exception_should_be_handled) + throw Exception("parser.runtime", + result.exception_should_be_handled, + "catch block must set $exception.handled to some boolean value, not string"); - if(!handled) { - throw_context.restore(); // restoring throw-context [exception were not handled] - rethrow; - } - } - // write out result - r.write_pass_lang(result); + // write out processed body_code or catch_code + r.write_pass_lang(result.processed_code); } -static void _throw_operator(Request& r, MethodParams& params) { +static void _throw_operator(Request&, MethodParams& params) { if(params.count()==1) { if(HashStringValue *hash=params[0].get_hash()) { const char* type=0; @@ -621,7 +737,7 @@ static void _throw_operator(Request& r, const String* source=0; if(Value* value=hash->get(exception_source_part_name)) source=&value->as_string(); - const char* comment; + const char* comment=0; if(Value* value=hash->get(exception_comment_part_name)) comment=value->as_string().cstr(); @@ -639,11 +755,16 @@ static void _throw_operator(Request& r, :0; throw Exception(type, &source, "%s", comment?comment:""); } -} + } + +static void _sleep_operator(Request& r, MethodParams& params) { + double seconds=params.as_double(0, "seconds must be double", r); + pa_sleep((int)trunc(seconds), (int)trunc(seconds*1000)); + } #if defined(WIN32) && defined(_DEBUG) # define PA_BPT -static void _bpt(Request& r, MethodParams& params) { +static void _bpt(Request&, MethodParams&) { _asm int 3; } #endif @@ -669,7 +790,7 @@ VClassMAIN::VClassMAIN(): VClass() { add_native_method("taint", Method::CT_ANY, _taint, 1, 2); // ^process[code] - add_native_method("process", Method::CT_ANY, _process, 1, 2); + add_native_method("process", Method::CT_ANY, _process, 1, 3); // ^rem{code} add_native_method("rem", Method::CT_ANY, _rem, 1, 10000); @@ -691,9 +812,9 @@ VClassMAIN::VClassMAIN(): VClass() { add_native_method("connect", Method::CT_ANY, _connect, 2, 2); + // ^cache[file_spec](time){code}[{catch code}] time=0 no cache // ^cache[file_spec] delete cache - // ^cache[file_spec](time){code} time=0 no cache - add_native_method("cache", Method::CT_ANY, _cache, 1, 3); + add_native_method("cache", Method::CT_ANY, _cache, 1, 4); // switch @@ -711,6 +832,7 @@ VClassMAIN::VClassMAIN(): VClass() { // ^throw[type;source;comment] add_native_method("throw", Method::CT_ANY, _throw_operator, 1, 3); + add_native_method("sleep", Method::CT_ANY, _sleep_operator, 1, 1); } // constructor & configurator