Skip to content
This repository was archived by the owner on Aug 19, 2021. It is now read-only.

Commit 28412ed

Browse files
committed
Moved delay/period to first argument of event_call_in/event_call_every
per suggestion from @kilogram: - makes the call clearer, especially when callback argument looks like a delay value - simplifies implementation of c++11 wrappers
1 parent 32aeb78 commit 28412ed

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

events.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ int event_call(equeue_t *q, void (*cb)(void*), void *data) {
304304
return event_post(q, ecallback_dispatch, e);
305305
}
306306

307-
int event_call_in(equeue_t *q, void (*cb)(void*), void *data, int ms) {
307+
int event_call_in(equeue_t *q, int ms, void (*cb)(void*), void *data) {
308308
struct ecallback *e = event_alloc(q, sizeof(struct ecallback));
309309
if (!e) {
310310
return 0;
@@ -316,7 +316,7 @@ int event_call_in(equeue_t *q, void (*cb)(void*), void *data, int ms) {
316316
return event_post(q, ecallback_dispatch, e);
317317
}
318318

319-
int event_call_every(equeue_t *q, void (*cb)(void*), void *data, int ms) {
319+
int event_call_every(equeue_t *q, int ms, void (*cb)(void*), void *data) {
320320
struct ecallback *e = event_alloc(q, sizeof(struct ecallback));
321321
if (!e) {
322322
return 0;

events.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ void equeue_break(equeue_t *queue);
7979
// These calls will result in 0 if no memory is available, otherwise they
8080
// will result in a unique identifier that can be passed to event_cancel.
8181
int event_call(equeue_t *queue, void (*cb)(void *), void *data);
82-
int event_call_in(equeue_t *queue, void (*cb)(void *), void *data, int ms);
83-
int event_call_every(equeue_t *queue, void (*cb)(void *), void *data, int ms);
82+
int event_call_in(equeue_t *queue, int ms, void (*cb)(void *), void *data);
83+
int event_call_every(equeue_t *queue, int ms, void (*cb)(void *), void *data);
8484

8585
// Events with queue handled blocks of memory
8686
//

tests/tests.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ void simple_call_in_test(void) {
107107
test_assert(!err);
108108

109109
bool touched = false;
110-
int id = event_call_in(&q, simple_func, &touched, 5);
110+
int id = event_call_in(&q, 5, simple_func, &touched);
111111
test_assert(id);
112112

113113
equeue_dispatch(&q, 10);
@@ -122,7 +122,7 @@ void simple_call_every_test(void) {
122122
test_assert(!err);
123123

124124
bool touched = false;
125-
int id = event_call_every(&q, simple_func, &touched, 5);
125+
int id = event_call_every(&q, 5, simple_func, &touched);
126126
test_assert(id);
127127

128128
equeue_dispatch(&q, 10);
@@ -227,13 +227,13 @@ void loop_protect_test(void) {
227227
test_assert(!err);
228228

229229
bool touched = false;
230-
event_call_every(&q, simple_func, &touched, 0);
230+
event_call_every(&q, 0, simple_func, &touched);
231231

232232
equeue_dispatch(&q, 0);
233233
test_assert(touched);
234234

235235
touched = false;
236-
event_call_every(&q, simple_func, &touched, 1);
236+
event_call_every(&q, 1, simple_func, &touched);
237237

238238
equeue_dispatch(&q, 0);
239239
test_assert(touched);
@@ -247,7 +247,7 @@ void break_test(void) {
247247
test_assert(!err);
248248

249249
bool touched = false;
250-
event_call_every(&q, simple_func, &touched, 0);
250+
event_call_every(&q, 0, simple_func, &touched);
251251

252252
equeue_break(&q);
253253
equeue_dispatch(&q, -1);

0 commit comments

Comments
 (0)