/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-proxy.cpp,v $
- * Revision 1.11 1999-12-06 13:52:45 adam
+ * Revision 1.14 2000-08-10 08:42:42 adam
+ * Fixes for {set,get}_APDU_log.
+ *
+ * Revision 1.13 2000/08/07 14:19:59 adam
+ * Fixed serious bug regarding timeouts. Improved logging for proxy.
+ *
+ * Revision 1.12 2000/07/04 13:48:49 adam
+ * Implemented upper-limit on proxy-to-target sessions.
+ *
+ * Revision 1.11 1999/12/06 13:52:45 adam
* Modified for new location of YAZ header files. Experimental threaded
* operation.
*
*/
#include <assert.h>
+#include <time.h>
#include <yaz/log.h>
#include <yaz-proxy.h>
m_seqno = 1;
m_keepalive = 1;
m_proxyTarget = 0;
+ m_max_clients = 50;
+ m_seed = time(0);
}
Yaz_Proxy::~Yaz_Proxy()
xfree (m_proxyTarget);
}
-
void Yaz_Proxy::set_proxyTarget(const char *target)
{
xfree (m_proxyTarget);
{
Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable);
new_proxy->m_parent = this;
- new_proxy->timeout(20);
+ new_proxy->timeout(120);
new_proxy->set_proxyTarget(m_proxyTarget);
+ new_proxy->set_APDU_log(get_APDU_log());
return new_proxy;
}
assert (*c->m_prev == c);
if (!strcmp(cookie,c->m_cookie))
{
- logf (LOG_LOG, "Yaz_Proxy::get_client found cached target");
+ logf (LOG_LOG, "Yaz_Proxy::get_client cached %s",
+ c->get_hostname());
+ c->m_seqno = parent->m_seqno;
return c;
}
}
}
if (!m_proxyTarget)
return 0;
- logf (LOG_LOG, "Yaz_Proxy::get_client creating new");
- c = new Yaz_ProxyClient(m_PDU_Observable->clone());
- c->m_next = parent->m_clientPool;
- if (c->m_next)
- c->m_next->m_prev = &c->m_next;
- parent->m_clientPool = c;
- c->m_prev = &parent->m_clientPool;
-
- sprintf (c->m_cookie, "%d", parent->m_seqno);
- (parent->m_seqno)++;
+ Yaz_ProxyClient *c_min = 0;
+ int min_seq = -1;
+ int no_of_clients = 0;
+ for (c = parent->m_clientPool; c; c = c->m_next)
+ {
+ no_of_clients++;
+ logf (LOG_LOG, "found seqno = %d", c->m_seqno);
+ if (min_seq < 0 || c->m_seqno < min_seq)
+ {
+ min_seq = c->m_seqno;
+ c_min = c;
+ }
+ }
+ if (no_of_clients >= parent->m_max_clients)
+ {
+ c = c_min;
+ logf (LOG_LOG, "Yaz_Proxy::get_client re-using session %d",
+ c->m_seqno);
+ if (c->m_server)
+ delete c->m_server;
+ c->m_server = 0;
+ }
+ else
+ {
+ logf (LOG_LOG, "Yaz_Proxy::get_client making session %d",
+ parent->m_seqno);
+ c = new Yaz_ProxyClient(m_PDU_Observable->clone());
+ c->m_next = parent->m_clientPool;
+ if (c->m_next)
+ c->m_next->m_prev = &c->m_next;
+ parent->m_clientPool = c;
+ c->m_prev = &parent->m_clientPool;
+ }
+ sprintf (c->m_cookie, "%lx.%d", m_seed, parent->m_seqno);
+ logf (LOG_LOG, "Yaz_Proxy::get_client connect to %s", m_proxyTarget);
+ c->m_seqno = parent->m_seqno;
c->client(m_proxyTarget);
+ c->m_init_flag = 0;
+
+ delete c->m_last_query;
+ c->m_last_query = 0;
+ c->m_last_resultCount = 0;
+ c->m_sr_transform = 0;
+
c->timeout(600);
+
+ (parent->m_seqno)++;
}
return c;
}
m_client->m_last_resultCount < *sr->largeSetLowerBound)
{
// medium Set
+ logf (LOG_LOG, "Yaz_Proxy::result_set_optimize medium set");
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
Z_PresentRequest *pr = new_apdu->u.presentRequest;
pr->referenceId = sr->referenceId;
m_client->m_sr_transform = 1;
return new_apdu;
}
- else if (m_client->m_last_resultCount >= *sr->largeSetLowerBound ||
+ else if (m_client->m_last_resultCount > *sr->largeSetLowerBound ||
m_client->m_last_resultCount == 0)
{
// large set
+ logf (LOG_LOG, "Yaz_Proxy::result_set_optimize large set");
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_searchResponse);
new_apdu->u.searchResponse->referenceId = sr->referenceId;
new_apdu->u.searchResponse->resultCount =
else
{
// small set
+ logf (LOG_LOG, "Yaz_Proxy::result_set_optimize small set");
Z_APDU *new_apdu = create_Z_PDU(Z_APDU_presentRequest);
Z_PresentRequest *pr = new_apdu->u.presentRequest;
pr->referenceId = sr->referenceId;
}
else
{
- logf (LOG_LOG, "query doesn't match");
+ logf (LOG_LOG, "Yaz_Proxy::result_set_optimize new set");
delete m_client->m_last_query;
m_client->m_last_query = this_query;
}
if (!apdu)
return;
- logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU");
+ logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU %s", m_client->get_hostname());
if (m_client->send_Z_PDU(apdu) < 0)
{
delete m_client;
void Yaz_ProxyClient::shutdown()
{
- logf (LOG_LOG, "shutdown (proxy to server)");
+ logf (LOG_LOG, "shutdown (proxy to server) %s", get_hostname());
delete m_server;
delete this;
}
void Yaz_ProxyClient::failNotify()
{
- logf (LOG_LOG, "connection closed by server");
+ logf (LOG_LOG, "Yaz_ProxyClient connection closed by %s", get_hostname());
shutdown();
}
void Yaz_ProxyClient::connectNotify()
{
- logf (LOG_LOG, "connection accepted by target");
+ logf (LOG_LOG, "Yaz_ProxyClient connection accept by %s", get_hostname());
}
IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable
void Yaz_ProxyClient::timeoutNotify()
{
- logf (LOG_LOG, "timeout (proxy to target)");
+ logf (LOG_LOG, "timeout (proxy to target) %s", get_hostname());
shutdown();
}
void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
{
- logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU");
+ logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU %s", get_hostname());
if (apdu->which == Z_APDU_searchResponse)
m_last_resultCount = *apdu->u.searchResponse->resultCount;
if (apdu->which == Z_APDU_presentResponse && m_sr_transform)
projects / yazpp-moved-to-github.git / blobdiff