hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2004 Change unit tests to use std::thread

Browse Source
This commit is contained in:
Johan Wikman
2018-08-10 15:14:47 +03:00
parent b408894f6d
commit 7ef163477a
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/test/test_atomic.cc
View File

@ -14,10 +14,10 @@
#include <maxscale/cdefs.h> #include <maxscale/cdefs.h>
#include <stdio.h> #include <stdio.h>
#include <thread>
#include <maxscale/atomic.h> #include <maxscale/atomic.h>
#include <maxscale/debug.h> #include <maxscale/debug.h>
#include <maxscale/thread.h>
#define NTHR 10 #define NTHR 10
@ -77,25 +77,22 @@ void test_cas(void* data)
int run_test(void(*func)(void*)) int run_test(void(*func)(void*))
{ {
THREAD threads[NTHR]; std::thread threads[NTHR];
atomic_store_int32(&expected, 0); atomic_store_int32(&expected, 0);
atomic_store_int32(&running, 1); atomic_store_int32(&running, 1);
for (size_t i = 0; i < NTHR; i++) for (size_t i = 0; i < NTHR; i++)
{ {
if (thread_start(&threads[i], func, (void*)(i + 1), 0) == NULL) threads[i] = std::thread(func, (void*)(i + 1));
{
ss_dassert(false);
}
} }
thread_millisleep(2500); std::this_thread::sleep_for(std::chrono::milliseconds(2500));
atomic_store_int32(&running, 0); atomic_store_int32(&running, 0);
for (int i = 0; i < NTHR; i++) for (int i = 0; i < NTHR; i++)
{ {
thread_wait(threads[i]); threads[i].join();
} }
return atomic_load_int32(&expected); return atomic_load_int32(&expected);

14
server/core/test/test_spinlock.cc
View File

@ -32,9 +32,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <thread>
#include <maxscale/spinlock.h> #include <maxscale/spinlock.h>
#include <maxscale/thread.h>
/** /**
@ -106,7 +106,7 @@ static int
test2() test2()
{ {
SPINLOCK lck; SPINLOCK lck;
THREAD handle; std::thread handle;
struct timespec sleeptime; struct timespec sleeptime;
sleeptime.tv_sec = 10; sleeptime.tv_sec = 10;
@ -115,10 +115,10 @@ test2()
acquire_time = 0; acquire_time = 0;
spinlock_init(&lck); spinlock_init(&lck);
spinlock_acquire(&lck); spinlock_acquire(&lck);
thread_start(&handle, test2_helper, (void *)&lck, 0); handle = std::thread(test2_helper, (void *)&lck);
nanosleep(&sleeptime, NULL); nanosleep(&sleeptime, NULL);
spinlock_release(&lck); spinlock_release(&lck);
thread_wait(handle); handle.join();
if (acquire_time < 8) if (acquire_time < 8)
{ {
@ -207,7 +207,7 @@ static int
test3() test3()
{ {
// SPINLOCK lck; // SPINLOCK lck;
THREAD handle[THREADS]; std::thread handle[THREADS];
int i; int i;
int tnum[THREADS]; int tnum[THREADS];
time_t rawtime; time_t rawtime;
@ -222,7 +222,7 @@ test3()
{ {
threadrun[i] = 0; threadrun[i] = 0;
tnum[i] = i; tnum[i] = i;
thread_start(&handle[i], test3_helper, &tnum[i], 0); handle[i] = std::thread(test3_helper, &tnum[i]);
} }
for (i = 0; i < THREADS; i++) for (i = 0; i < THREADS; i++)
{ {
@ -234,7 +234,7 @@ test3()
time ( &rawtime ); time ( &rawtime );
fprintf(stderr, "%s spinlock_test 3 finished sleeps, about to wait for thread %d.\n", fprintf(stderr, "%s spinlock_test 3 finished sleeps, about to wait for thread %d.\n",
asctime (localtime ( &rawtime )), i); asctime (localtime ( &rawtime )), i);
thread_wait(handle[i]); handle[i].join();
} }
for (i = 0; i < THREADS; i++) for (i = 0; i < THREADS; i++)
{ {