Added skeleton of yaz-z-server.

[yazpp-moved-to-github.git] / src / yaz-pdu-assoc.cpp

diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp
index fafac44..ae8bfaf 100644 (file)
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -1,10 +1,19 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-pdu-assoc.cpp,v $
- * Revision 1.10  2000-08-10 08:42:42  adam
+ * Revision 1.13  2000-09-08 10:23:42  adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.12  2000/09/06 14:23:45  adam
+ * WIN32 updates.
+ *
+ * Revision 1.11  2000/09/04 08:29:22  adam
+ * Fixed memory leak(s). Added re-use of associations, rather than
+ * re-init, when maximum number of targets are in use.
+ *
+ * Revision 1.10  2000/08/10 08:42:42  adam
  * Fixes for {set,get}_APDU_log.
  *
  * Revision 1.9  1999/12/06 13:52:45  adam
@@ -117,7 +126,7 @@ void Yaz_PDU_Assoc::socketNotify(int event)
                return;
            if (res < 0)
            {
-               logf(LOG_FATAL, "cs_listen failed");
+               logf(LOG_FATAL|LOG_ERRNO, "cs_listen failed");
                return;
            }
            if (!(new_line = cs_accept(m_cs)))
@@ -170,6 +179,7 @@ void Yaz_PDU_Assoc::socketNotify(int event)
                m_destroyed = &destroyed;
 
                m_PDU_Observer->recv_PDU(m_input_buf, res);
+                m_destroyed = 0;
                if (destroyed)   // it really was destroyed, return now.
                    return;
            } while (m_cs && cs_more (m_cs));
@@ -197,7 +207,7 @@ void Yaz_PDU_Assoc::close()
        m_queue_out = m_queue_out->m_next;
        delete q_this;
     }
-//   free (m_input_buf);
+    xfree (m_input_buf);
     m_input_buf = 0;
     m_input_len = 0;
 }
@@ -388,7 +398,9 @@ void Yaz_PDU_Assoc::socket(IYaz_PDU_Observer *observer, int fd)
     }
 }
 
-#if 1
+#if 0
+
+// Single-threaded... Only useful for non-blocking handlers
 void Yaz_PDU_Assoc::childNotify(int fd)
 {
     /// Clone PDU Observable (keep socket manager)
@@ -403,40 +415,57 @@ void Yaz_PDU_Assoc::childNotify(int fd)
 #else
 
 #include <yaz-socket-manager.h>
-#include <pthread.h>
 
-class thread_info {
-    Yaz_SocketManager *socketManager;
-    IYaz_PDU_Observable *
-
-};
+#ifdef WIN32
+#include <process.h>
+#else
+#include <pthread.h>
+#endif
 
-static void *events(void *p)
+#ifdef WIN32
+void __cdecl
+#else
+void *
+#endif 
+    events(void *p)
 {
     Yaz_SocketManager *s = (Yaz_SocketManager *) p;
-    
+
+    logf (LOG_LOG, "thread started");
     while (s->processEvent() > 0)
        ;
+    logf (LOG_LOG, "thread finished");
+#ifdef WIN32
+#else
     return 0;
+#endif
 }
 
 void Yaz_PDU_Assoc::childNotify(int fd)
 {
-    Yaz_SocketManager *socket_observable = new Yaz_SocketManager;  
-    IYaz_PDU_Observable *new_observable = clone();
+    Yaz_SocketManager *socket_observable = new Yaz_SocketManager;
+    Yaz_PDU_Assoc *new_observable = new Yaz_PDU_Assoc (socket_observable);
     
-    m_socketObservable = socket_observable;
-
     /// Clone PDU Observer
     IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable);
     
     /// Attach new socket to it
     new_observable->socket(observer, fd);
-    
+
+#ifdef WIN32
+    long t_id;
+    t_id = _beginthread (events, 0, socket_observable);
+    if (t_id == -1)
+    {
+        logf (LOG_FATAL|LOG_ERRNO, "_beginthread failed");
+        exit (1);
+    }
+#else
     pthread_t type;
 
     int id = pthread_create (&type, 0, events, socket_observable);
     logf (LOG_LOG, "pthread_create returned id=%d", id);
+#endif
 }
+// Threads end
 #endif
-