-/* $Id: filter_z3950_client.cpp,v 1.10 2005-11-03 14:45:16 adam Exp $
+/* $Id: filter_z3950_client.cpp,v 1.14 2006-01-04 11:19:04 adam Exp $
Copyright (c) 2005, Index Data.
%LICENSE%
#include "config.hpp"
-#include <map>
#include "filter.hpp"
#include "router.hpp"
#include "package.hpp"
+#include "util.hpp"
+#include "filter_z3950_client.hpp"
+
+#include <map>
+#include <stdexcept>
+#include <list>
+#include <iostream>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
-#include "util.hpp"
-#include "filter_z3950_client.hpp"
-
#include <yaz/zgdu.h>
#include <yaz/log.h>
#include <yaz/otherinfo.h>
#include <yaz++/pdu-assoc.h>
#include <yaz++/z-assoc.h>
-#include <iostream>
-
namespace yf = yp2::filter;
namespace yp2 {
namespace filter {
class Z3950Client::Assoc : public yazpp_1::Z_Assoc{
friend class Rep;
- public:
Assoc(yazpp_1::SocketManager *socket_manager,
yazpp_1::IPDU_Observable *PDU_Observable,
std::string host);
yazpp_1::IPDU_Observer* sessionNotify(
yazpp_1::IPDU_Observable *the_PDU_Observable,
int fd);
- private:
- // yp2::Session m_session_id;
+
yazpp_1::SocketManager *m_socket_manager;
yazpp_1::IPDU_Observable *m_PDU_Observable;
Package *m_package;
bool m_in_use;
bool m_waiting;
+ bool m_destroyed;
bool m_connected;
+ int m_queue_len;
+ int m_ticks;
std::string m_host;
};
std::string host)
: Z_Assoc(PDU_Observable),
m_socket_manager(socket_manager), m_PDU_Observable(PDU_Observable),
- m_package(0), m_in_use(true), m_waiting(false), m_connected(false),
+ m_package(0), m_in_use(true), m_waiting(false),
+ m_destroyed(false), m_connected(false), m_queue_len(1), m_ticks(0),
m_host(host)
{
// std::cout << "create assoc " << this << "\n";
void yf::Z3950Client::Assoc::timeoutNotify()
{
- m_waiting = false;
-
- yp2::odr odr;
-
- if (m_package)
+ std::cout << "TIMEOUT NOTIFY\n";
+ m_ticks++;
+ if (m_ticks == 30)
{
- m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0);
- m_package->session().close();
+ m_waiting = false;
+
+ yp2::odr odr;
+
+ if (m_package)
+ {
+ if (m_connected)
+ m_package->response() = odr.create_close(Z_Close_lackOfActivity, 0);
+ else
+ m_package->response() = odr.create_close(Z_Close_peerAbort, 0);
+
+ m_package->session().close();
+ }
}
}
std::map<yp2::Session,yf::Z3950Client::Assoc *>::iterator it;
- while(true)
- {
- it = m_clients.find(package.session());
- if (it == m_clients.end())
- break;
-
- if (!it->second->m_in_use)
- {
- it->second->m_in_use = true;
- return it->second;
- }
- m_cond_session_ready.wait(lock);
- }
-
- // only deal with Z39.50
Z_GDU *gdu = package.request().get();
-
+ // only deal with Z39.50
if (!gdu || gdu->which != Z_GDU_Z3950)
{
package.move();
return 0;
}
- Z_APDU *apdu = gdu->u.z3950;
-
+ it = m_clients.find(package.session());
+ if (it != m_clients.end())
+ {
+ it->second->m_queue_len++;
+ while(true)
+ {
+#if 0
+ if (gdu && gdu->which == Z_GDU_Z3950 &&
+ gdu->u.z3950->which == Z_APDU_initRequest)
+ {
+ yazpp_1::SocketManager *s = it->second->m_socket_manager;
+ delete it->second; // destroy Z_Assoc
+ delete s; // then manager
+ m_clients.erase(it);
+ break;
+ }
+#endif
+ if (!it->second->m_in_use)
+ {
+ it->second->m_in_use = true;
+ return it->second;
+ }
+ m_cond_session_ready.wait(lock);
+ }
+ }
// new Z39.50 session ..
-
+ Z_APDU *apdu = gdu->u.z3950;
// check that it is init. If not, close
if (apdu->which != Z_APDU_initRequest)
{
yp2::odr odr;
package.response() = odr.create_close(Z_Close_protocolError,
- "no init request for session");
+ "First PDU was not an "
+ "Initialize Request");
package.session().close();
return 0;
}
{
Z_GDU *gdu = package.request().get();
+ if (c->m_destroyed)
+ return;
+
if (!gdu || gdu->which != Z_GDU_Z3950)
return;
+ c->m_ticks = 0;
c->m_package = &package;
c->m_waiting = true;
if (!c->m_connected)
{
c->client(c->m_host.c_str());
+ c->timeout(1);
- while (c->m_waiting && c->m_socket_manager->processEvent() > 0)
+ while (!c->m_destroyed && c->m_waiting
+ && c->m_socket_manager->processEvent() > 0)
;
}
if (!c->m_connected)
}
// prepare response
+ c->m_ticks = 0;
c->m_waiting = true;
// relay the package ..
int len;
c->send_GDU(gdu, &len);
-
- while (c->m_waiting && c->m_socket_manager->processEvent() > 0)
- ;
+
+ switch(gdu->u.z3950->which)
+ {
+ case Z_APDU_triggerResourceControlRequest:
+ // request only..
+ break;
+ default:
+ // for the rest: wait for a response PDU
+ while (!c->m_destroyed && c->m_waiting
+ && c->m_socket_manager->processEvent() > 0)
+ ;
+ break;
+ }
}
void yf::Z3950Client::Rep::release_assoc(Package &package)
it = m_clients.find(package.session());
if (it != m_clients.end())
{
+ Z_GDU *gdu = package.request().get();
+ if (gdu && gdu->which == Z_GDU_Z3950)
+ { // only Z39.50 packages lock in get_assoc.. release it
+ it->second->m_in_use = false;
+ it->second->m_queue_len--;
+ }
+
if (package.session().is_closed())
{
+ // 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 s; // then manager
m_clients.erase(it);
}
- else
- {
- it->second->m_in_use = false;
- }
m_cond_session_ready.notify_all();
}
}
}
+static yp2::filter::Base* filter_creator()
+{
+ return new yp2::filter::Z3950Client;
+}
+
+extern "C" {
+ const struct yp2_filter_struct yp2_filter_z3950_client = {
+ 0,
+ "z3950_client",
+ filter_creator
+ };
+}
+
/*
* Local variables:
* c-basic-offset: 4
projects / metaproxy-moved-to-github.git / blobdiff