Pazpar2 1.4.4-2 for squeeze

[pazpar2-moved-to-github.git] / src / getaddrinfo.c

diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c
index b504ec7..6632b90 100644 (file)
--- a/src/getaddrinfo.c
+++ b/src/getaddrinfo.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2010 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -47,14 +47,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/nmem.h>
 #include <yaz/tcpip.h>
 
-#include "pazpar2.h"
+#include "session.h"
 #include "connection.h"
 #include "host.h"
 
+/* Only use a threaded resolver on Unix that offers getaddrinfo.
+   gethostbyname is NOT reentrant.
+ */
+#if HAVE_GETADDRINFO
+#ifndef WIN32
+#define USE_THREADED_RESOLVER 1
+#endif
+#endif
+
 struct work {
     char *hostport;  /* hostport to be resolved in separate thread */
     char *ipport;    /* result or NULL if it could not be resolved */
     struct host *host; /* host that we're dealing with - mother thread */
+    iochan_man_t iochan_man; /* iochan manager */
 };
 
 static int log_level = YLOG_LOG;
@@ -140,7 +150,7 @@ static void work_handler(void *vp)
     perform_getaddrinfo(w);
 }
 
-#ifndef WIN32
+#if USE_THREADED_RESOLVER
 void iochan_handler(struct iochan *i, int event)
 {
     sel_thread_t p = iochan_getdata(i);
@@ -149,14 +159,14 @@ void iochan_handler(struct iochan *i, int event)
     {
         struct work *w = sel_thread_result(p);
         w->host->ipport = w->ipport;
-        connect_resolver_host(w->host);
+        connect_resolver_host(w->host, w->iochan_man);
         xfree(w);
     }
 }
 
 static sel_thread_t resolver_thread = 0;
 
-static void getaddrinfo_start(void)
+static void getaddrinfo_start(iochan_man_t iochan_man)
 {
     int fd;
     sel_thread_t p = resolver_thread = 
@@ -169,28 +179,30 @@ static void getaddrinfo_start(void)
     }
     else
     {
-        IOCHAN chan = iochan_create(fd, iochan_handler, EVENT_INPUT);
+        IOCHAN chan = iochan_create(fd, iochan_handler, EVENT_INPUT,
+            "getaddrinfo_socket");
         iochan_setdata(chan, p);
-        pazpar2_add_channel(chan);
+        iochan_add(iochan_man, chan);
     }
     yaz_log(log_level, "resolver start");
     resolver_thread = p;
 }
 #endif
 
-int host_getaddrinfo(struct host *host)
+int host_getaddrinfo(struct host *host, iochan_man_t iochan_man)
 {
     struct work *w = xmalloc(sizeof(*w));
-    int use_thread = 1; /* =0 to disable threading entirely */
+    int use_thread = 0; /* =0 to disable threading entirely */
 
     w->hostport = host->hostport;
     w->ipport = 0;
     w->host = host;
-#ifndef WIN32
+    w->iochan_man = iochan_man;
+#if USE_THREADED_RESOLVER
     if (use_thread)
     {
         if (resolver_thread == 0)
-            getaddrinfo_start();
+            getaddrinfo_start(iochan_man);
         assert(resolver_thread);
         sel_thread_add(resolver_thread, w);
         return 0;
@@ -207,7 +219,9 @@ int host_getaddrinfo(struct host *host)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+