--- parser3/src/classes/op.C 2007/04/23 10:30:09 1.166 +++ parser3/src/classes/op.C 2008/05/26 14:23:46 1.178 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_OP_C="$Date: 2007/04/23 10:30:09 $"; +static const char * const IDENT_OP_C="$Date: 2008/05/26 14:23:46 $"; #include "classes.h" #include "pa_vmethod_frame.h" @@ -102,19 +102,22 @@ static void _if(Request& r, MethodParams r.write_pass_lang(r.process(*params.get(2))); } -static void _untaint(Request& r, MethodParams& params) { +static String::Language get_untaint_lang(MethodParams& params, int index){ + const String& lang_name=params.as_string(index, "lang must be string"); + String::Language lang=untaint_lang_name2enum.get(lang_name); + if(!lang) + throw Exception(0, + &lang_name, + "invalid taint language"); + return lang; +} +static void _untaint(Request& r, MethodParams& params) { String::Language lang; if(params.count()==1) - lang=String::L_AS_IS; // mark as simply 'tainted'. useful in html from sql - else { - const String& lang_name=params.as_string(0, "lang must be string"); - lang=untaint_lang_name2enum.get(lang_name); - if(!lang) - throw Exception(0, - &lang_name, - "invalid taint language"); - } + lang=String::L_AS_IS; // mark as simply 'as-is'. useful in html from sql + else + lang=get_untaint_lang(params, 0); { Value& vbody=params.as_junction(params.count()-1, "body must be code"); @@ -127,15 +130,9 @@ static void _untaint(Request& r, MethodP static void _taint(Request& r, MethodParams& params) { String::Language lang; if(params.count()==1) - lang=String::L_TAINTED; // mark as simply 'tainted'. useful in table:set - else { - const String& lang_name=params.as_string(0, "lang must be string"); - lang=untaint_lang_name2enum.get(lang_name); - if(!lang) - throw Exception(0, - &lang_name, - "invalid taint language"); - } + lang=String::L_TAINTED; // mark as simply 'tainted'. useful in table:create + else + lang=get_untaint_lang(params, 0); { Value& vbody=params.as_no_junction(params.count()-1, "body must not be code"); @@ -243,7 +240,8 @@ static void _while(Request& r, MethodPar Temp_hash_value cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r); - Value& vcondition=params.as_junction(0, "condition must be expression"); + Value& vcondition=params.as_expression(0, "condition must be number, bool or expression"); + Value& body_code=params.as_junction(1, "body must be code"); Value* delim_maybe_code=params.count()>2?¶ms[2]:0; @@ -267,7 +265,8 @@ static void _while(Request& r, MethodPar if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body if(need_delim) // need delim & iteration produced string? r.write_pass_lang(r.process(*delim_maybe_code)); - need_delim=true; + else + need_delim=true; } r.write_pass_lang(sv_processed); @@ -277,7 +276,7 @@ static void _while(Request& r, MethodPar } static void _use(Request& r, MethodParams& params) { - Value& vfile=params.as_no_junction(0, "file name must not be code"); + Value& vfile=params.as_no_junction(0, FILE_NAME_MUST_NOT_BE_CODE); r.use_file(r.main_class, vfile.as_string()); } @@ -328,7 +327,8 @@ static void _for(Request& r, MethodParam if(delim_maybe_code && s_processed && s_processed->length()) { // delimiter set and we have body if(need_delim) // need delim & iteration produced string? r.write_pass_lang(r.process(*delim_maybe_code)); - need_delim=true; + else + need_delim=true; } r.write_pass_lang(sv_processed); @@ -343,8 +343,12 @@ static void _eval(Request& r, MethodPara Value& value_result=r.process_to_value(expr, false/*don't intercept string*/).as_expr_result(); if(params.count()>1) { - Value& fmt=params.as_no_junction(1, "fmt must not be code"); - r.write_no_lang(String(format(value_result.as_double(), fmt.as_string().cstrm()))); + const String& fmt=params.as_string(1, "fmt must be string").trim(); + if(fmt.is_empty()){ + r.write_no_lang(value_result); + } else { + r.write_no_lang(String(format(value_result.as_double(), fmt.cstrm()))); + } } else r.write_no_lang(value_result); } @@ -535,7 +539,7 @@ struct Data_string_serialized_prolog { #endif void cache_delete(const String& file_spec) { - file_delete(file_spec, false/*fail_on_read_problem*/); + file_delete(file_spec, false/*fail_on_problem*/); } #ifndef DOXYGEN @@ -547,7 +551,8 @@ public: struct Locked_process_and_cache_put_action_info { Request *r; Cache_scope *scope; - Value* body_code; Value* catch_code; + Value* body_code; + Value* catch_code; const String* processed_code; }; #endif @@ -566,7 +571,6 @@ static void locked_process_and_cache_put Locked_process_and_cache_put_action_info& info= *static_cast(context); - const String* body_from_disk=info.scope->body_from_disk; // body->process Try_catch_result result=try_catch(*info.r, @@ -610,11 +614,14 @@ const String* locked_process_and_cache_p const String* result=file_write_action_under_lock( file_spec, - "cache_put", locked_process_and_cache_put_action, &info, + "cache_put", + locked_process_and_cache_put_action, + &info, false/*as_text*/, false/*do_append*/, - false/*block*/, - false/*fail on lock problem*/) ? info.processed_code: 0; + false/*block == don't wait till other thread release lock*/, + false/*dun throw exception if lock failed*/) ? info.processed_code: 0; + time_t now=time(0); if(scope.expires<=now) cache_delete(file_spec); @@ -666,9 +673,8 @@ static const String& as_file_spec(Reques return r.absolute(params.as_string(index, "filespec must be string")); } static void _cache(Request& r, MethodParams& params) { - if(params.count()==0) - { - // return current expiration time + if(params.count()==0) { + // ^cache[] -- return current expiration time Cache_scope* scope=static_cast(r.classes_conf.get(cache_data_name)); if(!scope) throw Exception(PARSER_RUNTIME, @@ -680,8 +686,8 @@ static void _cache(Request& r, MethodPar time_t now=time(0); - // ^cache[filename] ^cache(seconds) ^cache[expires date] if(params.count()==1) { + // ^cache[filename] ^cache(seconds) ^cache[expires date] if(params[0].is_string()) { // filename? cache_delete(as_file_spec(r, params, 0)); return; @@ -705,7 +711,7 @@ static void _cache(Request& r, MethodPar "invalid number of parameters"); // file_spec, expires, body code - const String& file_spec=r.absolute(params.as_string(0, "filespec must be string")); + const String& file_spec=as_file_spec(r, params, 0); Cache_scope scope={as_expires(r, params, 1, now), 0}; @@ -716,63 +722,41 @@ static void _cache(Request& r, MethodPar if(params.count()>3) catch_code=¶ms.as_junction(3, "catch_code must be code"); - 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: - // A B - // open - // |open - // lockSH - // |nonblocking-lockEX fails - // unlockSH - // close, cache_get returns 0 - // open - // nonblocking-lockEX succeeds; process, write, close - // |retry1: open - // ... - // |lockSH succeeds; ... - - for(int retry=0; retry<2; retry++) { - 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; - } - } + if(scope.expires>now) { + Cache_get_result cached=cache_get(r.charsets, file_spec, now); - // 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 - } + 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; + } + } + + // no cached info or it's already expired + + // trying to process it under lock and store result in file + const String* processed_body=locked_process_and_cache_put(r, body_code, catch_code, scope, file_spec); + if(processed_body){ + // write it out + r.write_assign_lang(*processed_body); + // happy with it + return; + } else { + // we fail while get exclusive lock. nvm, we just execute body_code a bit later } - throw Exception(0, - &file_spec, - "locking problem"); } else { // instructed not to cache; forget cached copy cache_delete(file_spec); - // process - const String& processed_body=r.process_to_string(body_code); - // write it out - r.write_assign_lang(processed_body); - // happy with it - return; } - // never reached + + // process without cacheing + const String& processed_body=r.process_to_string(body_code); + // write it out + r.write_assign_lang(processed_body); } static StringOrValue process_try_body_code(Request& r, Value* body_code) { @@ -796,7 +780,7 @@ static void _try_operator(Request& r, Me } static void _throw_operator(Request&, MethodParams& params) { - if(params.count()==1) { + if(params.count()==1 && !params[0].is_string()) { if(HashStringValue *hash=params[0].get_hash()) { const char* type=0; if(Value* value=hash->get(exception_type_part_name)) @@ -814,13 +798,12 @@ static void _throw_operator(Request&, Me } else throw Exception(PARSER_RUNTIME, 0, - "one-param version has hash param"); + "one-param version has hash or string param"); } else { const char* type=params.as_string(0, "type must be string").cstr(); - const String& source=params.as_string(1, "source must be string"); - const char* comment=params.count()>2? params.as_string(2, "comment must be string").cstr() - :0; - throw Exception(type, &source, "%s", comment?comment:""); + const String* source=params.count()>1? ¶ms.as_string(1, "source must be string"):0; + const char* comment=params.count()>2? params.as_string(2, "comment must be string").cstr():0; + throw Exception(type, source, "%s", comment?comment:""); } }