--- parser3/src/classes/op.C 2001/11/22 12:40:48 1.62 +++ parser3/src/classes/op.C 2002/01/25 11:33:45 1.68 @@ -4,11 +4,10 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: op.C,v 1.62 2001/11/22 12:40:48 paf Exp $ + $Id: op.C,v 1.68 2002/01/25 11:33:45 paf Exp $ */ #include "classes.h" -#include "pa_config_includes.h" #include "pa_common.h" #include "pa_request.h" #include "pa_vint.h" @@ -125,7 +124,10 @@ static void _process(Request& r, const S // process source code, append processed methods to 'self' class // maybe-define new @main - r.use_buf(source.cstr(String::UL_UNSPECIFIED, r.connection), 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)) { @@ -232,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 @@ -326,6 +324,107 @@ 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*/); +} +void cache_put(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( + 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(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(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(file_spec); + + // process + Value& processed_body=r.process(body_code); + + // put it to cache if 'lifespan' specified + if(lifespan) + cache_put(file_spec, processed_body.as_string()); + + // write it out + r.write_assign_lang(processed_body); +} + // constructor MOP::MOP(Pool& apool) : Methoded(apool), @@ -370,6 +469,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}