--- parser3/src/classes/op.C 2001/10/19 12:43:29 1.53 +++ parser3/src/classes/op.C 2002/02/08 08:30:10 1.71 @@ -1,14 +1,13 @@ /** @file Parser: parser @b operators. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: op.C,v 1.53 2001/10/19 12:43:29 parser Exp $ + $Id: op.C,v 1.71 2002/02/08 08:30:10 paf Exp $ */ #include "classes.h" -#include "pa_config_includes.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vint.h" @@ -53,16 +52,20 @@ static void _if(Request& r, const String static void _untaint(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& lang_name=params->as_string(0, "lang must be string"); - String::Untaint_lang lang=static_cast( - untaint_lang_name2enum->get_int(lang_name)); - if(!lang) - throw Exception(0, 0, - &lang_name, - "invalid untaint language"); + uchar lang; + if(params->size()==1) + lang=String::UL_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_int(lang_name); + if(!lang) + throw Exception(0, 0, + &lang_name, + "invalid taint language"); + } { - Value& vbody=params->as_junction(1, "body must be code"); + 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 @@ -72,13 +75,12 @@ static void _untaint(Request& r, const S static void _taint(Request& r, const String&, MethodParams *params) { Pool& pool=r.pool(); - String::Untaint_lang lang; + uchar lang; if(params->size()==1) lang=String::UL_TAINTED; // mark as simply 'tainted'. useful in table:set else { const String& lang_name=params->as_string(0, "lang must be string"); - lang=static_cast( - untaint_lang_name2enum->get_int(lang_name)); + lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) throw Exception(0, 0, &lang_name, @@ -118,11 +120,14 @@ static void _process(Request& r, const S // evaluate source to process const String& source= - r.process(params->as_no_junction(0, "body must be string")).as_string(); + r.process(params->as_junction(0, "body must be code")).as_string(); // process source code, append processed methods to 'self' class // maybe-define new @main - r.use_buf(source.cstr(), place, &self_class); + r.use_buf( + source.cstr(String::UL_UNSPECIFIED, r.connection(0)), + place, + &self_class); // maybe-execute @main[] if(const Method *method=self_class.get_method(*main_method_name)) { @@ -176,16 +181,16 @@ static void _for(Request& r, const Strin Value& body_code=params->as_junction(3, "body must be code"); Value *delim_maybe_code=params->size()>4?¶ms->get(4):0; + if(to-from>=MAX_LOOPS) // too long loop? + throw Exception(0, 0, + &method_name, + "endless loop detected"); + bool need_delim=false; VInt *vint=new(pool) VInt(pool, 0); - int endless_loop_count=0; for(int i=from; i<=to; i++) { - if(++endless_loop_count>=MAX_LOOPS) // endless loop? - throw Exception(0, 0, - &method_name, - "endless loop detected"); vint->set_int(i); - r.self/*root*/->put_element(var_name, vint); + r.root->put_element(var_name, vint); Value& processed_body=r.process(body_code); if(delim_maybe_code) { // delimiter set? @@ -229,46 +234,42 @@ static void _error(Request& r, const Str /// @todo rewrite ugly code with try/try to autoobject TempConnection static void _connect(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - +#ifdef RESOURCES_DEBUG +struct timeval mt[2]; +#endif Value& url=params->as_no_junction(0, "url must not be code"); Value& body_code=params->as_junction(1, "body must be code"); Table *protocol2driver_and_client= static_cast(r.classes_conf.get(r.OP.name())); +#ifdef RESOURCES_DEBUG +//measure:before +gettimeofday(&mt[0],NULL); +#endif // connect - SQL_Connection& connection=SQL_driver_manager->get_connection( + SQL_Connection_ptr connection=SQL_driver_manager->get_connection( url.as_string(), method_name, protocol2driver_and_client); - // remember/set current connection - SQL_Connection *saved_connection=r.connection; - r.connection=&connection; +#ifdef RESOURCES_DEBUG +//measure:after connect +gettimeofday(&mt[1],NULL); + +double t[2]; +for(int i=0;i<2;i++) + t[i]=mt[i].tv_sec+mt[i].tv_usec/1000000.0; + +r.sql_connect_time+=t[1]-t[0]; +#endif + Temp_connection temp_connection(r, connection.get()); // execute body try { - try { - r.write_assign_lang(r.process(body_code)); - - connection.commit(); - } catch(...) { // process/commit problem - connection.rollback(); - - /*re*/throw; - } - - } catch(...) { - // close connection [cache it] - connection.close(); - // recall current connection from remembered - r.connection=saved_connection; - - /*re*/throw; + r.write_assign_lang(r.process(body_code)); + + } catch(...) { // process/commit problem + connection->mark_to_rollback(); + /*re*/throw; } - - // and anyway - // close connection [cache it] - connection.close(); - // recall current connection from remembered - r.connection=saved_connection; } #ifndef DOXYGEN @@ -323,6 +324,171 @@ static void _case(Request& r, const Stri } } +// cache-- + +// consts + +const int DATA_STRING_SERIALIZED_VERSION=0x0001; + +// helper types + +#ifndef DOXYGEN +struct Data_string_serialized_prolog { + int version; +}; +#endif + +void cache_delete(const String& file_spec) { + file_delete(file_spec, false/*fail_on_read_problem*/); +} + +#ifndef DOXYGEN +struct Locked_process_and_cache_put_action_info { + Request *r; + Value *body; +}; +#endif +static void locked_process_and_cache_put_action(int f, void *context) { + Locked_process_and_cache_put_action_info& info= + *static_cast(context); + + // 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); +} +Value *locked_process_and_cache_put(Request& r, + Value& body_code, + const String& file_spec) { + Locked_process_and_cache_put_action_info info={ + &r, + &body_code, + }; + + return 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; +} +String *cache_get(Pool& pool, const String& file_spec) { + void* data; size_t data_size; + if(!file_read(pool, file_spec, + data, data_size, + false/*as_text*/, + false/*fail_on_read_problem*/) + || !data_size/* ignore reads which are empty due to + non-unary open+lockEX conflict with lockSH */) + return 0; + + Data_string_serialized_prolog& prolog= + *static_cast(data); + + if(data_sizeas_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); + 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; + + // 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; ... + + // {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; + } + + // non-blocked lock; process; cache it + if(Value *processed_body=locked_process_and_cache_put(r, body_code, 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, 0, + &file_spec, + "locking problem"); + } else { + // 'lifespan'=0, forget cached copy + cache_delete(file_spec); + // process + Value& processed_body=r.process(body_code); + // write it out + r.write_assign_lang(processed_body); + // happy with it + return; + } + // never reached +} + // constructor MOP::MOP(Pool& apool) : Methoded(apool), @@ -336,7 +502,7 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("if", Method::CT_ANY, _if, 2, 3); // ^untaint[as-is|uri|sql|js|html|html-typo]{code} - add_native_method("untaint", Method::CT_ANY, _untaint, 2, 2); + add_native_method("untaint", Method::CT_ANY, _untaint, 1, 2); // ^taint[as-is|uri|sql|js|html|html-typo]{code} add_native_method("taint", Method::CT_ANY, _taint, 1, 2); @@ -353,7 +519,7 @@ MOP::MOP(Pool& apool) : Methoded(apool), // ^use[file] add_native_method("use", Method::CT_ANY, _use, 1, 1); - // ^for[i;from-number;to-number-inclusive]{code}[delim] + // ^for[i](from-number;to-number-inclusive){code}[delim] add_native_method("for", Method::CT_ANY, _for, 3+1, 3+1+1); // ^eval(expr) @@ -367,6 +533,11 @@ MOP::MOP(Pool& apool) : Methoded(apool), // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} add_native_method("connect", Method::CT_ANY, _connect, 2, 2); + + // ^cache[file_spec] delete cache + // ^cache[file_spec](time){code} time=0 no cache + add_native_method("cache", Method::CT_ANY, _cache, 1, 3); + // switch // ^switch[value]{cases}