c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-27 10:24:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Avoid adding new primitives in zpool wait

Browse Source 
zpool wait brought in sem_init() and family, which is a primitive set
not previously used in Open ZFS. It also happens to be deprecated
on macOS. Replace with phtread API calls.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Gallagher <john.gallagher@delphix.com>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes #10468
This commit is contained in:
Jorgen Lundman 2020-06-19 02:44:45 +09:00 committed by GitHub
parent 8056a75672
commit d553fb9b9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/zpool/zpool_main.c
View File

@ -44,7 +44,6 @@
#include <libuutil.h> #include <libuutil.h>
#include <locale.h> #include <locale.h>
#include <pthread.h> #include <pthread.h>
#include <semaphore.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -9576,10 +9575,12 @@ typedef struct wait_data {
boolean_t wd_scripted; boolean_t wd_scripted;
boolean_t wd_exact; boolean_t wd_exact;
boolean_t wd_headers_once; boolean_t wd_headers_once;
boolean_t wd_should_exit;
/* Which activities to wait for */ /* Which activities to wait for */
boolean_t wd_enabled[ZPOOL_WAIT_NUM_ACTIVITIES]; boolean_t wd_enabled[ZPOOL_WAIT_NUM_ACTIVITIES];
float wd_interval; float wd_interval;
sem_t wd_sem; pthread_cond_t wd_cv;
pthread_mutex_t wd_mutex;
} wait_data_t; } wait_data_t;
/* /*
@ -9709,6 +9710,7 @@ wait_status_thread(void *arg)
for (int row = 0; ; row++) { for (int row = 0; ; row++) {
boolean_t missing; boolean_t missing;
struct timespec timeout; struct timespec timeout;
int ret = 0;
(void) clock_gettime(CLOCK_REALTIME, &timeout); (void) clock_gettime(CLOCK_REALTIME, &timeout);
if (zpool_refresh_stats(zhp, &missing) != 0 || missing || if (zpool_refresh_stats(zhp, &missing) != 0 || missing ||
@ -9728,12 +9730,16 @@ wait_status_thread(void *arg)
} else { } else {
timeout.tv_nsec = nanos; timeout.tv_nsec = nanos;
} }
pthread_mutex_lock(&wd->wd_mutex);
if (sem_timedwait(&wd->wd_sem, &timeout) == 0) { if (!wd->wd_should_exit)
ret = pthread_cond_timedwait(&wd->wd_cv, &wd->wd_mutex,
&timeout);
pthread_mutex_unlock(&wd->wd_mutex);
if (ret == 0) {
break; /* signaled by main thread */ break; /* signaled by main thread */
} else if (errno != ETIMEDOUT) { } else if (ret != ETIMEDOUT) {
(void) fprintf(stderr, gettext("sem_timedwait failed: " (void) fprintf(stderr, gettext("pthread_cond_timedwait "
"%s\n"), strerror(errno)); "failed: %s\n"), strerror(ret));
zpool_close(zhp); zpool_close(zhp);
return (void *)(uintptr_t)(1); return (void *)(uintptr_t)(1);
} }
@ -9759,8 +9765,10 @@ zpool_do_wait(int argc, char **argv)
wd.wd_scripted = B_FALSE; wd.wd_scripted = B_FALSE;
wd.wd_exact = B_FALSE; wd.wd_exact = B_FALSE;
wd.wd_headers_once = B_FALSE; wd.wd_headers_once = B_FALSE;
wd.wd_should_exit = B_FALSE;
(void) sem_init(&wd.wd_sem, 0, 0); pthread_mutex_init(&wd.wd_mutex, NULL);
pthread_cond_init(&wd.wd_cv, NULL);
/* By default, wait for all types of activity. */ /* By default, wait for all types of activity. */
for (i = 0; i < ZPOOL_WAIT_NUM_ACTIVITIES; i++) for (i = 0; i < ZPOOL_WAIT_NUM_ACTIVITIES; i++)
@ -9885,14 +9893,17 @@ zpool_do_wait(int argc, char **argv)
if (verbose) { if (verbose) {
uintptr_t status; uintptr_t status;
(void) sem_post(&wd.wd_sem); pthread_mutex_lock(&wd.wd_mutex);
wd.wd_should_exit = B_TRUE;
pthread_cond_signal(&wd.wd_cv);
pthread_mutex_unlock(&wd.wd_mutex);
(void) pthread_join(status_thr, (void *)&status); (void) pthread_join(status_thr, (void *)&status);
if (status != 0) if (status != 0)
error = status; error = status;
} }
(void) sem_destroy(&wd.wd_sem); pthread_mutex_destroy(&wd.wd_mutex);
pthread_cond_destroy(&wd.wd_cv);
return (error); return (error);
} }