/*
- * $Id: zoom-c.c,v 1.2 2001-10-24 12:24:43 adam Exp $
+ * $Id: zoom-c.c,v 1.4 2001-11-11 22:25:25 adam Exp $
*
* ZOOM layer for C, connections, result sets, queries.
*/
#include "zoom-p.h"
+#define USE_POLL 0
+
+#if USE_POLL
+#include <sys/poll.h>
+#endif
+
static Z3950_record record_cache_lookup (Z3950_resultset r,
int pos,
const char *elementSetName);
}
}
-Z3950_search Z3950_search_create(void)
+Z3950_query Z3950_query_create(void)
{
- Z3950_search s = xmalloc (sizeof(*s));
+ Z3950_query s = xmalloc (sizeof(*s));
s->refcount = 1;
s->query = 0;
return c->host_port;
}
-void Z3950_search_destroy(Z3950_search s)
+void Z3950_query_destroy(Z3950_query s)
{
if (!s)
return;
(s->refcount)--;
- yaz_log (LOG_DEBUG, "Z3950_search_destroy count=%d", s->refcount);
+ yaz_log (LOG_DEBUG, "Z3950_query_destroy count=%d", s->refcount);
if (s->refcount == 0)
{
odr_destroy (s->odr);
}
}
-int Z3950_search_prefix(Z3950_search s, const char *str)
+int Z3950_query_prefix(Z3950_query s, const char *str)
{
s->query = odr_malloc (s->odr, sizeof(*s->query));
s->query->which = Z_Query_type_1;
return 0;
}
-int Z3950_search_sortby(Z3950_search s, const char *criteria)
+int Z3950_query_sortby(Z3950_query s, const char *criteria)
{
s->sort_spec = yaz_sort_spec (s->odr, criteria);
if (!s->sort_spec)
Z3950_resultset Z3950_connection_search_pqf(Z3950_connection c, const char *q)
{
Z3950_resultset r;
- Z3950_search s = Z3950_search_create();
+ Z3950_query s = Z3950_query_create();
- Z3950_search_prefix (s, q);
+ Z3950_query_prefix (s, q);
r = Z3950_connection_search (c, s);
- Z3950_search_destroy (s);
+ Z3950_query_destroy (s);
return r;
}
-Z3950_resultset Z3950_connection_search(Z3950_connection c, Z3950_search q)
+Z3950_resultset Z3950_connection_search(Z3950_connection c, Z3950_query q)
{
Z3950_resultset r = Z3950_resultset_create ();
Z3950_task task;
rp = &(*rp)->next;
}
}
- Z3950_search_destroy (r->search);
+ Z3950_query_destroy (r->search);
Z3950_options_destroy (r->options);
odr_destroy (r->odr);
xfree (r);
}
void Z3950_resultset_records (Z3950_resultset r, Z3950_record *recs,
- size_t *cnt)
+ size_t start, size_t count)
{
int force_present = 0;
- int start, count;
if (!r)
return ;
- start = Z3950_options_get_int (r->options, "start", 0);
- count = Z3950_options_get_int (r->options, "count", 0);
- if (cnt && recs)
+ if (count && recs)
force_present = 1;
Z3950_resultset_retrieve (r, force_present, start, count);
if (force_present)
{
size_t i;
- for (i = 0; i< *cnt; i++)
+ for (i = 0; i< count; i++)
recs[i] = Z3950_resultset_record_immediate (r, i+start);
}
}
if (ret >= 0)
{
c->state = STATE_CONNECTING;
- c->mask = Z3950_SELECT_READ | Z3950_SELECT_WRITE | Z3950_SELECT_EXCEPT;
+ c->mask = Z3950_SELECT_READ | Z3950_SELECT_WRITE |
+ Z3950_SELECT_EXCEPT;
return;
}
}
return nrec;
}
-Z3950_record Z3950_resultset_record_immediate (Z3950_resultset s, int pos)
+Z3950_record Z3950_resultset_record_immediate (Z3950_resultset s,size_t pos)
{
Z3950_record rec = record_cache_lookup (s, pos, 0);
if (!rec)
return Z3950_record_dup (rec);
}
-Z3950_record Z3950_resultset_record (Z3950_resultset r, int pos)
+Z3950_record Z3950_resultset_record (Z3950_resultset r, size_t pos)
{
Z3950_resultset_retrieve (r, 1, pos, 1);
return Z3950_resultset_record_immediate (r, pos);
xfree (rec);
}
-void *Z3950_record_get (Z3950_record rec, const char *type, int *len)
+void *Z3950_record_get (Z3950_record rec, const char *type, size_t *len)
{
Z_NamePlusRecord *npr;
if (!rec)
}
return 0;
}
+ else if (!strcmp (type, "raw"))
+ {
+ if (npr->which == Z_NamePlusRecord_databaseRecord)
+ {
+ *len = -1;
+ return (Z_External *) npr->u.databaseRecord;
+ }
+ return 0;
+ }
return 0;
}
-void *Z3950_resultset_get (Z3950_resultset s, int pos, const char *type,
- int *len)
+void *Z3950_resultset_get (Z3950_resultset s, size_t pos, const char *type,
+ size_t *len)
{
Z3950_record rec = record_cache_lookup (s, pos, 0);
return Z3950_record_get (rec, type, len);
else if (r == 1)
{
c->state = STATE_ESTABLISHED;
- c->mask = Z3950_SELECT_READ|Z3950_SELECT_WRITE;
+ c->mask = Z3950_SELECT_READ|Z3950_SELECT_WRITE|Z3950_SELECT_EXCEPT;
}
else
{
c->state = STATE_ESTABLISHED;
- c->mask = Z3950_SELECT_READ;
+ c->mask = Z3950_SELECT_READ|Z3950_SELECT_EXCEPT;
}
return 0;
}
{
#if 0
int r = cs_look(c->cs);
- yaz_log (LOG_DEBUG, "Z3950_connection_do_io c=%p mask=%d cs_look=%d",
+ yaz_log (LOG_LOG, "Z3950_connection_do_io c=%p mask=%d cs_look=%d",
c, mask, r);
if (r == CS_NONE)
}
else if (r == CS_CONNECT)
{
- yaz_log (LOG_DEBUG, "calling rcvconnect");
+ yaz_log (LOG_LOG, "calling rcvconnect");
if (cs_rcvconnect (c->cs) < 0)
{
c->error = Z3950_ERROR_CONNECT;
int Z3950_event (int no, Z3950_connection *cs)
{
+#if USE_POLL
+ struct pollfd pollfds[1024];
+ Z3950_connection poll_cs[1024];
+#else
struct timeval tv;
fd_set input, output, except;
- int i, r;
+#endif
+ int i, r, nfds;
int max_fd = 0;
for (i = 0; i<no; i++)
}
}
+#if USE_POLL
+
+#else
tv.tv_sec = 15;
tv.tv_usec = 0;
FD_ZERO (&input);
FD_ZERO (&output);
FD_ZERO (&except);
- r = 0;
+#endif
+ nfds = 0;
for (i = 0; i<no; i++)
{
Z3950_connection c = cs[i];
continue;
if (max_fd < fd)
max_fd = fd;
+
+#if USE_POLL
+ if (mask)
+ {
+ short poll_events = 0;
+
+ if (mask & Z3950_SELECT_READ)
+ poll_events += POLLIN;
+ if (mask & Z3950_SELECT_WRITE)
+ poll_events += POLLOUT;
+ if (mask & Z3950_SELECT_EXCEPT)
+ poll_events += POLLERR;
+ pollfds[nfds].fd = fd;
+ pollfds[nfds].events = poll_events;
+ pollfds[nfds].revents = 0;
+ poll_cs[nfds] = c;
+ nfds++;
+ }
+#else
if (mask & Z3950_SELECT_READ)
{
FD_SET (fd, &input);
- r++;
+ nfds++;
}
if (mask & Z3950_SELECT_WRITE)
{
FD_SET (fd, &output);
- r++;
+ nfds++;
}
if (mask & Z3950_SELECT_EXCEPT)
{
FD_SET (fd, &except);
- r++;
+ nfds++;
}
+#endif
}
- if (!r)
+ if (!nfds)
{
for (i = 0; i<no; i++)
{
yaz_log (LOG_DEBUG, "no more events");
return 0;
}
+#if USE_POLL
+ yaz_log (LOG_LOG, "poll start");
+ r = poll (pollfds, nfds, 15000);
+ yaz_log (LOG_LOG, "poll stop, returned r=%d", r);
+ for (i = 0; i<nfds; i++)
+ {
+ Z3950_connection c = poll_cs[i];
+ if (r && c->mask)
+ {
+ int mask = 0;
+ if (pollfds[i].revents & POLLIN)
+ mask += Z3950_SELECT_READ;
+ if (pollfds[i].revents & POLLOUT)
+ mask += Z3950_SELECT_WRITE;
+ if (pollfds[i].revents & POLLERR)
+ mask += Z3950_SELECT_EXCEPT;
+ if (mask)
+ Z3950_connection_do_io(c, mask);
+ }
+ else if (r == 0 && c->mask)
+ {
+ /* timeout and this connection was waiting */
+ c->error = Z3950_ERROR_TIMEOUT;
+ c->event_pending = 1;
+ }
+ }
+#else
yaz_log (LOG_DEBUG, "select start");
r = select (max_fd+1, &input, &output, &except, &tv);
yaz_log (LOG_DEBUG, "select stop, returned r=%d", r);
-
for (i = 0; i<no; i++)
{
Z3950_connection c = cs[i];
c->event_pending = 1;
}
}
+#endif
+
for (i = 0; i<no; i++)
{
Z3950_connection c = cs[i];
projects / yaz-moved-to-github.git / blobdiff