Skip to content

Superseded by #457 — dnsthread wakeup registration fix #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tokenjunkielabs wants to merge 1 commit into from
Closed

Superseded by #457 — dnsthread wakeup registration fix #455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions lib/dnsthread/dnsthread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,20 +265,20 @@ dnsthread_resolveone(DNSTHREAD T, const char * addr,
T->callback = callback;
T->cookie = cookie;

/* We want a callback when the worker thread pokes us. */
if (events_network_register(callback_resolveone, T, T->wakeupsock[1],
EVENTS_NETWORK_OP_READ)) {
warnp("Error registering wakeup listener");
goto err2;
}

/* There is now work for the thread to do. */
T->state = THREAD_HASWORK;

/* Wake up the worker thread. */
if ((rc = pthread_cond_signal(&T->cv)) != 0) {
warn0("pthread_cond_signal: %s", strerror(rc));
goto err1;
}

/* We want a callback when the worker thread pokes us. */
if (events_network_register(callback_resolveone, T, T->wakeupsock[1],
EVENTS_NETWORK_OP_READ)) {
warnp("Error registering wakeup listener");
goto err1;
goto err3;
}

ealready:
Expand All @@ -295,6 +295,11 @@ dnsthread_resolveone(DNSTHREAD T, const char * addr,
/* Success! */
return (0);

err3:
T->state = THREAD_SLEEPING;
events_network_cancel(T->wakeupsock[1], EVENTS_NETWORK_OP_READ);
err2:
free(T->addr);
err1:
pthread_mutex_unlock(&T->mtx);
err0:
Expand Down