shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Use barrier instead of mutex

Browse Source 
Barrier is supposed to be used in situation like this
and replace tricky mutex usage, where mutex has been unlocked
by a different thread than the locking thread.
This commit is contained in:
Zdenek Kabelac 2011-10-11 09:26:04 +00:00
parent 61a45c7b3a
commit 96de8adcc9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.89 - Version 2.02.89 -
================================== ==================================
Use pthread_barrier to synchronize clvmd threads at startup.
Limit clvmd's thread size to 128KiB. Limit clvmd's thread size to 128KiB.
Reduce default preallocated stack size to 64KiB. Reduce default preallocated stack size to 64KiB.
Add check for access through NULL pointer when refresh_filter() fails. Add check for access through NULL pointer when refresh_filter() fails.

16
daemons/clvmd/clvmd.c
View File

@ -89,7 +89,7 @@ static const size_t STACK_SIZE = 128 * 1024;
static pthread_attr_t stack_attr; static pthread_attr_t stack_attr;
static pthread_mutex_t lvm_thread_mutex; static pthread_mutex_t lvm_thread_mutex;
static pthread_cond_t lvm_thread_cond; static pthread_cond_t lvm_thread_cond;
static pthread_mutex_t lvm_start_mutex; static pthread_barrier_t lvm_start_barrier;
static struct dm_list lvm_cmd_head; static struct dm_list lvm_cmd_head;
static volatile sig_atomic_t quit = 0; static volatile sig_atomic_t quit = 0;
static volatile sig_atomic_t reread_config = 0; static volatile sig_atomic_t reread_config = 0;
@ -505,7 +505,7 @@ int main(int argc, char *argv[])
} }
pthread_mutex_init(&lvm_thread_mutex, NULL); pthread_mutex_init(&lvm_thread_mutex, NULL);
pthread_cond_init(&lvm_thread_cond, NULL); pthread_cond_init(&lvm_thread_cond, NULL);
pthread_mutex_init(&lvm_start_mutex, NULL); pthread_barrier_init(&lvm_start_barrier, NULL, 2);
init_lvhash(); init_lvhash();
/* Start the cluster interface */ /* Start the cluster interface */
@ -584,9 +584,11 @@ int main(int argc, char *argv[])
DEBUGLOG("starting LVM thread\n"); DEBUGLOG("starting LVM thread\n");
/* Don't let anyone else to do work until we are started */ /* Don't let anyone else to do work until we are started */
pthread_mutex_lock(&lvm_start_mutex);
pthread_create(&lvm_thread, &stack_attr, lvm_thread_fn, &lvm_params); pthread_create(&lvm_thread, &stack_attr, lvm_thread_fn, &lvm_params);
/* Don't start until the LVM thread is ready */
pthread_barrier_wait(&lvm_start_barrier);
/* Tell the rest of the cluster our version number */ /* Tell the rest of the cluster our version number */
if (clops->cluster_init_completed) if (clops->cluster_init_completed)
clops->cluster_init_completed(); clops->cluster_init_completed();
@ -1633,11 +1635,6 @@ static __attribute__ ((noreturn)) void *pre_and_post_thread(void *arg)
DEBUGLOG("in sub thread: client = %p\n", client); DEBUGLOG("in sub thread: client = %p\n", client);
pthread_mutex_lock(&client->bits.localsock.mutex); pthread_mutex_lock(&client->bits.localsock.mutex);
/* Don't start until the LVM thread is ready */
pthread_mutex_lock(&lvm_start_mutex);
pthread_mutex_unlock(&lvm_start_mutex);
DEBUGLOG("Sub thread ready for work.\n");
/* Ignore SIGUSR1 (handled by master process) but enable /* Ignore SIGUSR1 (handled by master process) but enable
SIGUSR2 (kills subthreads) */ SIGUSR2 (kills subthreads) */
sigemptyset(&ss); sigemptyset(&ss);
@ -2004,7 +2001,8 @@ static void *lvm_thread_fn(void *arg)
init_clvm(lvm_params->excl_uuid); init_clvm(lvm_params->excl_uuid);
/* Allow others to get moving */ /* Allow others to get moving */
pthread_mutex_unlock(&lvm_start_mutex); pthread_barrier_wait(&lvm_start_barrier);
DEBUGLOG("Sub thread ready for work.\n");
/* Now wait for some actual work */ /* Now wait for some actual work */
while (!quit) { while (!quit) {