upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-25 16:18:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

event tags are now void *

Browse source
This commit is contained in:
Bob Halley 1999-07-10 01:05:54 +00:00
parent b7fe872457
commit f26747f494
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/tests/task_test.c
View file

@ -172,7 +172,7 @@ main(int argc, char *argv[]) {
isc_task_purgerange(t3,
NULL,
ISC_EVENTTYPE_FIRSTEVENT,
ISC_EVENTTYPE_LASTEVENT, 0);
ISC_EVENTTYPE_LASTEVENT, NULL);
isc_task_detach(&t1);
isc_task_detach(&t2);

18
lib/dns/resolver.c
View file

@ -24,9 +24,8 @@
#define RTRACE(m) printf("res %p: %s\n", res, (m))
#define RRTRACE(r, m) printf("res %p: %s\n", (r), (m))
#define FCTXTRACE(m) printf("fctx %p: %s\n", fctx, (m))
#define FTRACE(m) printf("fetch %p (res %p fctx %p tag %u): %s\n", \
fetch, fetch->res, fetch->private, fetch->tag, \
(m))
#define FTRACE(m) printf("fetch %p (res %p fctx %p): %s\n", \
fetch, fetch->res, fetch->private, (m))
#else
#define RTRACE(m)
#define RRTRACE(r, m)
@ -61,7 +60,6 @@ typedef struct fetchctx {
isc_timer_t * timer;
isc_time_t expires;
isc_interval_t interval;
unsigned int next_tag;
ISC_LIST(dns_fetchdoneevent_t) events;
isc_event_t start_event;
dns_dispatch_t * dispatcher;
@ -415,8 +413,7 @@ fctx_join(fetchctx_t *fctx, isc_task_t *task, isc_taskaction_t action,
if (event == NULL)
return (DNS_R_NOMEMORY);
event->result = DNS_R_SUCCESS;
event->tag = fctx->next_tag++;
INSIST(fctx->next_tag != 0);
event->tag = fetch;
/*
* XXX other event initialization here.
*/
@ -427,7 +424,6 @@ fctx_join(fetchctx_t *fctx, isc_task_t *task, isc_taskaction_t action,
fetch->magic = DNS_FETCH_MAGIC;
fetch->res = fctx->res;
fetch->private = fctx;
fetch->tag = event->tag;
ISC_LINK_INIT(fetch, link);
return (DNS_R_SUCCESS);
@ -460,7 +456,6 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
fctx->locknum = 0;
fctx->state = fetchstate_init;
fctx->dispatcher = NULL; /* XXX */
fctx->next_tag = 1;
ISC_LIST_INIT(fctx->queries);
fctx->qmessage = NULL;
@ -528,7 +523,7 @@ fctx_create(dns_resolver_t *res, dns_name_t *name, dns_rdatatype_t type,
* could well block on the lock we're about to release.
*/
event = &fctx->start_event;
ISC_EVENT_INIT(event, sizeof *event, 0, 0, DNS_EVENT_FETCH,
ISC_EVENT_INIT(event, sizeof *event, 0, NULL, DNS_EVENT_FETCH,
fctx_start, fctx, (void *)fctx_create, NULL, NULL);
iresult = isc_task_send(worker, &event);
if (iresult != ISC_R_SUCCESS) {
@ -992,15 +987,14 @@ dns_resolver_destroyfetch(dns_fetch_t **fetchp, isc_task_t *task) {
event != NULL;
event = next_event) {
next_event = ISC_LIST_NEXT(event, link);
if (event->tag == fetch->tag) {
if (event->tag == fetch) {
ISC_LIST_UNLINK(fctx->events, event, link);
FTRACE("found");
break;
}
}
} else if (task != NULL)
(void)isc_task_purge(task, fctx, DNS_EVENT_FETCHDONE,
fetch->tag);
(void)isc_task_purge(task, fctx, DNS_EVENT_FETCHDONE, fetch);
INSIST(fctx->references > 0);
fctx->references--;

2
lib/isc/unix/socket.c
View file

@ -412,7 +412,7 @@ allocate_socket(isc_socketmgr_t *manager, isc_sockettype_t type,
* Initialize readable event
*/
ISC_EVENT_INIT(&sock->readable_ev, sizeof(intev_t),
ISC_EVENTATTR_NOPURGE, 0, ISC_SOCKEVENT_INTR,
ISC_EVENTATTR_NOPURGE, NULL, ISC_SOCKEVENT_INTR,
NULL, sock, sock, NULL, NULL);
sock->magic = SOCKET_MAGIC;