--- parser3/src/classes/op.C 2002/03/26 13:08:30 1.76 +++ parser3/src/classes/op.C 2002/03/29 11:28:40 1.80 @@ -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.76 2002/03/26 13:08:30 paf Exp $ + $Id: op.C,v 1.80 2002/03/29 11:28:40 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 @@ -59,7 +60,7 @@ static void _untaint(Request& r, const S const String& lang_name=params->as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) - throw Exception(0, 0, + throw Exception(0, &lang_name, "invalid taint language"); } @@ -82,7 +83,7 @@ static void _taint(Request& r, const Str const String& lang_name=params->as_string(0, "lang must be string"); lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) - throw Exception(0, 0, + throw Exception(0, &lang_name, "invalid taint language"); } @@ -157,7 +158,7 @@ static void _while(Request& r, const Str int endless_loop_count=0; while(true) { if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "endless loop detected"); @@ -188,7 +189,7 @@ static void _for(Request& r, const Strin Value *delim_maybe_code=params->size()>4?¶ms->get(4):0; if(to-from>=MAX_LOOPS) // too long loop? - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "endless loop detected"); @@ -274,14 +275,11 @@ struct Switch_data { }; #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); + Temp_hash_value switch_data_setter(r.classes_conf, *switch_data_name, &data); r.process(params->as_junction(1, "switch cases must be code")); // and ignore result - r.classes_conf.put(*switch_data_name, backup); - if(Value *code=data.found ? data.found : data._default) r.write_pass_lang(r.process(*code)); } @@ -291,7 +289,7 @@ static void _case(Request& r, const Stri Switch_data *data=static_cast(r.classes_conf.get(*switch_data_name)); if(!data) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "without switch"); @@ -322,13 +320,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 +336,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; }; #endif static void locked_process_and_cache_put_action(int f, void *context) { @@ -349,37 +352,47 @@ static void locked_process_and_cache_put // body->process info.body=&info.r->process(*info.body); - // result->string - const String& data_string=info.body->as_string(); - - // 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)) { + // result->string + const String& data_string=info.body->as_string(); + + // 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; + 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, Value& body_code, + Cache_data& data, const String& file_spec) { Locked_process_and_cache_put_action_info info={ &r, &body_code, + &data }; - return file_write_action_under_lock( + Value *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; + 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 +408,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 +416,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 +480,16 @@ 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(Value *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 @@ -459,11 +499,11 @@ static void _cache(Request& r, const Str retry=0; // prolonging our wait, than could cache_get it, without processing body_code } } - throw Exception(0, 0, + throw Exception(0, &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); @@ -479,8 +519,8 @@ static void _cache(Request& r, const Str VHash& exception2vhash(Pool& pool, const Exception& e) { VHash& result=*new(pool) VHash(pool); Hash& hash=result.hash(0); - if(const String *type=e.type()) - hash.put(*exception_type_part_name, new(pool) VString(*type)); + if(const char *type=e.type()) + hash.put(*exception_type_part_name, new(pool) VString(*new(pool) String(pool, type))); if(const String *asource=e.problem_source()) { String& source=*new(pool) String(pool); source.append(*asource, String::UL_TAINTED, true/*forced*/); @@ -517,16 +557,19 @@ static void _try_operator(Request& r, co Value *result; // taking snapshot of request processing status - int stop_index=r.stack.top_index(); + //int ssexception_trace=r.exception_trace.top_index(); + int sstack=r.stack.top_index(); Value *sself=r.self, *sroot=r.root, *srcontext=r.rcontext; WContext *swcontext=r.wcontext; try { result=&r.process(body_code); } catch(const Exception& e) { // restoring request processing status - r.stack.top_index(stop_index); + //r.exception_trace.top_index(ssexception_trace); + r.stack.top_index(sstack); r.self=sself; r.root=sroot, r.rcontext=srcontext; r.wcontext=swcontext; + VHash& vhash=exception2vhash(pool, e); Junction *junction=catch_code.get_junction(); @@ -551,9 +594,9 @@ static void _throw_operator(Request& r, if(params->size()==1) { Value& param0=params->get(0); if(Hash *hash=param0.get_hash(&method_name)) { - const String *type=0; + const char *type=0; if(Value *value=static_cast(hash->get(*exception_type_part_name))) - type=&value->as_string(); + type=value->as_string().cstr(); const String *source=0; if(Value *value=static_cast(hash->get(*exception_source_part_name))) source=&value->as_string(); @@ -562,20 +605,18 @@ static void _throw_operator(Request& r, static_cast(hash->get(*exception_comment_part_name))) comment=value->as_string().cstr(); - throw Exception(type, 0, + throw Exception(type, source?source:&method_name, comment); } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "one-param version has hash param"); } else { - const String& type=params->as_string(0, "type must be string"); + 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->as_string(2, "comment must be string").cstr(); - throw Exception(&type, 0, - &source, - comment); + throw Exception(type, &source, comment); } }