#include <yazpp/limit-connect.h>
#include <yaz/timing.h>
#include <yaz/log.h>
+#include <yaz/daemon.h>
#include "gduutil.hpp"
#include <iostream>
};
class FrontendNet::Rep {
friend class FrontendNet;
+
int m_no_threads;
std::vector<Port> m_ports;
int m_listen_duration;
int m_session_timeout;
int m_connect_max;
std::string m_msg_config;
+ std::string m_stat_req;
yazpp_1::SocketManager mySocketManager;
ZAssocServer **az;
+ int m_duration_freq[22];
+ double m_duration_lim[22];
+ double m_duration_max;
+ double m_duration_min;
+ double m_duration_total;
+ bool m_stop;
+ public:
+ Rep();
+ ~Rep();
};
class FrontendNet::My_Timer_Thread : public yazpp_1::ISocketObserver {
private:
yazpp_1::IPDU_Observable *the_PDU_Observable,
int fd);
void recv_GDU(Z_GDU *apdu, int len);
-
+ void report(Z_HTTP_Request *hreq);
void failNotify();
void timeoutNotify();
void connectNotify();
ZAssocChild *m_assoc_child;
mp::Package *m_package;
Rep *m_p;
- };
+ };
class FrontendNet::ZAssocServer : public yazpp_1::Z_Assoc {
public:
~ZAssocServer();
yazpp_1::IPDU_Observable *the_PDU_Observable,
int fd);
void recv_GDU(Z_GDU *apdu, int len);
-
+
void failNotify();
void timeoutNotify();
void connectNotify();
{
int len;
m_assoc_child->send_GDU(gdu->get(), &len);
+
+ yaz_timing_stop(timer);
+ double duration = yaz_timing_get_real(timer);
+
+ size_t ent = 0;
+ while (m_p->m_duration_lim[ent] != 0.0 && duration > m_p->m_duration_lim[ent])
+ ent++;
+ m_p->m_duration_freq[ent]++;
+
+ m_p->m_duration_total += duration;
+
+ if (m_p->m_duration_max < duration)
+ m_p->m_duration_max = duration;
+
+ if (m_p->m_duration_min == 0.0 || m_p->m_duration_min > duration)
+ m_p->m_duration_min = duration;
+
+ if (m_p->m_msg_config.length())
+ {
+ Z_GDU *z_gdu = gdu->get();
+
+ std::ostringstream os;
+ os << m_p->m_msg_config << " "
+ << *m_package << " "
+ << std::fixed << std::setprecision (6) << duration << " ";
+
+ if (z_gdu)
+ os << *z_gdu;
+ else
+ os << "-";
+
+ yaz_log(YLOG_LOG, "%s %s", os.str().c_str(), t_info);
+ }
}
else if (!m_package->session().is_closed())
{
mp::odr odr;
int len;
Z_APDU *apdu_response = odr.create_close(
- z_gdu->u.z3950, Z_Close_systemProblem,
+ z_gdu->u.z3950, Z_Close_systemProblem,
"unhandled Z39.50 request");
m_assoc_child->send_Z_PDU(apdu_response, &len);
// For HTTP, respond with Server Error
int len;
mp::odr odr;
- Z_GDU *zgdu_res
- = odr.create_HTTP_Response(m_package->session(),
+ Z_GDU *zgdu_res
+ = odr.create_HTTP_Response(m_package->session(),
z_gdu->u.HTTP_Request, 500);
m_assoc_child->send_GDU(zgdu_res, &len);
}
m_assoc_child->close();
}
- if (m_p->m_msg_config.length())
- {
- yaz_timing_stop(timer);
- double duration = yaz_timing_get_real(timer);
- Z_GDU *z_gdu = gdu->get();
-
- std::ostringstream os;
- os << m_p->m_msg_config << " "
- << *m_package << " "
- << std::fixed << std::setprecision (6) << duration << " ";
-
- if (z_gdu)
- os << *z_gdu;
- else
- os << "-";
-
- yaz_log(YLOG_LOG, "%s %s", os.str().c_str(), t_info);
- }
delete this;
}
-mp::IThreadPoolMsg *yf::FrontendNet::ThreadPoolPackage::handle()
+mp::IThreadPoolMsg *yf::FrontendNet::ThreadPoolPackage::handle()
{
m_package->move(m_assoc_child->m_route);
return this;
{
}
+void yf::FrontendNet::ZAssocChild::report(Z_HTTP_Request *hreq)
+{
+ mp::odr o;
+
+ Z_GDU *gdu_res = o.create_HTTP_Response(m_session, hreq, 200);
+
+ Z_HTTP_Response *hres = gdu_res->u.HTTP_Response;
+
+ mp::wrbuf w;
+ size_t i;
+ int number_total = 0;
+
+ for (i = 0; m_p->m_duration_lim[i] != 0.0; i++)
+ number_total += m_p->m_duration_freq[i];
+ number_total += m_p->m_duration_freq[i];
+
+ wrbuf_puts(w, "<?xml version=\"1.0\"?>\n");
+ wrbuf_puts(w, "<frontend_net>\n");
+ wrbuf_printf(w, " <responses frequency=\"%d\">\n", number_total);
+ for (i = 0; m_p->m_duration_lim[i] != 0.0; i++)
+ {
+ if (m_p->m_duration_freq[i] > 0)
+ wrbuf_printf(
+ w, " <response duration_start=\"%f\" "
+ "duration_end=\"%f\" frequency=\"%d\"/>\n",
+ i > 0 ? m_p->m_duration_lim[i - 1] : 0.0,
+ m_p->m_duration_lim[i], m_p->m_duration_freq[i]);
+ }
+
+ if (m_p->m_duration_freq[i] > 0)
+ wrbuf_printf(
+ w, " <response duration_start=\"%f\" frequency=\"%d\"/>\n",
+ m_p->m_duration_lim[i - 1], m_p->m_duration_freq[i]);
+
+ if (m_p->m_duration_max != 0.0)
+ wrbuf_printf(
+ w, " <response duration_max=\"%f\"/>\n",
+ m_p->m_duration_max);
+ if (m_p->m_duration_min != 0.0)
+ wrbuf_printf(
+ w, " <response duration_min=\"%f\"/>\n",
+ m_p->m_duration_min);
+ if (m_p->m_duration_total != 0.0)
+ wrbuf_printf(
+ w, " <response duration_average=\"%f\"/>\n",
+ m_p->m_duration_total / number_total);
+
+ wrbuf_puts(w, " </responses>\n");
+
+ int thread_busy;
+ int thread_total;
+ m_thread_pool_observer->get_thread_info(thread_busy, thread_total);
+
+ wrbuf_printf(w, " <thread_info busy=\"%d\" total=\"%d\"/>\n",
+ thread_busy, thread_total);
+
+ wrbuf_puts(w, "</frontend_net>\n");
+
+ hres->content_len = w.len();
+ hres->content_buf = (char *) w.buf();
+
+ int len;
+ send_GDU(gdu_res, &len);
+}
+
void yf::FrontendNet::ZAssocChild::recv_GDU(Z_GDU *z_pdu, int len)
{
m_no_requests++;
mp::Package *p = new mp::Package(m_session, m_origin);
+ if (z_pdu && z_pdu->which == Z_GDU_HTTP_Request)
+ {
+ Z_HTTP_Request *hreq = z_pdu->u.HTTP_Request;
+
+ const char *f = z_HTTP_header_lookup(hreq->headers, "X-Forwarded-For");
+ if (f)
+ p->origin().set_tcpip_address(std::string(f), m_session.id());
+
+ if (m_p->m_stat_req.length()
+ && !strcmp(hreq->path, m_p->m_stat_req.c_str()))
+ {
+ report(hreq);
+ return;
+ }
+ }
+
ThreadPoolPackage *tp = new ThreadPoolPackage(p, this, m_p);
p->copy_route(*m_package);
p->request() = yazpp_1::GDU(z_pdu);
if (m_p->m_msg_config.length())
{
- if (z_pdu)
+ if (z_pdu)
{
std::ostringstream os;
os << m_p->m_msg_config << " "
<< *p << " "
- << "0.000000" << " "
+ << "0.000000" << " "
<< *z_pdu;
yaz_log(YLOG_LOG, "%s", os.str().c_str());
}
}
- m_thread_pool_observer->put(tp);
+ m_thread_pool_observer->put(tp);
}
void yf::FrontendNet::ZAssocChild::failNotify()
yazpp_1::IPDU_Observable *PDU_Observable,
std::string route,
Rep *rep)
- :
+ :
Z_Assoc(PDU_Observable), m_route(route), m_p(rep)
{
m_package = 0;
yf::FrontendNet::FrontendNet() : m_p(new Rep)
{
- m_p->m_no_threads = 5;
- m_p->m_listen_duration = 0;
- m_p->m_session_timeout = 300; // 5 minutes
- m_p->m_connect_max = 0;
- m_p->az = 0;
}
-yf::FrontendNet::~FrontendNet()
+yf::FrontendNet::Rep::Rep()
{
- if (m_p->az)
+ m_no_threads = 5;
+ m_listen_duration = 0;
+ m_session_timeout = 300; // 5 minutes
+ m_connect_max = 0;
+ az = 0;
+ size_t i;
+ for (i = 0; i < 22; i++)
+ m_duration_freq[i] = 0;
+ m_duration_lim[0] = 0.000001;
+ m_duration_lim[1] = 0.00001;
+ m_duration_lim[2] = 0.0001;
+ m_duration_lim[3] = 0.001;
+ m_duration_lim[4] = 0.01;
+ m_duration_lim[5] = 0.1;
+ m_duration_lim[6] = 0.2;
+ m_duration_lim[7] = 0.3;
+ m_duration_lim[8] = 0.5;
+ m_duration_lim[9] = 1.0;
+ m_duration_lim[10] = 1.5;
+ m_duration_lim[11] = 2.0;
+ m_duration_lim[12] = 3.0;
+ m_duration_lim[13] = 4.0;
+ m_duration_lim[14] = 5.0;
+ m_duration_lim[15] = 6.0;
+ m_duration_lim[16] = 8.0;
+ m_duration_lim[17] = 10.0;
+ m_duration_lim[18] = 15.0;
+ m_duration_lim[19] = 20.0;
+ m_duration_lim[20] = 30.0;
+ m_duration_lim[21] = 0.0;
+ m_duration_max = 0.0;
+ m_duration_min = 0.0;
+ m_duration_total = 0.0;
+ m_stop = false;
+}
+
+yf::FrontendNet::Rep::~Rep()
+{
+ if (az)
{
size_t i;
- for (i = 0; i<m_p->m_ports.size(); i++)
- delete m_p->az[i];
- delete [] m_p->az;
+ for (i = 0; i < m_ports.size(); i++)
+ delete az[i];
+ delete [] az;
}
- m_p->az = 0;
+ az = 0;
+}
+
+yf::FrontendNet::~FrontendNet()
+{
}
void yf::FrontendNet::stop() const
{
- if (m_p->az)
- {
- size_t i;
- for (i = 0; i<m_p->m_ports.size(); i++)
- m_p->az[i]->server("");
- }
+ m_p->m_stop = true;
}
bool yf::FrontendNet::My_Timer_Thread::timeout()
yf::FrontendNet::My_Timer_Thread::My_Timer_Thread(
yazpp_1::ISocketObservable *obs,
- int duration) :
+ int duration) :
m_obs(obs), m_pipe(9123), m_timeout(false)
{
obs->addObserver(m_pipe.read_fd(), this);
if (m_p->m_listen_duration)
tt = new My_Timer_Thread(&m_p->mySocketManager,
m_p->m_listen_duration);
-
+
ThreadPoolSocketObserver tp(&m_p->mySocketManager, m_p->m_no_threads);
for (i = 0; i<m_p->m_ports.size(); i++)
}
while (m_p->mySocketManager.processEvent() > 0)
{
+ if (m_p->m_stop)
+ {
+ m_p->m_stop = false;
+ if (m_p->az)
+ {
+ size_t i;
+ for (i = 0; i < m_p->m_ports.size(); i++)
+ m_p->az[i]->server("");
+ yaz_daemon_stop();
+ }
+ }
int no = m_p->mySocketManager.getNumberOfObservers();
if (no <= 1)
break;
}
port.port = mp::xml::get_text(ptr);
ports.push_back(port);
-
+
}
else if (!strcmp((const char *) ptr->name, "threads"))
{
std::string threads_str = mp::xml::get_text(ptr);
int threads = atoi(threads_str.c_str());
if (threads < 1)
- throw yf::FilterException("Bad value for threads: "
+ throw yf::FilterException("Bad value for threads: "
+ threads_str);
m_p->m_no_threads = threads;
}
std::string timeout_str = mp::xml::get_text(ptr);
int timeout = atoi(timeout_str.c_str());
if (timeout < 1)
- throw yf::FilterException("Bad value for timeout: "
+ throw yf::FilterException("Bad value for timeout: "
+ timeout_str);
m_p->m_session_timeout = timeout;
}
{
m_p->m_msg_config = mp::xml::get_text(ptr);
}
+ else if (!strcmp((const char *) ptr->name, "stat-req"))
+ {
+ m_p->m_stat_req = mp::xml::get_text(ptr);
+ }
else
{
- throw yf::FilterException("Bad element "
+ throw yf::FilterException("Bad element "
+ std::string((const char *)
ptr->name));
}
void yf::FrontendNet::set_ports(std::vector<Port> &ports)
{
m_p->m_ports = ports;
-
+
m_p->az = new yf::FrontendNet::ZAssocServer *[m_p->m_ports.size()];
-
+
// Create yf::FrontendNet::ZAssocServer for each port
size_t i;
for (i = 0; i<m_p->m_ports.size(); i++)
{
// create a PDU assoc object (one per yf::FrontendNet::ZAssocServer)
yazpp_1::PDU_Assoc *as = new yazpp_1::PDU_Assoc(&m_p->mySocketManager);
-
+
// create ZAssoc with PDU Assoc
m_p->az[i] = new yf::FrontendNet::ZAssocServer(
as, m_p->m_ports[i].route, m_p.get());
if (m_p->az[i]->server(m_p->m_ports[i].port.c_str()))
{
- throw yf::FilterException("Unable to bind to address "
+ throw yf::FilterException("Unable to bind to address "
+ std::string(m_p->m_ports[i].port));
}
}