2011-05-10 11:21:18 +02:00
|
|
|
/*
|
|
|
|
* Coroutine tests
|
|
|
|
*
|
|
|
|
* Copyright IBM, Corp. 2011
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
|
|
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-02-08 19:08:51 +01:00
|
|
|
#include "qemu/osdep.h"
|
2015-09-01 15:48:02 +02:00
|
|
|
#include "qemu/coroutine.h"
|
|
|
|
#include "qemu/coroutine_int.h"
|
2011-05-10 11:21:18 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check that qemu_in_coroutine() works
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void coroutine_fn verify_in_coroutine(void *opaque)
|
|
|
|
{
|
|
|
|
g_assert(qemu_in_coroutine());
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_in_coroutine(void)
|
|
|
|
{
|
|
|
|
Coroutine *coroutine;
|
|
|
|
|
|
|
|
g_assert(!qemu_in_coroutine());
|
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
coroutine = qemu_coroutine_create(verify_in_coroutine, NULL);
|
|
|
|
qemu_coroutine_enter(coroutine);
|
2011-05-10 11:21:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check that qemu_coroutine_self() works
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void coroutine_fn verify_self(void *opaque)
|
|
|
|
{
|
2016-07-04 19:10:00 +02:00
|
|
|
Coroutine **p_co = opaque;
|
|
|
|
g_assert(qemu_coroutine_self() == *p_co);
|
2011-05-10 11:21:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void test_self(void)
|
|
|
|
{
|
|
|
|
Coroutine *coroutine;
|
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
coroutine = qemu_coroutine_create(verify_self, &coroutine);
|
|
|
|
qemu_coroutine_enter(coroutine);
|
2011-05-10 11:21:18 +02:00
|
|
|
}
|
|
|
|
|
2016-09-27 17:18:35 +02:00
|
|
|
/*
|
|
|
|
* Check that qemu_coroutine_entered() works
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void coroutine_fn verify_entered_step_2(void *opaque)
|
|
|
|
{
|
|
|
|
Coroutine *caller = (Coroutine *)opaque;
|
|
|
|
|
|
|
|
g_assert(qemu_coroutine_entered(caller));
|
|
|
|
g_assert(qemu_coroutine_entered(qemu_coroutine_self()));
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
|
|
|
|
/* Once more to check it still works after yielding */
|
|
|
|
g_assert(qemu_coroutine_entered(caller));
|
|
|
|
g_assert(qemu_coroutine_entered(qemu_coroutine_self()));
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void coroutine_fn verify_entered_step_1(void *opaque)
|
|
|
|
{
|
|
|
|
Coroutine *self = qemu_coroutine_self();
|
|
|
|
Coroutine *coroutine;
|
|
|
|
|
|
|
|
g_assert(qemu_coroutine_entered(self));
|
|
|
|
|
|
|
|
coroutine = qemu_coroutine_create(verify_entered_step_2, self);
|
|
|
|
g_assert(!qemu_coroutine_entered(coroutine));
|
|
|
|
qemu_coroutine_enter(coroutine);
|
|
|
|
g_assert(!qemu_coroutine_entered(coroutine));
|
|
|
|
qemu_coroutine_enter(coroutine);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_entered(void)
|
|
|
|
{
|
|
|
|
Coroutine *coroutine;
|
|
|
|
|
|
|
|
coroutine = qemu_coroutine_create(verify_entered_step_1, NULL);
|
|
|
|
g_assert(!qemu_coroutine_entered(coroutine));
|
|
|
|
qemu_coroutine_enter(coroutine);
|
|
|
|
}
|
|
|
|
|
2011-05-10 11:21:18 +02:00
|
|
|
/*
|
|
|
|
* Check that coroutines may nest multiple levels
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
unsigned int n_enter; /* num coroutines entered */
|
|
|
|
unsigned int n_return; /* num coroutines returned */
|
|
|
|
unsigned int max; /* maximum level of nesting */
|
|
|
|
} NestData;
|
|
|
|
|
|
|
|
static void coroutine_fn nest(void *opaque)
|
|
|
|
{
|
|
|
|
NestData *nd = opaque;
|
|
|
|
|
|
|
|
nd->n_enter++;
|
|
|
|
|
|
|
|
if (nd->n_enter < nd->max) {
|
|
|
|
Coroutine *child;
|
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
child = qemu_coroutine_create(nest, nd);
|
|
|
|
qemu_coroutine_enter(child);
|
2011-05-10 11:21:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
nd->n_return++;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_nesting(void)
|
|
|
|
{
|
|
|
|
Coroutine *root;
|
|
|
|
NestData nd = {
|
|
|
|
.n_enter = 0,
|
|
|
|
.n_return = 0,
|
|
|
|
.max = 128,
|
|
|
|
};
|
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
root = qemu_coroutine_create(nest, &nd);
|
|
|
|
qemu_coroutine_enter(root);
|
2011-05-10 11:21:18 +02:00
|
|
|
|
|
|
|
/* Must enter and return from max nesting level */
|
|
|
|
g_assert_cmpint(nd.n_enter, ==, nd.max);
|
|
|
|
g_assert_cmpint(nd.n_return, ==, nd.max);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check that yield/enter transfer control correctly
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void coroutine_fn yield_5_times(void *opaque)
|
|
|
|
{
|
|
|
|
bool *done = opaque;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 5; i++) {
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
}
|
|
|
|
*done = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_yield(void)
|
|
|
|
{
|
|
|
|
Coroutine *coroutine;
|
|
|
|
bool done = false;
|
|
|
|
int i = -1; /* one extra time to return from coroutine */
|
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
coroutine = qemu_coroutine_create(yield_5_times, &done);
|
2011-05-10 11:21:18 +02:00
|
|
|
while (!done) {
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
qemu_coroutine_enter(coroutine);
|
2011-05-10 11:21:18 +02:00
|
|
|
i++;
|
|
|
|
}
|
|
|
|
g_assert_cmpint(i, ==, 5); /* coroutine must yield 5 times */
|
|
|
|
}
|
|
|
|
|
2015-02-10 11:15:59 +01:00
|
|
|
static void coroutine_fn c2_fn(void *opaque)
|
|
|
|
{
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void coroutine_fn c1_fn(void *opaque)
|
|
|
|
{
|
|
|
|
Coroutine *c2 = opaque;
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
qemu_coroutine_enter(c2);
|
2015-02-10 11:15:59 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void test_co_queue(void)
|
|
|
|
{
|
|
|
|
Coroutine *c1;
|
|
|
|
Coroutine *c2;
|
2016-08-10 13:06:55 +02:00
|
|
|
Coroutine tmp;
|
2015-02-10 11:15:59 +01:00
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
c2 = qemu_coroutine_create(c2_fn, NULL);
|
|
|
|
c1 = qemu_coroutine_create(c1_fn, c2);
|
2015-02-10 11:15:59 +01:00
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
qemu_coroutine_enter(c1);
|
2016-08-10 13:06:55 +02:00
|
|
|
|
|
|
|
/* c1 shouldn't be used any more now; make sure we segfault if it is */
|
|
|
|
tmp = *c1;
|
2015-02-10 11:15:59 +01:00
|
|
|
memset(c1, 0xff, sizeof(Coroutine));
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
qemu_coroutine_enter(c2);
|
2016-08-10 13:06:55 +02:00
|
|
|
|
|
|
|
/* Must restore the coroutine now to avoid corrupted pool */
|
|
|
|
*c1 = tmp;
|
2015-02-10 11:15:59 +01:00
|
|
|
}
|
|
|
|
|
2011-05-10 11:21:18 +02:00
|
|
|
/*
|
|
|
|
* Check that creation, enter, and return work
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void coroutine_fn set_and_exit(void *opaque)
|
|
|
|
{
|
|
|
|
bool *done = opaque;
|
|
|
|
|
|
|
|
*done = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_lifecycle(void)
|
|
|
|
{
|
|
|
|
Coroutine *coroutine;
|
|
|
|
bool done = false;
|
|
|
|
|
|
|
|
/* Create, enter, and return from coroutine */
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
coroutine = qemu_coroutine_create(set_and_exit, &done);
|
|
|
|
qemu_coroutine_enter(coroutine);
|
2011-05-10 11:21:18 +02:00
|
|
|
g_assert(done); /* expect done to be true (first time) */
|
|
|
|
|
|
|
|
/* Repeat to check that no state affects this test */
|
|
|
|
done = false;
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
coroutine = qemu_coroutine_create(set_and_exit, &done);
|
|
|
|
qemu_coroutine_enter(coroutine);
|
2011-05-10 11:21:18 +02:00
|
|
|
g_assert(done); /* expect done to be true (second time) */
|
|
|
|
}
|
|
|
|
|
2013-08-08 04:23:14 +02:00
|
|
|
|
|
|
|
#define RECORD_SIZE 10 /* Leave some room for expansion */
|
|
|
|
struct coroutine_position {
|
|
|
|
int func;
|
|
|
|
int state;
|
|
|
|
};
|
|
|
|
static struct coroutine_position records[RECORD_SIZE];
|
|
|
|
static unsigned record_pos;
|
|
|
|
|
|
|
|
static void record_push(int func, int state)
|
|
|
|
{
|
|
|
|
struct coroutine_position *cp = &records[record_pos++];
|
|
|
|
g_assert_cmpint(record_pos, <, RECORD_SIZE);
|
|
|
|
cp->func = func;
|
|
|
|
cp->state = state;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void coroutine_fn co_order_test(void *opaque)
|
|
|
|
{
|
|
|
|
record_push(2, 1);
|
|
|
|
g_assert(qemu_in_coroutine());
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
record_push(2, 2);
|
|
|
|
g_assert(qemu_in_coroutine());
|
|
|
|
}
|
|
|
|
|
|
|
|
static void do_order_test(void)
|
|
|
|
{
|
|
|
|
Coroutine *co;
|
|
|
|
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
co = qemu_coroutine_create(co_order_test, NULL);
|
2013-08-08 04:23:14 +02:00
|
|
|
record_push(1, 1);
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
qemu_coroutine_enter(co);
|
2013-08-08 04:23:14 +02:00
|
|
|
record_push(1, 2);
|
|
|
|
g_assert(!qemu_in_coroutine());
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
qemu_coroutine_enter(co);
|
2013-08-08 04:23:14 +02:00
|
|
|
record_push(1, 3);
|
|
|
|
g_assert(!qemu_in_coroutine());
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_order(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
const struct coroutine_position expected_pos[] = {
|
|
|
|
{1, 1,}, {2, 1}, {1, 2}, {2, 2}, {1, 3}
|
|
|
|
};
|
|
|
|
do_order_test();
|
|
|
|
g_assert_cmpint(record_pos, ==, 5);
|
|
|
|
for (i = 0; i < record_pos; i++) {
|
|
|
|
g_assert_cmpint(records[i].func , ==, expected_pos[i].func );
|
|
|
|
g_assert_cmpint(records[i].state, ==, expected_pos[i].state);
|
|
|
|
}
|
|
|
|
}
|
2011-05-12 09:27:39 +02:00
|
|
|
/*
|
|
|
|
* Lifecycle benchmark
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void coroutine_fn empty_coroutine(void *opaque)
|
|
|
|
{
|
|
|
|
/* Do nothing */
|
|
|
|
}
|
|
|
|
|
|
|
|
static void perf_lifecycle(void)
|
|
|
|
{
|
|
|
|
Coroutine *coroutine;
|
|
|
|
unsigned int i, max;
|
|
|
|
double duration;
|
|
|
|
|
|
|
|
max = 1000000;
|
|
|
|
|
|
|
|
g_test_timer_start();
|
|
|
|
for (i = 0; i < max; i++) {
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
coroutine = qemu_coroutine_create(empty_coroutine, NULL);
|
|
|
|
qemu_coroutine_enter(coroutine);
|
2011-05-12 09:27:39 +02:00
|
|
|
}
|
|
|
|
duration = g_test_timer_elapsed();
|
|
|
|
|
|
|
|
g_test_message("Lifecycle %u iterations: %f s\n", max, duration);
|
|
|
|
}
|
|
|
|
|
2012-02-16 13:14:06 +01:00
|
|
|
static void perf_nesting(void)
|
|
|
|
{
|
|
|
|
unsigned int i, maxcycles, maxnesting;
|
|
|
|
double duration;
|
|
|
|
|
2013-09-17 18:26:48 +02:00
|
|
|
maxcycles = 10000;
|
2013-02-19 11:59:10 +01:00
|
|
|
maxnesting = 1000;
|
2012-02-16 13:14:06 +01:00
|
|
|
Coroutine *root;
|
|
|
|
|
|
|
|
g_test_timer_start();
|
|
|
|
for (i = 0; i < maxcycles; i++) {
|
2013-09-17 18:26:48 +02:00
|
|
|
NestData nd = {
|
|
|
|
.n_enter = 0,
|
|
|
|
.n_return = 0,
|
|
|
|
.max = maxnesting,
|
|
|
|
};
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
root = qemu_coroutine_create(nest, &nd);
|
|
|
|
qemu_coroutine_enter(root);
|
2012-02-16 13:14:06 +01:00
|
|
|
}
|
|
|
|
duration = g_test_timer_elapsed();
|
|
|
|
|
|
|
|
g_test_message("Nesting %u iterations of %u depth each: %f s\n",
|
|
|
|
maxcycles, maxnesting, duration);
|
|
|
|
}
|
|
|
|
|
2013-09-17 17:09:39 +02:00
|
|
|
/*
|
|
|
|
* Yield benchmark
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void coroutine_fn yield_loop(void *opaque)
|
|
|
|
{
|
|
|
|
unsigned int *counter = opaque;
|
|
|
|
|
|
|
|
while ((*counter) > 0) {
|
|
|
|
(*counter)--;
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void perf_yield(void)
|
|
|
|
{
|
|
|
|
unsigned int i, maxcycles;
|
|
|
|
double duration;
|
|
|
|
|
|
|
|
maxcycles = 100000000;
|
|
|
|
i = maxcycles;
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
Coroutine *coroutine = qemu_coroutine_create(yield_loop, &i);
|
2013-09-17 17:09:39 +02:00
|
|
|
|
|
|
|
g_test_timer_start();
|
|
|
|
while (i > 0) {
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
qemu_coroutine_enter(coroutine);
|
2013-09-17 17:09:39 +02:00
|
|
|
}
|
|
|
|
duration = g_test_timer_elapsed();
|
|
|
|
|
|
|
|
g_test_message("Yield %u iterations: %f s\n",
|
|
|
|
maxcycles, duration);
|
|
|
|
}
|
2012-02-16 13:14:06 +01:00
|
|
|
|
2014-08-06 11:33:41 +02:00
|
|
|
static __attribute__((noinline)) void dummy(unsigned *i)
|
|
|
|
{
|
|
|
|
(*i)--;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void perf_baseline(void)
|
|
|
|
{
|
|
|
|
unsigned int i, maxcycles;
|
|
|
|
double duration;
|
|
|
|
|
|
|
|
maxcycles = 100000000;
|
|
|
|
i = maxcycles;
|
|
|
|
|
|
|
|
g_test_timer_start();
|
|
|
|
while (i > 0) {
|
|
|
|
dummy(&i);
|
|
|
|
}
|
|
|
|
duration = g_test_timer_elapsed();
|
|
|
|
|
|
|
|
g_test_message("Function call %u iterations: %f s\n",
|
|
|
|
maxcycles, duration);
|
|
|
|
}
|
|
|
|
|
2014-08-13 12:08:47 +02:00
|
|
|
static __attribute__((noinline)) void perf_cost_func(void *opaque)
|
|
|
|
{
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void perf_cost(void)
|
|
|
|
{
|
|
|
|
const unsigned long maxcycles = 40000000;
|
|
|
|
unsigned long i = 0;
|
|
|
|
double duration;
|
|
|
|
unsigned long ops;
|
|
|
|
Coroutine *co;
|
|
|
|
|
|
|
|
g_test_timer_start();
|
|
|
|
while (i++ < maxcycles) {
|
coroutine: move entry argument to qemu_coroutine_create
In practice the entry argument is always known at creation time, and
it is confusing that sometimes qemu_coroutine_enter is used with a
non-NULL argument to re-enter a coroutine (this happens in
block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value
at creation time, for consistency with e.g. aio_bh_new.
Mostly done with the following semantic patch:
@ entry1 @
expression entry, arg, co;
@@
- co = qemu_coroutine_create(entry);
+ co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry2 @
expression entry, arg;
identifier co;
@@
- Coroutine *co = qemu_coroutine_create(entry);
+ Coroutine *co = qemu_coroutine_create(entry, arg);
...
- qemu_coroutine_enter(co, arg);
+ qemu_coroutine_enter(co);
@ entry3 @
expression entry, arg;
@@
- qemu_coroutine_enter(qemu_coroutine_create(entry), arg);
+ qemu_coroutine_enter(qemu_coroutine_create(entry, arg));
@ reentry @
expression co;
@@
- qemu_coroutine_enter(co, NULL);
+ qemu_coroutine_enter(co);
except for the aforementioned few places where the semantic patch
stumbled (as expected) and for test_co_queue, which would otherwise
produce an uninitialized variable warning.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2016-07-04 19:10:01 +02:00
|
|
|
co = qemu_coroutine_create(perf_cost_func, &i);
|
|
|
|
qemu_coroutine_enter(co);
|
|
|
|
qemu_coroutine_enter(co);
|
2014-08-13 12:08:47 +02:00
|
|
|
}
|
|
|
|
duration = g_test_timer_elapsed();
|
|
|
|
ops = (long)(maxcycles / (duration * 1000));
|
|
|
|
|
|
|
|
g_test_message("Run operation %lu iterations %f s, %luK operations/s, "
|
|
|
|
"%luns per coroutine",
|
|
|
|
maxcycles,
|
|
|
|
duration, ops,
|
2014-12-02 12:05:46 +01:00
|
|
|
(unsigned long)(1000000000.0 * duration / maxcycles));
|
2014-08-13 12:08:47 +02:00
|
|
|
}
|
|
|
|
|
2011-05-10 11:21:18 +02:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
2016-05-20 20:00:31 +02:00
|
|
|
|
|
|
|
/* This test assumes there is a freelist and marks freed coroutine memory
|
|
|
|
* with a sentinel value. If there is no freelist this would legitimately
|
|
|
|
* crash, so skip it.
|
|
|
|
*/
|
|
|
|
if (CONFIG_COROUTINE_POOL) {
|
|
|
|
g_test_add_func("/basic/co_queue", test_co_queue);
|
|
|
|
}
|
|
|
|
|
2011-05-10 11:21:18 +02:00
|
|
|
g_test_add_func("/basic/lifecycle", test_lifecycle);
|
|
|
|
g_test_add_func("/basic/yield", test_yield);
|
|
|
|
g_test_add_func("/basic/nesting", test_nesting);
|
|
|
|
g_test_add_func("/basic/self", test_self);
|
2016-09-27 17:18:35 +02:00
|
|
|
g_test_add_func("/basic/entered", test_entered);
|
2011-05-10 11:21:18 +02:00
|
|
|
g_test_add_func("/basic/in_coroutine", test_in_coroutine);
|
2013-08-08 04:23:14 +02:00
|
|
|
g_test_add_func("/basic/order", test_order);
|
2011-05-12 09:27:39 +02:00
|
|
|
if (g_test_perf()) {
|
|
|
|
g_test_add_func("/perf/lifecycle", perf_lifecycle);
|
2012-02-16 13:14:06 +01:00
|
|
|
g_test_add_func("/perf/nesting", perf_nesting);
|
2013-09-17 17:09:39 +02:00
|
|
|
g_test_add_func("/perf/yield", perf_yield);
|
2014-08-06 11:33:41 +02:00
|
|
|
g_test_add_func("/perf/function-call", perf_baseline);
|
2014-08-13 12:08:47 +02:00
|
|
|
g_test_add_func("/perf/cost", perf_cost);
|
2011-05-12 09:27:39 +02:00
|
|
|
}
|
2011-05-10 11:21:18 +02:00
|
|
|
return g_test_run();
|
|
|
|
}
|