--- parser3/src/classes/op.C 2001/10/10 12:52:13 1.52 +++ parser3/src/classes/op.C 2001/12/19 16:17:26 1.65 @@ -2,13 +2,12 @@ Parser: parser @b operators. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: op.C,v 1.52 2001/10/10 12:52:13 parser Exp $ + $Id: op.C,v 1.65 2001/12/19 16:17:26 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) - PTHROW(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,15 +75,14 @@ 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) - PTHROW(0, 0, + throw Exception(0, 0, &lang_name, "invalid taint language"); } @@ -118,11 +120,11 @@ 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), place, &self_class); // maybe-execute @main[] if(const Method *method=self_class.get_method(*main_method_name)) { @@ -146,7 +148,7 @@ static void _while(Request& r, const Str int endless_loop_count=0; while(true) { if(++endless_loop_count>=MAX_LOOPS) // endless loop? - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "endless loop detected"); @@ -176,16 +178,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? - PTHROW(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? @@ -220,59 +222,71 @@ static void _error(Request& r, const Str Pool& pool=r.pool(); const String& serror=params->as_string(0, "message must be string"); - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "%s", serror.cstr()); } +/// @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( url.as_string(), method_name, protocol2driver_and_client); - Exception rethrow_me; +#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 // remember/set current connection SQL_Connection *saved_connection=r.connection; r.connection=&connection; // execute body - bool body_failed=false; - PTRY - r.write_assign_lang(r.process(body_code)); - PCATCH(e) { // connect/process problem - rethrow_me=e; body_failed=true; - } - PEND_CATCH - - bool finalizer_failed=false; - PTRY - // FINALLY - if(body_failed) - connection.rollback(); - else + try { + try { + r.write_assign_lang(r.process(body_code)); + connection.commit(); - PCATCH(e) { // commit/rollback problem - rethrow_me=e; finalizer_failed=true; + } 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; } - PEND_CATCH + // and anyway // close connection [cache it] connection.close(); // recall current connection from remembered r.connection=saved_connection; - - if(body_failed || finalizer_failed) // were there an exception for us to rethrow? - PTHROW(rethrow_me.type(), rethrow_me.code(), - rethrow_me.problem_source(), - rethrow_me.comment()); } #ifndef DOXYGEN @@ -300,7 +314,7 @@ static void _case(Request& r, const Stri Switch_data *data=static_cast(r.classes_conf.get(*switch_data_name)); if(!data) - PTHROW(0, 0, + throw Exception(0, 0, &method_name, "without switch"); @@ -327,6 +341,110 @@ 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(Pool& pool, const String& file_spec) { + file_delete(pool, file_spec, false/*fail_on_read_problem*/); +} +void cache_put(Pool& pool, const String& file_spec, const String& data_string) { + 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; + + file_write(pool, + file_spec, + data, data_size, + false/*as_text*/); +} +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*/)) + 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(pool, 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; + // {file_spec} modification time + if(!file_stat(file_spec, size, atime, mtime, ctime, false/*no exception on error*/) + || (time(0)-mtime) > lifespan) // cached file expired + cache_delete(pool, file_spec); + else + 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; + } + } else // 'lifespan'=0, forget cached copy + cache_delete(pool, file_spec); + + // process + Value& processed_body=r.process(body_code); + + // put it to cache if 'lifespan' specified + if(lifespan) + cache_put(pool, file_spec, processed_body.as_string()); + + // write it out + r.write_assign_lang(processed_body); +} + // constructor MOP::MOP(Pool& apool) : Methoded(apool), @@ -340,7 +458,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); @@ -357,7 +475,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) @@ -371,6 +489,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}