Merge branch 'feature-branch' into refs/top-bases/zfs-branch
This commit is contained in:
commit
e9d7526fb3
|
@ -112,7 +112,6 @@ thread_fini(void)
|
||||||
/* Wait for all threads to exit via thread_exit() */
|
/* Wait for all threads to exit via thread_exit() */
|
||||||
VERIFY3S(pthread_mutex_lock(&kthread_lock), ==, 0);
|
VERIFY3S(pthread_mutex_lock(&kthread_lock), ==, 0);
|
||||||
while ((count = thread_count()) > 1) {
|
while ((count = thread_count()) > 1) {
|
||||||
printf("Waiting for %d\n", count);
|
|
||||||
clock_gettime(CLOCK_REALTIME, &ts);
|
clock_gettime(CLOCK_REALTIME, &ts);
|
||||||
ts.tv_sec += 1;
|
ts.tv_sec += 1;
|
||||||
pthread_cond_timedwait(&kthread_cond, &kthread_lock, &ts);
|
pthread_cond_timedwait(&kthread_cond, &kthread_lock, &ts);
|
||||||
|
|
Loading…
Reference in New Issue