Include gduqueue.h

[metaproxy-moved-to-github.git] / src / p2_frontend.h

diff --git a/src/p2_frontend.h b/src/p2_frontend.h
index 1c60373..0476ef2 100644 (file)
--- a/src/p2_frontend.h
+++ b/src/p2_frontend.h
@@ -1,4 +1,4 @@
-/* $Id: p2_frontend.h,v 1.1 2005-10-06 09:37:25 marc Exp $
+/* $Id: p2_frontend.h,v 1.3 2005-10-13 10:00:02 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -26,10 +26,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <vector>
 #include <string>
 
-#include "msg-thread.h"
+#include "thread_pool_observer.h"
 #include <yaz++/z-assoc.h>
 #include <yaz++/pdu-assoc.h>
 #include <yaz++/gdu.h>
+#include <yaz++/gduqueue.h>
 #include <yaz++/z-query.h>
 
 class P2_Frontend;
@@ -68,7 +69,7 @@ class P2_Server : public yazpp_1::Z_Assoc {
 public:
     ~P2_Server();
     P2_Server(yazpp_1::IPDU_Observable *the_PDU_Observable,
-              Msg_Thread *m_my_thread,
+              ThreadPoolSocketObserver *m_my_thread,
               P2_Config *config,
               P2_ModuleFactory *modules);
     P2_Config *lockConfig();
@@ -86,7 +87,7 @@ private:
     void connectNotify();
 private:
     P2_Config *m_config;
-    Msg_Thread *m_my_thread;
+    ThreadPoolSocketObserver *m_my_thread;
     pthread_mutex_t m_mutex_config;
 };
 
@@ -101,14 +102,14 @@ public:
     yazpp_1::Yaz_Z_Query m_query;
 };
 
-class P2_Msg : public IMsg_Thread {
+class P2_Msg : public IThreadPoolMsg {
 public:
     int m_close_flag;
     yazpp_1::GDU *m_gdu;
     yazpp_1::GDU *m_output;
     P2_Frontend *m_front;
     P2_Server *m_server;
-    IMsg_Thread *handle();
+    IThreadPoolMsg *handle();
     void result();
     P2_Msg(yazpp_1::GDU *gdu, P2_Frontend *front, P2_Server *server);
     virtual ~P2_Msg();
@@ -130,7 +131,7 @@ class P2_Frontend : public yazpp_1::Z_Assoc {
  public:
     ~P2_Frontend();
     P2_Frontend(yazpp_1::IPDU_Observable *the_PDU_Observable,
-                Msg_Thread *m_my_thread, P2_Server *server);
+                ThreadPoolSocketObserver *m_my_thread, P2_Server *server);
     IPDU_Observer* sessionNotify(yazpp_1::IPDU_Observable *the_PDU_Observable,
                                  int fd);
     
@@ -146,7 +147,7 @@ class P2_Frontend : public yazpp_1::Z_Assoc {
     
  private:
     yazpp_1::GDUQueue m_in_queue;
-    Msg_Thread *m_my_thread;
+    ThreadPoolSocketObserver *m_my_thread;
     P2_Server *m_server;
  private:
     bool P2_Frontend::search(Z_GDU *z_gdu);