--- parser3/src/classes/op.C 2001/07/07 16:38:01 1.34 +++ parser3/src/classes/op.C 2001/12/07 15:24:46 1.63 @@ -2,10 +2,10 @@ Parser: parser @b operators. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) + $Id: op.C,v 1.63 2001/12/07 15:24:46 paf Exp $ */ -static const char *RCSId="$Id: op.C,v 1.34 2001/07/07 16:38:01 parser Exp $"; #include "classes.h" #include "pa_config_includes.h" @@ -22,16 +22,6 @@ static const char *RCSId="$Id: op.C,v 1. #define OP_CLASS_NAME "OP" -#define MAIN_SQL_NAME "SQL" -#define MAIN_SQL_DRIVERS_NAME "drivers" - -#define SWITCH_DATA_NAME "SWITCH-DATA" -#define DEFAULT_VALUE "DEFAULT" - -// local variable - -static Methoded *OP; - // class class MOP : public Methoded { @@ -40,6 +30,7 @@ public: public: // Methoded bool used_directly() { return true; } void configure_user(Request& r); + private: String main_sql_name; String main_sql_drivers_name; @@ -48,30 +39,34 @@ private: // methods static void _if(Request& r, const String&, MethodParams *params) { - Value& condition_code=params->get(0); + Value& condition_code=params->as_junction(0, "condition must be expression"); bool condition=r.process(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"))); - else if(params->size()==3) + else if(params->size()>2) r.write_pass_lang(r.process(params->as_junction(2, "'else' parameter must be code"))); } static void _untaint(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& lang_name=r.process(params->get(0)).as_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 @@ -81,16 +76,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= - r.process(params->get(0)).as_string(); - lang=static_cast( - untaint_lang_name2enum->get_int(lang_name)); + const String& lang_name=params->as_string(0, "lang must be string"); + lang=untaint_lang_name2enum->get_int(lang_name); if(!lang) - PTHROW(0, 0, + throw Exception(0, 0, &lang_name, "invalid taint language"); } @@ -116,7 +109,7 @@ static void _process(Request& r, const S origin.file, 1+origin.line, method_name.cstr()); #else - strncpy(place, MAX_STRING, method_name.cstr()); + strncpy(place, method_name.cstr(), MAX_STRING-1); place[MAX_STRING-1]=0; #endif VStateless_class& self_class=*r.self->get_class(); @@ -128,11 +121,11 @@ static void _process(Request& r, const S // evaluate source to process const String& source= - r.process(params->get(0)).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)) { @@ -156,7 +149,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"); @@ -175,33 +168,33 @@ static void _while(Request& r, const Str static void _use(Request& r, const String& method_name, MethodParams *params) { Value& vfile=params->as_no_junction(0, "file name must not be code"); - r.use_file(r.absolute(vfile.as_string())); + r.use_file(vfile.as_string()); } static void _for(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); - const String& var_name=r.process(params->get(0)).as_string(); - int from=r.process(params->get(1)).as_int(); - int to=r.process(params->get(2)).as_int(); + const String& var_name=params->as_string(0, "var name must be string"); + int from=params->as_int(1, "from must be int", r); + int to=params->as_int(2, "to must be int", r); Value& body_code=params->as_junction(3, "body must be code"); - Value *delim_code=params->size()==3+1+1?¶ms->get(3+1):0; + 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.root->put_element(var_name, vint); Value& processed_body=r.process(body_code); - if(delim_code) { // delimiter set? + 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_code)); + r.write_pass_lang(r.process(*delim_maybe_code)); need_delim=true; } r.write_pass_lang(processed_body); @@ -214,7 +207,7 @@ static void _eval(Request& r, const Stri Value *result=r.process(expr, 0/*no name YET*/, true/*don't intercept string*/).as_expr_result(); - if(params->size()==2) { + if(params->size()>1) { Value& fmt=params->as_no_junction(1, "fmt must not be code"); Pool& pool=r.pool(); @@ -226,65 +219,84 @@ static void _eval(Request& r, const Stri r.write_no_lang(*result); } - -static void _connect(Request& r, const String&, MethodParams *params) { +static void _error(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); + const String& serror=params->as_string(0, "message must be string"); + 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(OP->name())); + 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(), protocol2driver_and_client); + url.as_string(), method_name, protocol2driver_and_client); + +#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; - Exception rethrow_me; +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()); } -static String *switch_data_name; -static String *default_value; - +#ifndef DOXYGEN struct Switch_data { Value *searching; Value *found; Value *_default; }; - +#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))}; @@ -298,32 +310,138 @@ static void _switch(Request& r, const St r.write_pass_lang(r.process(*code)); } -static void _case(Request& r, const String&, MethodParams *params) { - Switch_data& data=*static_cast(r.classes_conf.get(*switch_data_name)); +static void _case(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + + Switch_data *data=static_cast(r.classes_conf.get(*switch_data_name)); + if(!data) + throw Exception(0, 0, + &method_name, + "without switch"); int count=params->size(); Value *code=¶ms->as_junction(--count, "case result must be code"); for(int i=0; iget(i)); - if(value.as_string() == *default_value) { - data._default=code; + if(value.as_string() == *case_default_value) { + data->_default=code; break; } bool matches; - if(data.searching->is_string()) - matches=data.searching->as_string() == value.as_string(); + if(data->searching->is_string()) + matches=data->searching->as_string() == value.as_string(); else - matches=data.searching->as_double() == value.as_double(); + matches=data->searching->as_double() == value.as_double(); if(matches) { - data.found=code; + data->found=code; break; } } } +// 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, "key must be string"); + 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), @@ -332,15 +450,12 @@ MOP::MOP(Pool& apool) : Methoded(apool), { set_name(*NEW String(pool(), OP_CLASS_NAME)); - switch_data_name=NEW String(pool(), SWITCH_DATA_NAME); - default_value=NEW String(pool(), DEFAULT_VALUE); - // ^if(condition){code-when-true} // ^if(condition){code-when-true}{code-when-false} 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); @@ -349,7 +464,7 @@ MOP::MOP(Pool& apool) : Methoded(apool), add_native_method("process", Method::CT_ANY, _process, 1, 1); // ^rem{code} - add_native_method("rem", Method::CT_ANY, _rem, 1, 1000); + add_native_method("rem", Method::CT_ANY, _rem, 1, 10000); // ^while(condition){code} add_native_method("while", Method::CT_ANY, _while, 2, 2); @@ -357,33 +472,39 @@ 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) // ^eval(expr)[format] add_native_method("eval", Method::CT_ANY, _eval, 1, 2); + // ^error[msg] + add_native_method("error", Method::CT_ANY, _error, 1, 1); + // ^connect[protocol://user:pass@host[:port]/database]{code with ^sql-s} add_native_method("connect", Method::CT_ANY, _connect, 2, 2); + + // ^cache[file_spec](time){code} time=0 no cache + add_native_method("cache", Method::CT_ANY, _cache, 3, 3); + // switch // ^switch[value]{cases} add_native_method("switch", Method::CT_ANY, _switch, 2, 2); // ^case[value]{code} - add_native_method("case", Method::CT_ANY, _case, 2, 1000); + add_native_method("case", Method::CT_ANY, _case, 2, 10000); } // constructor & configurator Methoded *MOP_create(Pool& pool) { - return OP=new(pool) MOP(pool); + return new(pool) MOP(pool); } - void MOP::configure_user(Request& r) { Pool& pool=r.pool();