--- parser3/src/classes/op.C 2002/03/27 15:30:34 1.78 +++ parser3/src/classes/op.C 2002/04/15 06:45:55 1.82 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: op.C,v 1.78 2002/03/27 15:30:34 paf Exp $ + $Id: op.C,v 1.82 2002/04/15 06:45:55 paf Exp $ */ #include "classes.h" @@ -12,6 +12,7 @@ #include "pa_request.h" #include "pa_vint.h" #include "pa_sql_connection.h" +#include "pa_vdate.h" // limits @@ -20,6 +21,7 @@ // defines #define OP_CLASS_NAME "OP" +#define CASE_DEFAULT_VALUE "DEFAULT" // class @@ -40,13 +42,13 @@ private: static void _if(Request& r, const String&, MethodParams *params) { Value& condition_code=params->as_junction(0, "condition must be expression"); - bool condition=r.process(condition_code, + 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"))); + r.write_pass_lang(r.process_to_value(params->as_junction(1, "'then' parameter must be code"))); else if(params->size()>2) - r.write_pass_lang(r.process(params->as_junction(2, "'else' parameter must be code"))); + r.write_pass_lang(r.process_to_value(params->as_junction(2, "'else' parameter must be code"))); } static void _untaint(Request& r, const String& method_name, MethodParams *params) { @@ -68,7 +70,7 @@ static void _untaint(Request& r, const S Value& vbody=params->as_junction(params->size()-1, "body must be code"); Temp_lang temp_lang(r, lang); // set temporarily specified ^untaint[language; - r.write_pass_lang(r.process(vbody)); // process marking tainted with that lang + r.write_pass_lang(r.process_to_value(vbody)); // process marking tainted with that lang } } @@ -123,7 +125,7 @@ static void _process(Request& r, const S // evaluate source to process const String& source= - r.process(params->as_junction(0, "body must be code")).as_string(); + r.process_to_string(params->as_junction(0, "body must be code")); // process source code, append processed methods to 'self' class // maybe-define new @main @@ -162,7 +164,7 @@ static void _while(Request& r, const Str "endless loop detected"); bool condition= - r.process( + r.process_to_value( vcondition, 0/*no name*/, false/*don't intercept string*/).as_bool(); @@ -170,7 +172,7 @@ static void _while(Request& r, const Str break; // write processed body - r.write_pass_lang(r.process(body)); + r.write_pass_lang(r.process_to_value(body)); } } @@ -198,11 +200,11 @@ static void _for(Request& r, const Strin vint->set_int(i); r.root->put_element(var_name, vint); - Value& processed_body=r.process(body_code); + Value& processed_body=r.process_to_value(body_code); if(delim_maybe_code) { // delimiter set? const String *string=processed_body.get_string(); if(need_delim && string && string->size()) // need delim & iteration produced string? - r.write_pass_lang(r.process(*delim_maybe_code)); + r.write_pass_lang(r.process_to_string(*delim_maybe_code)); need_delim=true; } r.write_pass_lang(processed_body); @@ -212,7 +214,7 @@ static void _for(Request& r, const Strin static void _eval(Request& r, const String& method_name, MethodParams *params) { Value& expr=params->as_junction(0, "need expression"); // evaluate expresion - Value *result=r.process(expr, + Value *result=r.process_to_value(expr, 0/*no name YET*/, true/*don't intercept string*/).as_expr_result(); if(params->size()>1) { @@ -259,7 +261,7 @@ r.sql_connect_time+=t[1]-t[0]; Temp_connection temp_connection(r, connection.get()); // execute body try { - r.write_assign_lang(r.process(body_code)); + r.write_assign_lang(r.process_to_value(body_code)); } catch(...) { // process problem connection->mark_to_rollback(); /*re*/throw; @@ -268,22 +270,32 @@ r.sql_connect_time+=t[1]-t[0]; #ifndef DOXYGEN struct Switch_data { + Request *r; Value *searching; Value *found; Value *_default; + Value *result; }; #endif -static void _switch(Request& r, const String&, MethodParams *params) { - void *backup=r.classes_conf.get(*switch_data_name); - Switch_data data={&r.process(params->get(0))}; - r.classes_conf.put(*switch_data_name, &data); +static void switch_postexecute(void *info) { + Switch_data& data=*static_cast(info); - r.process(params->as_junction(1, "switch cases must be code")); // and ignore result + if(Value *code=data.found ? data.found : data._default) + data.result=&data.r->process_to_value(*code); +} +static void _switch(Request& r, const String&, MethodParams *params) { + Switch_data data={&r, &r.process_to_value(params->get(0))}; + Temp_hash_value switch_data_setter(r.classes_conf, *switch_data_name, &data); - r.classes_conf.put(*switch_data_name, backup); + // execution of found ^case[...]{code} must be in context of ^switch[...]{code} + // because of stacked WWrapper used there as wcontext + r.process_to_nothing( + params->as_junction(1, "switch cases must be code"), + switch_postexecute, &data + ); - if(Value *code=data.found ? data.found : data._default) - r.write_pass_lang(r.process(*code)); + if(data.result) + r.write_pass_lang(*data.result); } static void _case(Request& r, const String& method_name, MethodParams *params) { @@ -298,9 +310,9 @@ static void _case(Request& r, const Stri int count=params->size(); Value *code=¶ms->as_junction(--count, "case result must be code"); for(int i=0; iget(i)); + Value& value=r.process_to_value(params->get(i)); - if(value.as_string() == *case_default_value) { + if(value.as_string() == CASE_DEFAULT_VALUE) { data->_default=code; break; } @@ -312,6 +324,11 @@ static void _case(Request& r, const Stri matches=data->searching->as_double() == value.as_double(); if(matches) { + if(data->found) + throw Exception("parser.runtime", + &method_name, + "duplicate found"); + data->found=code; break; } @@ -322,13 +339,14 @@ static void _case(Request& r, const Stri // consts -const int DATA_STRING_SERIALIZED_VERSION=0x0001; +const int DATA_STRING_SERIALIZED_VERSION=0x0002; // helper types #ifndef DOXYGEN struct Data_string_serialized_prolog { int version; + time_t expires; }; #endif @@ -337,9 +355,13 @@ void cache_delete(const String& file_spe } #ifndef DOXYGEN +struct Cache_data { + time_t expires; +}; struct Locked_process_and_cache_put_action_info { Request *r; - Value *body; + Cache_data *data; + Value *body_code; const String *evaluated_body; }; #endif static void locked_process_and_cache_put_action(int f, void *context) { @@ -347,39 +369,46 @@ static void locked_process_and_cache_put *static_cast(context); // body->process - info.body=&info.r->process(*info.body); - - // result->string - const String& data_string=info.body->as_string(); + info.evaluated_body=&info.r->process_to_string(*info.body_code); - // string -serialize> buffer - void *data; size_t data_size; - data_string.serialize( - sizeof(Data_string_serialized_prolog), - data, data_size); - Data_string_serialized_prolog& prolog= - *static_cast(data); - prolog.version=DATA_STRING_SERIALIZED_VERSION; - - // buffer -write> file - write(f, data, data_size); + // expiration time not spoiled by ^cache(0) or something? + if(info.data->expires > time(0)) { + // string -serialize> buffer + void *data; size_t data_size; + info.evaluated_body->serialize( + sizeof(Data_string_serialized_prolog), + data, data_size); + Data_string_serialized_prolog& prolog= + *static_cast(data); + prolog.version=DATA_STRING_SERIALIZED_VERSION; + prolog.expires=info.data->expires; + + // buffer -write> file + write(f, data, data_size); + } else // expired! + info.data->expires=0; // flag it so that could be easily checked by caller } -Value *locked_process_and_cache_put(Request& r, +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={ &r, - &body_code, + &data, + &body_code }; - return file_write_action_under_lock( + const String *result=file_write_action_under_lock( file_spec, "cache_put", locked_process_and_cache_put_action, &info, false/*as_text*/, false/*do_append*/, - false/*block*/) ? info.body : 0; + false/*block*/) ? info.evaluated_body: 0; + if(data.expires==0) + cache_delete(file_spec); + return result; } -String *cache_get(Pool& pool, const String& file_spec) { +String *cache_get(Pool& pool, const String& file_spec, time_t now) { void* data; size_t data_size; if(file_read(pool, file_spec, data, data_size, @@ -395,6 +424,7 @@ String *cache_get(Pool& pool, const Stri if( data_size>=sizeof(Data_string_serialized_prolog) && prolog.version==DATA_STRING_SERIALIZED_VERSION + && prolog.expires > now && result->deserialize( sizeof(Data_string_serialized_prolog), data, data_size, file_spec.cstr())) return result; @@ -402,23 +432,54 @@ String *cache_get(Pool& pool, const Stri return 0; } +static time_t as_expires(Request& r, const String& method_name, MethodParams *params, + int index, time_t now) { + time_t result; + Value& vlifespan_or_expires=params->get(index); + if(strcmp(vlifespan_or_expires.type(), VDATE_TYPE)==0) + result=static_cast(vlifespan_or_expires).get_time(); + else + result=now+(time_t)params->as_double(index, "lifespan must be date or number", r); + + return result; +} +static const String as_file_spec(Request&r, MethodParams *params, int index) { + return r.absolute(params->as_string(index, "filespec must be string")); +} static void _cache(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); + time_t now=time(0); + + // ^cache[filename] ^cache(seconds) ^cache[expires date] + if(params->size()==1) { + if(params->get(0).is_string()) { // filename? + cache_delete(as_file_spec(r, params, 0)); + return; + } + + // secods|expires date + Cache_data *data=static_cast(r.classes_conf.get(*cache_data_name)); + if(!data) + throw Exception("parser.runtime", + &method_name, + "expire-time reducing instruction without cache"); + + time_t expires=as_expires(r, method_name, params, 0, now); + if(expires < data->expires) + data->expires=expires; + + return; + } // file_spec, expires, body code const String &file_spec=r.absolute(params->as_string(0, "filespec must be string")); - if(params->size()==1) { // delete - cache_delete(file_spec); - return; - } - time_t lifespan=(time_t)params->as_double(1, "lifespan must be number", r); + Cache_data data; + Temp_hash_value cache_data_setter(r.classes_conf, *cache_data_name, &data); + data.expires=as_expires(r, method_name, params, 1, now); Value& body_code=params->as_junction(2, "body must be code"); - if(lifespan) { // 'lifespan' specified? try cached copy... - size_t size; - time_t atime, mtime, ctime; - + if(data.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: @@ -435,21 +496,17 @@ static void _cache(Request& r, const Str // ... // |lockSH succeeds; ... - // {file_spec} modification time for(int retry=0; retry<2; retry++) { - if(file_stat(file_spec, size, atime, mtime, ctime, false/*no exception on error*/)) // exists? - if(time(0)-mtime > lifespan) // expired - cache_delete(file_spec); - else // not expired - if(String *cached_body=cache_get(pool, file_spec)) { // have cached copy? - // write it out - r.write_assign_lang(*cached_body); - // happy with it - return; - } + if(String *cached_body=cache_get(pool, file_spec, now)) { // have cached copy? + // write it out + r.write_assign_lang(*cached_body); + // happy with it + return; + } // non-blocked lock; process; cache it - if(Value *processed_body=locked_process_and_cache_put(r, body_code, file_spec)) { + 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 @@ -463,10 +520,10 @@ static void _cache(Request& r, const Str &file_spec, "locking problem"); } else { - // 'lifespan'=0, forget cached copy + // instructed not to cache; forget cached copy cache_delete(file_spec); // process - Value& processed_body=r.process(body_code); + const String& processed_body=r.process_to_string(body_code); // write it out r.write_assign_lang(processed_body); // happy with it @@ -522,7 +579,7 @@ static void _try_operator(Request& r, co Value *sself=r.self, *sroot=r.root, *srcontext=r.rcontext; WContext *swcontext=r.wcontext; try { - result=&r.process(body_code); + result=&r.process_to_value(body_code); } catch(const Exception& e) { // restoring request processing status //r.exception_trace.top_index(ssexception_trace); @@ -535,7 +592,7 @@ static void _try_operator(Request& r, co Junction *junction=catch_code.get_junction(); Value *saved_exception_var_value=junction->root->get_element(*exception_var_name); junction->root->put_element(*exception_var_name, &vhash); - result=&r.process(catch_code); + result=&r.process_to_value(catch_code); bool handled=false; if(Value *value=static_cast(vhash.hash(0).get(*exception_handled_part_name))) handled=value->as_bool();