#include <map>
#include <iostream>
#include <time.h>
+#include <limits.h>
namespace mp = metaproxy_1;
namespace yf = metaproxy_1::filter;
yazpp_1::GDU m_init_request;
yazpp_1::GDU m_init_response;
boost::mutex m_mutex_backend_class;
+ boost::condition m_cond_set_ready;
int m_sequence_top;
time_t m_backend_set_ttl;
time_t m_backend_expiry_ttl;
size_t m_backend_set_max;
Odr_int m_preferredMessageSize;
Odr_int m_maximumRecordSize;
+ int m_no_failed;
+ int m_no_succeeded;
+ int m_no_init;
public:
BackendClass(const yazpp_1::GDU &init_request,
int resultset_ttl,
void release_frontend(Package &package);
Rep();
public:
+ ~Rep();
void expire();
private:
void expire_classes();
void start();
boost::mutex m_mutex;
boost::condition m_cond_session_ready;
+ boost::condition m_cond_expire_ready;
std::map<mp::Session, FrontendPtr> m_clients;
BackendClassMap m_backend_map;
int m_session_max;
Odr_int m_preferredMessageSize;
Odr_int m_maximumRecordSize;
+ bool close_down;
};
}
}
void yf::SessionShared::BackendClass::release_backend(BackendInstancePtr b)
{
boost::mutex::scoped_lock lock(m_mutex_backend_class);
+ m_cond_set_ready.notify_all();
b->m_in_use = false;
}
void yf::SessionShared::BackendClass::remove_backend(BackendInstancePtr b)
{
- BackendInstanceList::iterator it = m_backend_list.begin();
-
- while (it != m_backend_list.end())
{
- if (*it == b)
+ boost::mutex::scoped_lock lock(m_mutex_backend_class);
+ BackendInstanceList::iterator it = m_backend_list.begin();
+ for (;;)
{
- mp::odr odr;
- (*it)->m_close_package->response() = odr.create_close(
- 0, Z_Close_lackOfActivity, 0);
- (*it)->m_close_package->session().close();
- (*it)->m_close_package->move();
-
- it = m_backend_list.erase(it);
- }
- else
+ if (it == m_backend_list.end())
+ return;
+ if (*it == b)
+ {
+ it = m_backend_list.erase(it);
+ break;
+ }
it++;
+ }
}
+ mp::odr odr;
+ b->m_close_package->response() = odr.create_close(
+ 0, Z_Close_lackOfActivity, 0);
+ b->m_close_package->session().close();
+ b->m_close_package->move();
}
-
yf::SessionShared::BackendInstancePtr
yf::SessionShared::BackendClass::get_backend(
const mp::Package &frontend_package)
yf::SessionShared::BackendInstance::~BackendInstance()
{
+ if (m_close_package)
+ {
+ mp::odr odr;
+ m_close_package->response() = odr.create_close(
+ 0, Z_Close_lackOfActivity, 0);
+ m_close_package->session().close();
+ m_close_package->move();
+ }
delete m_close_package;
}
yf::SessionShared::BackendInstancePtr yf::SessionShared::BackendClass::create_backend(
const mp::Package &frontend_package)
{
- BackendInstancePtr bp(new BackendInstance);
BackendInstancePtr null;
-
+ {
+ boost::mutex::scoped_lock lock(m_mutex_backend_class);
+ if (m_no_failed && !m_no_succeeded)
+ {
+ m_no_failed++;
+ return null;
+ }
+ }
+ BackendInstancePtr bp(new BackendInstance);
bp->m_close_package =
new mp::Package(bp->m_session, frontend_package.origin());
bp->m_close_package->copy_filter(frontend_package);
init_package.request() = init_pdu;
+ {
+ boost::mutex::scoped_lock lock(m_mutex_backend_class);
+ m_no_init++;
+ }
+
init_package.move();
boost::mutex::scoped_lock lock(m_mutex_backend_class);
bp->m_sequence_this = 0;
bp->m_result_set_sequence = 0;
m_backend_list.push_back(bp);
+ m_no_succeeded++;
return bp;
}
}
init_package.session().close();
init_package.move();
}
+ m_no_failed++;
return null;
}
m_sequence_top(0), m_backend_set_ttl(resultset_ttl),
m_backend_expiry_ttl(session_ttl), m_backend_set_max(resultset_max),
m_preferredMessageSize(preferredMessageSize),
- m_maximumRecordSize(maximumRecordSize)
+ m_maximumRecordSize(maximumRecordSize),
+ m_no_failed(0), m_no_succeeded(0), m_no_init(0)
{}
yf::SessionShared::BackendClass::~BackendClass()
// we only need to get init response from "first" target in
// backend class - the assumption being that init response is
// same for all
- if (bc->m_backend_list.size() == 0)
+ bool create_first_one = false;
+ {
+ boost::mutex::scoped_lock lock(bc->m_mutex_backend_class);
+ if (!bc->m_no_failed && !bc->m_no_succeeded && !bc->m_no_init)
+ create_first_one = true;
+ else
+ {
+ // first for first one to finish
+ while (!bc->m_no_failed && !bc->m_no_succeeded && bc->m_no_init)
+ {
+ bc->m_cond_set_ready.wait(lock);
+ }
+ }
+ }
+ if (create_first_one)
{
BackendInstancePtr backend = bc->create_backend(package);
if (backend)
bc->release_backend(backend);
}
-
yazpp_1::GDU init_response;
{
boost::mutex::scoped_lock lock(bc->m_mutex_backend_class);
{
// look at each backend and see if we have a similar search
BackendInstanceList::const_iterator it = bc->m_backend_list.begin();
- for (; it != bc->m_backend_list.end(); it++)
+ while (it != bc->m_backend_list.end())
{
- if (!(*it)->m_in_use)
+ bool restart = false;
+ BackendSetList::const_iterator set_it = (*it)->m_sets.begin();
+ for (; set_it != (*it)->m_sets.end(); set_it++)
{
- BackendSetList::const_iterator set_it = (*it)->m_sets.begin();
- for (; set_it != (*it)->m_sets.end(); set_it++)
- {
- // for real present request we don't care
- // if additionalSearchInfo matches: same records
- if ((*set_it)->m_databases == databases
- && query.match(&(*set_it)->m_query)
- && (apdu_req->which != Z_APDU_searchRequest ||
- yaz_compare_z_OtherInformation(
- additionalSearchInfo,
+ // for real present request we don't care
+ // if additionalSearchInfo matches: same records
+ if ((*set_it)->m_databases == databases
+ && query.match(&(*set_it)->m_query)
+ && (apdu_req->which != Z_APDU_searchRequest ||
+ yaz_compare_z_OtherInformation(
+ additionalSearchInfo,
(*set_it)->additionalSearchInfoRequest)))
+ {
+ if ((*it)->m_in_use)
+ {
+ bc->m_cond_set_ready.wait(lock);
+ restart = true;
+ break;
+ }
+ else
{
found_set = *set_it;
found_backend = *it;
}
}
}
+ if (restart)
+ it = bc->m_backend_list.begin();
+ else
+ it++;
}
}
override_set(found_backend, result_set_id, databases, out_of_sessions);
BackendSetPtr new_set(new BackendSet(result_set_id,
databases, query,
additionalSearchInfo));
+
+ found_set = new_set;
+ found_set->timestamp();
+ found_backend->m_sets.push_back(found_set);
+
Z_Records *z_records = 0;
Package search_package(found_backend->m_session, package.origin());
package.response() = f_apdu;
}
bc->release_backend(found_backend);
+ found_set.reset();
return; // search error
}
}
goto restart;
}
+#if 0
found_set = new_set;
found_set->timestamp();
found_backend->m_sets.push_back(found_set);
+#endif
}
int yf::SessionShared::Frontend::result_set_ref(ODR o,
return;
Z_NamePlusRecordList *npr_res = 0;
- if (found_set->m_record_cache.lookup(odr, &npr_res,
- *req->resultSetStartPoint,
- *req->numberOfRecordsRequested,
- req->preferredRecordSyntax,
- req->recordComposition))
+ // record_cache.lookup types are int's. Avoid non-fitting values
+ if (*req->resultSetStartPoint > 0
+ && *req->resultSetStartPoint < INT_MAX
+ && *req->numberOfRecordsRequested > 0
+ && *req->numberOfRecordsRequested < INT_MAX
+ && found_set->m_record_cache.lookup(odr, &npr_res,
+ *req->resultSetStartPoint,
+ *req->numberOfRecordsRequested,
+ req->preferredRecordSyntax,
+ req->recordComposition))
{
Z_APDU *f_apdu_res = odr.create_presentResponse(apdu_req, 0, 0);
Z_PresentResponse *f_resp = f_apdu_res->u.presentResponse;
if (b_resp->records && b_resp->records->which == Z_Records_DBOSD)
{
+ Z_NamePlusRecordList *npr =
+ b_resp->records->u.databaseOrSurDiagnostics;
+ // record_cache.add types are int's. Avoid non-fitting values
+ if (*req->resultSetStartPoint > 0
+ && npr->num_records + *req->resultSetStartPoint < INT_MAX)
+ {
#if 0
- yaz_log(YLOG_LOG, "Adding " ODR_INT_PRINTF "+" ODR_INT_PRINTF
- " records to cache %p",
- *req->resultSetStartPoint,
- *f_resp->numberOfRecordsReturned,
- &found_set->m_record_cache);
+ yaz_log(YLOG_LOG, "Adding " ODR_INT_PRINTF "+" ODR_INT_PRINTF
+ " records to cache %p",
+ *req->resultSetStartPoint,
+ *f_resp->numberOfRecordsReturned,
+ &found_set->m_record_cache);
#endif
- found_set->m_record_cache.add(
- odr,
- b_resp->records->u.databaseOrSurDiagnostics,
- *req->resultSetStartPoint, p_req->recordComposition);
+ found_set->m_record_cache.add(
+ odr, npr, *req->resultSetStartPoint,
+ p_req->recordComposition);
+ }
}
bc->release_backend(found_backend);
}
}
else if (now < last_use || now - last_use > m_backend_expiry_ttl)
{
- mp::odr odr;
- (*bit)->m_close_package->response() = odr.create_close(
- 0, Z_Close_lackOfActivity, 0);
- (*bit)->m_close_package->session().close();
- (*bit)->m_close_package->move();
-
bit = m_backend_list.erase(bit);
}
else
{
boost::xtime xt;
boost::xtime_get(&xt,
-#if BOOST_VERSION >= 105000
+#if BOOST_VERSION >= 105000
boost::TIME_UTC_
#else
boost::TIME_UTC
#endif
);
- xt.sec += m_session_ttl / 3;
- boost::thread::sleep(xt);
-
+ xt.sec += m_session_ttl;
+ {
+ boost::mutex::scoped_lock lock(m_mutex);
+ m_cond_expire_ready.timed_wait(lock, xt);
+ if (close_down)
+ break;
+ }
stat();
expire_classes();
}
m_session_max = 100;
m_preferredMessageSize = 0;
m_maximumRecordSize = 0;
+ close_down = false;
+}
+
+yf::SessionShared::Rep::~Rep()
+{
+ {
+ boost::mutex::scoped_lock lock(m_mutex);
+ close_down = true;
+ m_cond_expire_ready.notify_all();
+ }
+ m_thrds.join_all();
}
void yf::SessionShared::Rep::start()
projects / metaproxy-moved-to-github.git / blobdiff