Skip to content

Commit 0eadf04

Browse files
committed
Change context_get and context_set
1 parent 9861873 commit 0eadf04

File tree

5 files changed

+26
-19
lines changed

5 files changed

+26
-19
lines changed

crates/c/src/lib.rs

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -772,8 +772,10 @@ typedef enum {snake}_waitable_state {{
772772
773773
void {snake}_backpressure_inc(void);
774774
void {snake}_backpressure_dec(void);
775-
void* {snake}_context_get(size_t index);
776-
void {snake}_context_set(size_t index, void* value);
775+
void* {snake}_context_get_0(void);
776+
void {snake}_context_set_0(void* value);
777+
void* {snake}_context_get_1(void);
778+
void {snake}_context_set_1(void* value);
777779
void {snake}_thread_yield(void);
778780
uint32_t {snake}_thread_yield_cancellable(void);
779781
uint32_t {snake}_thread_index(void);
@@ -865,10 +867,12 @@ extern void* __context_get_0(void);
865867
__attribute__((__import_module__("$root"), __import_name__("[context-get-1]")))
866868
extern void* __context_get_1(void);
867869
868-
void* {snake}_context_get(size_t index) {{
869-
if (index == 0) return __context_get_0();
870-
if (index == 1) return __context_get_1();
871-
return NULL;
870+
void* {snake}_context_get_0(void) {{
871+
return __context_get_0();
872+
}}
873+
874+
void* {snake}_context_get_1(void) {{
875+
return __context_get_1();
872876
}}
873877
874878
__attribute__((__import_module__("$root"), __import_name__("[context-set-0]")))
@@ -877,9 +881,12 @@ extern void __context_set_0(void*);
877881
__attribute__((__import_module__("$root"), __import_name__("[context-set-1]")))
878882
extern void __context_set_1(void*);
879883
880-
void {snake}_context_set(size_t index, void *value) {{
881-
if (index == 0) __context_set_0(value);
882-
else if (index == 1) __context_set_1(value);
884+
void {snake}_context_set_0(void *value) {{
885+
__context_set_0(value);
886+
}}
887+
888+
void {snake}_context_set_1(void *value) {{
889+
__context_set_1(value);
883890
}}
884891
885892
__attribute__((__import_module__("$root"), __import_name__("[thread-yield]")))

tests/runtime-async/async/cancel-import/test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ test_callback_code_t exports_test_pending_import(exports_test_future_void_t x) {
1818
task->set = test_waitable_set_new();
1919
test_waitable_join(task->future, task->set);
2020

21-
test_context_set(0, task);
21+
test_context_set_0(task);
2222
return TEST_CALLBACK_CODE_WAIT(task->set);
2323
}
2424

2525
test_callback_code_t exports_test_pending_import_callback(test_event_t *event) {
26-
struct my_task *task = (struct my_task*) test_context_get(0);
26+
struct my_task *task = (struct my_task*) test_context_get_0();
2727
if (event->event == TEST_EVENT_CANCEL) {
2828
assert(event->waitable == 0);
2929
assert(event->code == 0);

tests/runtime-async/async/future-cancel-read/test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ test_callback_code_t exports_test_start_read_then_cancel(
5858

5959
test_waitable_join(signal, state->set);
6060

61-
test_context_set(0, state);
61+
test_context_set_0(state);
6262
return TEST_CALLBACK_CODE_WAIT(state->set);
6363
}
6464

6565
test_callback_code_t exports_test_start_read_then_cancel_callback(test_event_t *event) {
6666
struct start_read_then_cancel_state *state =
67-
(struct start_read_then_cancel_state*) test_context_get(0);
67+
(struct start_read_then_cancel_state*) test_context_get_0();
6868
assert(event->event == TEST_EVENT_FUTURE_READ);
6969
assert(event->waitable == state->signal);
7070
assert(TEST_WAITABLE_STATE(event->code) == TEST_WAITABLE_COMPLETED);

tests/runtime-async/async/pending-import/test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ test_callback_code_t exports_test_pending_import(exports_test_future_void_t x) {
1818
task->set = test_waitable_set_new();
1919
test_waitable_join(task->future, task->set);
2020

21-
test_context_set(0, task);
21+
test_context_set_0(task);
2222
return TEST_CALLBACK_CODE_WAIT(task->set);
2323
}
2424

2525
test_callback_code_t exports_test_pending_import_callback(test_event_t *event) {
26-
struct my_task *task = (struct my_task*) test_context_get(0);
26+
struct my_task *task = (struct my_task*) test_context_get_0();
2727
assert(event->event == TEST_EVENT_FUTURE_READ);
2828
assert(event->waitable == task->future);
2929
assert(TEST_WAITABLE_STATE(event->code) == TEST_WAITABLE_COMPLETED);

tests/runtime-async/async/ping-pong/test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ test_callback_code_t exports_test_ping(exports_test_future_string_t x, test_stri
3333

3434
// Register ourselves as waiting on the future, then block our task.
3535
test_waitable_join(task->future, task->set);
36-
test_context_set(0, task);
36+
test_context_set_0(task);
3737
return TEST_CALLBACK_CODE_WAIT(task->set);
3838
}
3939

4040
test_callback_code_t exports_test_ping_callback(test_event_t *event) {
41-
struct ping_task *task = (struct ping_task*) test_context_get(0);
41+
struct ping_task *task = (struct ping_task*) test_context_get_0();
4242
switch (task->state) {
4343
case PING_S1: {
4444
// Assert that our future read completed and discard the read end of the
@@ -126,12 +126,12 @@ test_callback_code_t exports_test_pong(exports_test_future_string_t x) {
126126
assert(status == TEST_WAITABLE_STATUS_BLOCKED);
127127
test_waitable_join(task->future, task->set);
128128

129-
test_context_set(0, task);
129+
test_context_set_0(task);
130130
return TEST_CALLBACK_CODE_WAIT(task->set);
131131
}
132132

133133
test_callback_code_t exports_test_pong_callback(test_event_t *event) {
134-
struct pong_task *task = (struct pong_task*) test_context_get(0);
134+
struct pong_task *task = (struct pong_task*) test_context_get_0();
135135

136136
// assert this event is a future read completion
137137
assert(event->event == TEST_EVENT_FUTURE_READ);

0 commit comments

Comments
 (0)