luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fix thread race in process_title_threadsafe

Browse Source 
Libuv calls uv__process_title_cleanup() on shutdown, which raced with
one of the threads from the test that calls uv_get_process_title() in
an infinite loop. Change the test to properly shut down the thread
before exiting.

PR-URL: https://github.com/libuv/libuv/pull/2946
Refs: https://github.com/libuv/libuv/pull/2853#issuecomment-665259082
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jameson Nash <vtjnash@gmail.com>
This commit is contained in:
Ben Noordhuis 2020-08-06 10:18:27 +02:00
parent 87f0765159
commit e44781a161
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/test-process-title-threadsafe.c
View File

@ -39,10 +39,13 @@ static const char* titles[] = {
};
static void getter_thread_body(void* arg) {
uv_sem_t* getter_sem;
char buffer[512];
size_t len;
for (;;) {
getter_sem = arg;
while (UV_EAGAIN == uv_sem_trywait(getter_sem)) {
ASSERT(0 == uv_get_process_title(buffer, sizeof(buffer)));
/* The maximum size of the process title on some platforms depends on
@ -78,6 +81,7 @@ static void setter_thread_body(void* arg) {
TEST_IMPL(process_title_threadsafe) {
uv_thread_t setter_threads[4];
uv_thread_t getter_thread;
uv_sem_t getter_sem;
int i;
#if defined(__sun) || defined(__CYGWIN__) || defined(__MSYS__) || \
@ -86,7 +90,10 @@ TEST_IMPL(process_title_threadsafe) {
#endif
ASSERT(0 == uv_set_process_title(titles[0]));
ASSERT(0 == uv_thread_create(&getter_thread, getter_thread_body, NULL));
ASSERT_EQ(0, uv_sem_init(&getter_sem, 0));
ASSERT_EQ(0,
uv_thread_create(&getter_thread, getter_thread_body, &getter_sem));
for (i = 0; i < (int) ARRAY_SIZE(setter_threads); i++)
ASSERT(0 == uv_thread_create(&setter_threads[i], setter_thread_body, NULL));
@ -94,5 +101,9 @@ TEST_IMPL(process_title_threadsafe) {
for (i = 0; i < (int) ARRAY_SIZE(setter_threads); i++)
ASSERT(0 == uv_thread_join(&setter_threads[i]));
uv_sem_post(&getter_sem);
ASSERT_EQ(0, uv_thread_join(&getter_thread));
uv_sem_destroy(&getter_sem);
return 0;
}