From ae5094289b74bd7ff3c3269e2e6091b867244cee Mon Sep 17 00:00:00 2001 From: kib Date: Thu, 27 Oct 2011 14:11:19 +0000 Subject: [PATCH] MFC r225979: Update the comment. MFC r225980: Handle the situation where fixups_close() has been called but more fixups are still available on the queue. git-svn-id: svn://svn.freebsd.org/base/stable/8@226838 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- contrib/csup/fixups.c | 2 +- contrib/csup/updater.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/csup/fixups.c b/contrib/csup/fixups.c index b105a8f7d..a83ad1c45 100644 --- a/contrib/csup/fixups.c +++ b/contrib/csup/fixups.c @@ -141,7 +141,7 @@ fixups_get(struct fixups *f) fixups_lock(f); while (f->size == 0 && !f->closed) pthread_cond_wait(&f->cond, &f->lock); - if (f->closed) { + if (f->closed && f->size == 0) { fixups_unlock(f); return (NULL); } diff --git a/contrib/csup/updater.c b/contrib/csup/updater.c index f3f3f27aa..e95ec107b 100644 --- a/contrib/csup/updater.c +++ b/contrib/csup/updater.c @@ -238,7 +238,7 @@ updater(void *arg) /* * Make sure to close the fixups even in case of an error, - * so that the lister thread doesn't block indefinitely. + * so that the detailer thread doesn't block indefinitely. */ fixups_close(up->config->fixups); if (!error) -- 2.45.0