mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-thread-pool: be more reliable

Browse Source 
There is a rare race between the atomic_cmpxchg and
bdrv_aio_cancel/bdrv_aio_cancel_async invocations.  Detect it, the
only sensible we can do about it is to exit long_cb immediately.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-03-14 19:20:07 +01:00
parent ad88e4252f
commit aa0d7ed658
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/test-thread-pool.c
View File

@ -27,9 +27,10 @@ static int worker_cb(void *opaque)
static int long_cb(void *opaque) static int long_cb(void *opaque)
{ {
WorkerTestData *data = opaque; WorkerTestData *data = opaque;
atomic_inc(&data->n); if (atomic_cmpxchg(&data->n, 0, 1) == 0) {
g_usleep(2000000); g_usleep(2000000);
atomic_inc(&data->n); atomic_or(&data->n, 2);
}
return 0; return 0;
} }
@ -171,7 +172,7 @@ static void do_test_cancel(bool sync)
/* Cancel the jobs that haven't been started yet. */ /* Cancel the jobs that haven't been started yet. */
num_canceled = 0; num_canceled = 0;
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
if (atomic_cmpxchg(&data[i].n, 0, 3) == 0) { if (atomic_cmpxchg(&data[i].n, 0, 4) == 0) {
data[i].ret = -ECANCELED; data[i].ret = -ECANCELED;
if (sync) { if (sync) {
bdrv_aio_cancel(data[i].aiocb); bdrv_aio_cancel(data[i].aiocb);
@ -185,7 +186,7 @@ static void do_test_cancel(bool sync)
g_assert_cmpint(num_canceled, <, 100); g_assert_cmpint(num_canceled, <, 100);
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
if (data[i].aiocb && data[i].n != 3) { if (data[i].aiocb && atomic_read(&data[i].n) < 4) {
if (sync) { if (sync) {
/* Canceling the others will be a blocking operation. */ /* Canceling the others will be a blocking operation. */
bdrv_aio_cancel(data[i].aiocb); bdrv_aio_cancel(data[i].aiocb);
@ -201,13 +202,22 @@ static void do_test_cancel(bool sync)
} }
g_assert_cmpint(active, ==, 0); g_assert_cmpint(active, ==, 0);
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
if (data[i].n == 3) { g_assert(data[i].aiocb == NULL);
switch (data[i].n) {
case 0:
fprintf(stderr, "Callback not canceled but never started?\n");
abort();
case 3:
/* Couldn't be canceled asynchronously, must have completed. */
g_assert_cmpint(data[i].ret, ==, 0);
break;
case 4:
/* Could be canceled asynchronously, never started. */
g_assert_cmpint(data[i].ret, ==, -ECANCELED); g_assert_cmpint(data[i].ret, ==, -ECANCELED);
g_assert(data[i].aiocb == NULL); break;
} else { default:
g_assert_cmpint(data[i].n, ==, 2); fprintf(stderr, "Callback aborted while running?\n");
g_assert(data[i].ret == 0 || data[i].ret == -ECANCELED); abort();
g_assert(data[i].aiocb == NULL);
} }
} }
} }