X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_z3950_client.cpp;h=9bcbfc4e263a074cfb1e1afa6ed6d860c7b7c8e2;hb=d0123337d70b0fb97b578cc57467bb94980f1014;hp=485c41966c3f8a98bb78a26a0b9eec68b852191b;hpb=0ca83fd98df8c2c62e755d087e95bb013970883e;p=metaproxy-moved-to-github.git diff --git a/src/filter_z3950_client.cpp b/src/filter_z3950_client.cpp index 485c419..9bcbfc4 100644 --- a/src/filter_z3950_client.cpp +++ b/src/filter_z3950_client.cpp @@ -1,5 +1,5 @@ /* This file is part of Metaproxy. - Copyright (C) 2005-2008 Index Data + Copyright (C) 2005-2009 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 @@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include +#include #include #include @@ -69,6 +70,7 @@ namespace metaproxy_1 { int m_queue_len; int m_time_elapsed; int m_time_max; + int m_time_connect_max; std::string m_host; }; @@ -76,6 +78,7 @@ namespace metaproxy_1 { public: // number of seconds to wait before we give up request int m_timeout_sec; + int m_max_sockets; std::string m_default_target; std::string m_force_target; boost::mutex m_mutex; @@ -98,7 +101,7 @@ yf::Z3950Client::Assoc::Assoc(yazpp_1::SocketManager *socket_manager, m_socket_manager(socket_manager), m_PDU_Observable(PDU_Observable), m_package(0), m_in_use(true), m_waiting(false), m_destroyed(false), m_connected(false), m_queue_len(1), - m_time_elapsed(0), m_time_max(timeout_sec), + m_time_elapsed(0), m_time_max(timeout_sec), m_time_connect_max(10), m_host(host) { // std::cout << "create assoc " << this << "\n"; @@ -137,7 +140,8 @@ void yf::Z3950Client::Assoc::failNotify() void yf::Z3950Client::Assoc::timeoutNotify() { m_time_elapsed++; - if (m_time_elapsed >= m_time_max) + if ((m_connected && m_time_elapsed >= m_time_max) + || (!m_connected && m_time_elapsed >= m_time_connect_max)) { m_waiting = false; @@ -181,6 +185,7 @@ yazpp_1::IPDU_Observer *yf::Z3950Client::Assoc::sessionNotify( yf::Z3950Client::Z3950Client() : m_p(new yf::Z3950Client::Rep) { m_p->m_timeout_sec = 30; + m_p->m_max_sockets = 0; } yf::Z3950Client::~Z3950Client() { @@ -200,11 +205,18 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) package.move(); return 0; } + + int max_sockets = package.origin().get_max_sockets(); + if (max_sockets == 0) + max_sockets = m_max_sockets; + + std::string host; + it = m_clients.find(package.session()); if (it != m_clients.end()) { it->second->m_queue_len++; - while(true) + while (true) { #if 0 // double init .. NOT working yet @@ -246,7 +258,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) target = m_default_target; std::list vhosts; mp::util::remove_vhost_otherinfo(&apdu->u.initRequest->otherInfo, - vhosts); + vhosts); size_t no_vhosts = vhosts.size(); if (no_vhosts == 1) { @@ -262,7 +274,7 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) package.response() = odr.create_initResponse( apdu, YAZ_BIB1_INIT_NEGOTIATION_OPTION_REQUIRED, - "z3950_client: No virtal host given"); + "z3950_client: No vhost given"); package.session().close(); return 0; @@ -279,14 +291,59 @@ yf::Z3950Client::Assoc *yf::Z3950Client::Rep::get_assoc(Package &package) return 0; } } + std::list dblist; - std::string host; mp::util::split_zurl(target, host, dblist); if (dblist.size()) { ; // z3950_client: Databases in vhost ignored } + + // see if we have reached max number of clients (max-sockets) + + while (max_sockets) + { + int no_not_in_use = 0; + int number = 0; + it = m_clients.begin(); + for (; it != m_clients.end(); it++) + { + yf::Z3950Client::Assoc *as = it->second; + if (!strcmp(as->get_hostname(), host.c_str())) + { + number++; + if (!as->m_in_use) + no_not_in_use++; + } + } + yaz_log(YLOG_LOG, "Found %d/%d connections for %s", number, max_sockets, + host.c_str()); + if (number < max_sockets) + break; + if (no_not_in_use == 0) // all in use.. + { + mp::odr odr; + + package.response() = odr.create_initResponse( + apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "max sessions"); + package.session().close(); + return 0; + } + boost::xtime xt; + xtime_get(&xt, boost::TIME_UTC); + + xt.sec += 15; + if (!m_cond_session_ready.timed_wait(lock, xt)) + { + mp::odr odr; + + package.response() = odr.create_initResponse( + apdu, YAZ_BIB1_TEMPORARY_SYSTEM_ERROR, "max sessions"); + package.session().close(); + return 0; + } + } yazpp_1::SocketManager *sm = new yazpp_1::SocketManager; yazpp_1::PDU_Assoc *pdu_as = new yazpp_1::PDU_Assoc(sm); @@ -366,17 +423,13 @@ void yf::Z3950Client::Rep::release_assoc(Package &package) { // destroy hint (send_and_receive) it->second->m_destroyed = true; - - // wait until no one is waiting for it. - while (it->second->m_queue_len) - m_cond_session_ready.wait(lock); - - // the Z_Assoc and PDU_Assoc must be destroyed before - // the socket manager.. so pull that out.. first.. - yazpp_1::SocketManager *s = it->second->m_socket_manager; - delete it->second; // destroy Z_Assoc - delete s; // then manager - m_clients.erase(it); + if (it->second->m_queue_len == 0) + { + yazpp_1::SocketManager *s = it->second->m_socket_manager; + delete it->second; // destroy Z_Assoc + delete s; // then manager + m_clients.erase(it); + } } m_cond_session_ready.notify_all(); } @@ -410,6 +463,10 @@ void yf::Z3950Client::configure(const xmlNode *ptr, bool test_only) { m_p->m_force_target = mp::xml::get_text(ptr); } + else if (!strcmp((const char *) ptr->name, "max-sockets")) + { + m_p->m_max_sockets = mp::xml::get_int(ptr->children, 0); + } else { throw mp::filter::FilterException("Bad element " @@ -435,8 +492,9 @@ extern "C" { /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil - * c-file-style: "stroustrup" * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +