projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be more informative if HTTP parsing fails
[pazpar2-moved-to-github.git]
/
src
/
getaddrinfo.c
diff --git
a/src/getaddrinfo.c
b/src/getaddrinfo.c
index
26557d8
..
c400e07
100644
(file)
--- a/
src/getaddrinfo.c
+++ b/
src/getaddrinfo.c
@@
-1,4
+1,4
@@
-/* $Id: getaddrinfo.c,v 1.1 2007-04-21 12:00:54 adam Exp $
+/* $Id: getaddrinfo.c,v 1.5 2007-04-23 21:05:23 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-39,6
+39,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <yaz/tcpip.h>
#include "pazpar2.h"
#include <yaz/tcpip.h>
#include "pazpar2.h"
+#include "connection.h"
+#include "host.h"
struct work {
char *hostport; /* hostport to be resolved in separate thread */
struct work {
char *hostport; /* hostport to be resolved in separate thread */
@@
-86,7
+88,7
@@
void perform_getaddrinfo(struct work *w)
addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
freeaddrinfo(addrinfo);
w->ipport = xstrdup(ipport);
addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
freeaddrinfo(addrinfo);
w->ipport = xstrdup(ipport);
- yaz_log(log_level, "%s -> %s", hostport, ipport);
+ yaz_log(log_level, "Resolved %s -> %s", hostport, ipport);
}
xfree(hostport);
}
}
xfree(hostport);
}
@@
-111,11
+113,8
@@
void iochan_handler(struct iochan *i, int event)
if (event & EVENT_INPUT)
{
struct work *w = sel_thread_result(p);
if (event & EVENT_INPUT)
{
struct work *w = sel_thread_result(p);
- if (w->ipport)
- yaz_log(log_level, "resolved result %s", w->ipport);
- else
- yaz_log(log_level, "unresolved result");
w->host->ipport = w->ipport;
w->host->ipport = w->ipport;
+ connect_resolver_host(w->host);
xfree(w);
}
}
xfree(w);
}
}
@@
-125,7
+124,9
@@
static sel_thread_t resolver_thread = 0;
static void getaddrinfo_start(void)
{
int fd;
static void getaddrinfo_start(void)
{
int fd;
- sel_thread_t p = resolver_thread = sel_thread_create(work_handler, &fd);
+ sel_thread_t p = resolver_thread =
+ sel_thread_create(work_handler, 0 /* work_destroy */, &fd,
+ 3 /* no of resolver threads */);
if (!p)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "sel_create_create failed");
if (!p)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "sel_create_create failed");
@@
-144,7
+145,7
@@
static void getaddrinfo_start(void)
int host_getaddrinfo(struct host *host)
{
struct work *w = xmalloc(sizeof(*w));
int host_getaddrinfo(struct host *host)
{
struct work *w = xmalloc(sizeof(*w));
- int use_thread = 1;
+ int use_thread = 1; /* =0 to disable threading entirely */
w->hostport = host->hostport;
w->ipport = 0;
w->hostport = host->hostport;
w->ipport = 0;