diff options
| -rw-r--r-- | docs/ccommon_api.md | 8 | ||||
| -rw-r--r-- | include/stc/algo/coroutine.h | 14 | ||||
| -rw-r--r-- | misc/examples/cointerleave.c | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/docs/ccommon_api.md b/docs/ccommon_api.md index 93ad2bb7..e4c881dd 100644 --- a/docs/ccommon_api.md +++ b/docs/ccommon_api.md @@ -361,12 +361,12 @@ To resume the coroutine from where it was suspended with *cco_yield()*, simply c | | `cco_end(ret)` | End coroutine block and return ret | | | `cco_yield()` | Yield/suspend execution | | | `cco_yield(ret)` | Yield/suspend execution and return ret | -| | `cco_yield_at(co, call)` | Yield at co call if it is suspended | -| | `cco_yield_at(co, call, ret)` | Yield at co call with ret if suspended | +| | `cco_yield_coro(co, call)` | Yield at co call if it is suspended | +| | `cco_yield_coro(co, call, ret)` | Yield at co call with ret if suspended | | | `cco_await(promise)` | Await/suspend until promise is true | | | `cco_await(promise, ret)` | Await/suspend with ret value | -| | `cco_await_at(co, call)` | Await for co call to finish | -| | `cco_await_at(co, call, ret)` | Await for co call to finish with ret | +| | `cco_await_coro(co, call)` | Await for co call to finish | +| | `cco_await_coro(co, call, ret)` | Await for co call to finish with ret | | | Semaphores: | | | | `csem` | Semaphore type | | | `cco_await_sem(sem)` | Await for the semaphore count > 0 | diff --git a/include/stc/algo/coroutine.h b/include/stc/algo/coroutine.h index 2ea7122b..8d3b79b5 100644 --- a/include/stc/algo/coroutine.h +++ b/include/stc/algo/coroutine.h @@ -82,12 +82,12 @@ enum { case __LINE__:; \ } while (0) -#define cco_yield_at(...) c_MACRO_OVERLOAD(cco_yield_at, __VA_ARGS__) -#define cco_yield_at_2(co, call) cco_yield_at_3(co, call, ) -#define cco_yield_at_3(co, call, ret) \ +#define cco_yield_coro(...) c_MACRO_OVERLOAD(cco_yield_coro, __VA_ARGS__) +#define cco_yield_coro_2(co, call) cco_yield_coro_3(co, call, ) +#define cco_yield_coro_3(co, call, ret) \ do { call; if (!cco_done(co)) cco_yield(ret); } while (0) -#define cco_await(...) c_MACRO_OVERLOAD(cco_await, __VA_ARGS__) +#define cco_await(...) c_MACRO_OVERLOAD(cco_awaitcoro, __VA_ARGS__) #define cco_await_1(promise) cco_await_2(promise, ) #define cco_await_2(promise, ret) \ do { \ @@ -95,9 +95,9 @@ enum { case __LINE__: if (!(promise)) return ret; \ } while (0) -#define cco_await_at(...) c_MACRO_OVERLOAD(cco_await_at, __VA_ARGS__) -#define cco_await_at_2(co, call) cco_await_at_3(co, call, ) -#define cco_await_at_3(co, call, ret) cco_await_2((call, cco_done(co)), ret) +#define cco_await_coro(...) c_MACRO_OVERLOAD(cco_await_coro, __VA_ARGS__) +#define cco_await_coro_2(co, call) cco_await_2((call, cco_done(co)), ) +#define cco_await_coro_3(co, call, ret) cco_await_2((call, cco_done(co)), ret) #define cco_run(co, call) while (call, !cco_done(co)) diff --git a/misc/examples/cointerleave.c b/misc/examples/cointerleave.c index d725989f..aa57808e 100644 --- a/misc/examples/cointerleave.c +++ b/misc/examples/cointerleave.c @@ -30,9 +30,9 @@ void interleaved(struct Generator* g) cco_begin(g); while (!(cco_done(&g->x) & cco_done(&g->y))) { - cco_yield_at(&g->x, g->value = get_value(&g->x)); - cco_yield_at(&g->y, g->value = get_value(&g->y)); - } + cco_yield_coro(&g->x, g->value = get_value(&g->x)); + cco_yield_coro(&g->y, g->value = get_value(&g->y)); + } cco_end(); } |