X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_frontend_net.cpp;h=b347ad2d4bad4f836c50a1e2ec503ffd1e670e75;hb=6f5c65bac85dca97e514041d015ab10b669fac4a;hp=f19e6d41cac4014ead875f8fe3d9a9ee36981a19;hpb=e871b8cd25b12cd9944201319d1b52c4472d8a5f;p=metaproxy-moved-to-github.git diff --git a/src/filter_frontend_net.cpp b/src/filter_frontend_net.cpp index f19e6d4..b347ad2 100644 --- a/src/filter_frontend_net.cpp +++ b/src/filter_frontend_net.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2011 Index Data + Copyright (C) 2005-2012 Index Data Metaproxy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -18,6 +18,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "config.hpp" +#include +#include #include #include "pipe.hpp" #include @@ -28,6 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include +#include #include #include @@ -51,6 +54,7 @@ namespace metaproxy_1 { int m_listen_duration; int m_session_timeout; int m_connect_max; + std::string m_msg_config; yazpp_1::SocketManager mySocketManager; ZAssocServer **az; }; @@ -69,9 +73,10 @@ namespace metaproxy_1 { public: ~ZAssocChild(); ZAssocChild(yazpp_1::IPDU_Observable *the_PDU_Observable, - mp::ThreadPoolSocketObserver *m_thread_pool_observer, + mp::ThreadPoolSocketObserver *m_thread_pool_observer, const mp::Package *package, - std::string route); + std::string route, + const char *msg_config); int m_no_requests; std::string m_route; private: @@ -89,25 +94,28 @@ namespace metaproxy_1 { mp::Origin m_origin; bool m_delete_flag; const mp::Package *m_package; + const char *m_msg_config; }; class ThreadPoolPackage : public mp::IThreadPoolMsg { public: - ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses) : - m_assoc_child(ses), m_package(package) { }; + ThreadPoolPackage(mp::Package *package, mp::ZAssocChild *ses, + const char *msg_config); ~ThreadPoolPackage(); IThreadPoolMsg *handle(); - void result(); - + void result(const char *t_info); + bool cleanup(void *info); private: + yaz_timing_t timer; mp::ZAssocChild *m_assoc_child; mp::Package *m_package; - + const char *m_msg_config; }; class ZAssocServer : public yazpp_1::Z_Assoc { public: ~ZAssocServer(); ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout, - int connect_max, std::string route); + int connect_max, std::string route, + const char *msg_config); void set_package(const mp::Package *package); void set_thread_pool(ThreadPoolSocketObserver *m_thread_pool_observer); private: @@ -126,15 +134,35 @@ namespace metaproxy_1 { int m_connect_max; yazpp_1::LimitConnect limit_connect; std::string m_route; + const char *m_msg_config; }; } +mp::ThreadPoolPackage::ThreadPoolPackage(mp::Package *package, + mp::ZAssocChild *ses, + const char *msg_config) : + m_assoc_child(ses), m_package(package), m_msg_config(msg_config) +{ + if (msg_config) + timer = yaz_timing_create(); + else + timer = 0; +} + mp::ThreadPoolPackage::~ThreadPoolPackage() { + yaz_timing_destroy(&timer); // timer may be NULL delete m_package; } -void mp::ThreadPoolPackage::result() +bool mp::ThreadPoolPackage::cleanup(void *info) +{ + mp::Session *ses = (mp::Session *) info; + + return *ses == m_package->session(); +} + +void mp::ThreadPoolPackage::result(const char *t_info) { m_assoc_child->m_no_requests--; @@ -179,6 +207,20 @@ void mp::ThreadPoolPackage::result() { m_assoc_child->close(); } + + if (m_msg_config) + { + yaz_timing_stop(timer); + double duration = yaz_timing_get_real(timer); + + std::ostringstream os; + os << m_msg_config << " " + << *m_package << " " + << std::fixed << std::setprecision (6) << duration; + + yaz_log(YLOG_LOG, "%s %s", os.str().c_str(), t_info); + } + delete this; } @@ -190,10 +232,11 @@ mp::IThreadPoolMsg *mp::ThreadPoolPackage::handle() mp::ZAssocChild::ZAssocChild(yazpp_1::IPDU_Observable *PDU_Observable, - mp::ThreadPoolSocketObserver *my_thread_pool, + mp::ThreadPoolSocketObserver *my_thread_pool, const mp::Package *package, - std::string route) - : Z_Assoc(PDU_Observable) + std::string route, + const char *msg_config) + : Z_Assoc(PDU_Observable), m_msg_config(msg_config) { m_thread_pool_observer = my_thread_pool; m_no_requests = 0; @@ -223,8 +266,9 @@ void mp::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len) mp::Package *p = new mp::Package(m_session, m_origin); - mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this); - p->copy_filter(*m_package); + mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this, + m_msg_config); + p->copy_route(*m_package); p->request() = yazpp_1::GDU(z_pdu); m_thread_pool_observer->put(tp); } @@ -244,9 +288,11 @@ void mp::ZAssocChild::failNotify() mp::Package *p = new mp::Package(m_session, m_origin); - mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this); - p->copy_filter(*m_package); - m_thread_pool_observer->put(tp); + mp::ThreadPoolPackage *tp = new mp::ThreadPoolPackage(p, this, + m_msg_config); + p->copy_route(*m_package); + m_thread_pool_observer->cleanup(tp, &m_session); + m_thread_pool_observer->put(tp); } void mp::ZAssocChild::timeoutNotify() @@ -261,9 +307,9 @@ void mp::ZAssocChild::connectNotify() mp::ZAssocServer::ZAssocServer(yazpp_1::IPDU_Observable *PDU_Observable, int timeout, int connect_max, - std::string route) + std::string route, const char *msg_config) : Z_Assoc(PDU_Observable), m_session_timeout(timeout), - m_connect_max(connect_max), m_route(route) + m_connect_max(connect_max), m_route(route), m_msg_config(msg_config) { m_package = 0; } @@ -294,7 +340,7 @@ yazpp_1::IPDU_Observer *mp::ZAssocServer::sessionNotify(yazpp_1::IPDU_Observable } mp::ZAssocChild *my = new mp::ZAssocChild(the_PDU_Observable, m_thread_pool_observer, - m_package, m_route); + m_package, m_route, m_msg_config); my->timeout(m_session_timeout); return my; } @@ -385,7 +431,8 @@ void mp::filter::FrontendNet::process(Package &package) const delete tt; } -void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) +void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only, + const char *path) { if (!ptr || !ptr->children) { @@ -431,6 +478,10 @@ void mp::filter::FrontendNet::configure(const xmlNode * ptr, bool test_only) { m_p->m_connect_max = mp::xml::get_int(ptr, 0); } + else if (!strcmp((const char *) ptr->name, "message")) + { + m_p->m_msg_config = mp::xml::get_text(ptr); + } else { throw mp::filter::FilterException("Bad element " @@ -477,7 +528,9 @@ void mp::filter::FrontendNet::set_ports(std::vector &ports) m_p->az[i] = new mp::ZAssocServer(as, m_p->m_session_timeout, m_p->m_connect_max, - m_p->m_ports[i].route); + m_p->m_ports[i].route, + m_p->m_msg_config.length() > 0 ? + m_p->m_msg_config.c_str() : 0); if (m_p->az[i]->server(m_p->m_ports[i].port.c_str())) { throw mp::filter::FilterException("Unable to bind to address "