From owner-svn-src-all@FreeBSD.ORG  Thu Oct 27 12:26:16 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9462B106566B;
	Thu, 27 Oct 2011 12:26:16 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DF3F8FC13;
	Thu, 27 Oct 2011 12:26:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9RCQG0J006260;
	Thu, 27 Oct 2011 12:26:16 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9RCQGwu006257;
	Thu, 27 Oct 2011 12:26:16 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201110271226.p9RCQGwu006257@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 27 Oct 2011 12:26:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226834 - stable/9/usr.bin/csup
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Oct 2011 12:26:16 -0000

Author: kib
Date: Thu Oct 27 12:26:16 2011
New Revision: 226834
URL: http://svn.freebsd.org/changeset/base/226834

Log:
  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.
  
  Approved by:	re (kensmith)

Modified:
  stable/9/usr.bin/csup/fixups.c
  stable/9/usr.bin/csup/updater.c
Directory Properties:
  stable/9/usr.bin/csup/   (props changed)

Modified: stable/9/usr.bin/csup/fixups.c
==============================================================================
--- stable/9/usr.bin/csup/fixups.c	Thu Oct 27 10:25:11 2011	(r226833)
+++ stable/9/usr.bin/csup/fixups.c	Thu Oct 27 12:26:16 2011	(r226834)
@@ -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);
 	}

Modified: stable/9/usr.bin/csup/updater.c
==============================================================================
--- stable/9/usr.bin/csup/updater.c	Thu Oct 27 10:25:11 2011	(r226833)
+++ stable/9/usr.bin/csup/updater.c	Thu Oct 27 12:26:16 2011	(r226834)
@@ -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)