svn commit: r363991 - head/cddl/contrib/opensolaris/tools/ctf/cvt

[Alex Richardson]

Author: arichardson
Date: Thu Aug  6 20:44:40 2020
New Revision: 363991
URL: https://svnweb.freebsd.org/changeset/base/363991

Log:
  ctfmerge: Fix missing pthread_cond_init()
  
  This does not appear to matter on FreeBSD or Linux, but when building an
  amd64 kernel on macOS I was seeing infinite loops in ctfmerge.
  It turns out the loop in wip_save_work() was looping forever due to
  pthread_cond_wait() always returning -EINVAL.
  
  Reviewed By:	markj, brooks
  Differential Revision: https://reviews.freebsd.org/D25973

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c	Thu Aug  6 20:44:18 2020	(r363990)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c	Thu Aug  6 20:44:40 2020	(r363991)
@@ -665,6 +665,7 @@ wq_init(workqueue_t *wq, int nfiles)
 
 	for (i = 0; i < nslots; i++) {
 		pthread_mutex_init(&wq->wq_wip[i].wip_lock, NULL);
+		pthread_cond_init(&wq->wq_wip[i].wip_cv, NULL);
 		wq->wq_wip[i].wip_batchid = wq->wq_next_batchid++;
 	}