Skip to content

Commit

Permalink
Moved delay/period to first argument of event_call_in/event_call_every
Browse files Browse the repository at this point in the history
per suggestion from @kilogram:
- makes the call clearer, especially when callback argument looks like
  a delay value
- simplifies implementation of c++11 wrappers
  • Loading branch information
geky committed Jul 5, 2016
1 parent 32aeb78 commit 28412ed
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions events.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ int event_call(equeue_t *q, void (*cb)(void*), void *data) {
return event_post(q, ecallback_dispatch, e);
}

int event_call_in(equeue_t *q, void (*cb)(void*), void *data, int ms) {
int event_call_in(equeue_t *q, int ms, void (*cb)(void*), void *data) {
struct ecallback *e = event_alloc(q, sizeof(struct ecallback));
if (!e) {
return 0;
Expand All @@ -316,7 +316,7 @@ int event_call_in(equeue_t *q, void (*cb)(void*), void *data, int ms) {
return event_post(q, ecallback_dispatch, e);
}

int event_call_every(equeue_t *q, void (*cb)(void*), void *data, int ms) {
int event_call_every(equeue_t *q, int ms, void (*cb)(void*), void *data) {
struct ecallback *e = event_alloc(q, sizeof(struct ecallback));
if (!e) {
return 0;
Expand Down
4 changes: 2 additions & 2 deletions events.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ void equeue_break(equeue_t *queue);
// These calls will result in 0 if no memory is available, otherwise they
// will result in a unique identifier that can be passed to event_cancel.
int event_call(equeue_t *queue, void (*cb)(void *), void *data);
int event_call_in(equeue_t *queue, void (*cb)(void *), void *data, int ms);
int event_call_every(equeue_t *queue, void (*cb)(void *), void *data, int ms);
int event_call_in(equeue_t *queue, int ms, void (*cb)(void *), void *data);
int event_call_every(equeue_t *queue, int ms, void (*cb)(void *), void *data);

// Events with queue handled blocks of memory
//
Expand Down
10 changes: 5 additions & 5 deletions tests/tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void simple_call_in_test(void) {
test_assert(!err);

bool touched = false;
int id = event_call_in(&q, simple_func, &touched, 5);
int id = event_call_in(&q, 5, simple_func, &touched);
test_assert(id);

equeue_dispatch(&q, 10);
Expand All @@ -122,7 +122,7 @@ void simple_call_every_test(void) {
test_assert(!err);

bool touched = false;
int id = event_call_every(&q, simple_func, &touched, 5);
int id = event_call_every(&q, 5, simple_func, &touched);
test_assert(id);

equeue_dispatch(&q, 10);
Expand Down Expand Up @@ -227,13 +227,13 @@ void loop_protect_test(void) {
test_assert(!err);

bool touched = false;
event_call_every(&q, simple_func, &touched, 0);
event_call_every(&q, 0, simple_func, &touched);

equeue_dispatch(&q, 0);
test_assert(touched);

touched = false;
event_call_every(&q, simple_func, &touched, 1);
event_call_every(&q, 1, simple_func, &touched);

equeue_dispatch(&q, 0);
test_assert(touched);
Expand All @@ -247,7 +247,7 @@ void break_test(void) {
test_assert(!err);

bool touched = false;
event_call_every(&q, simple_func, &touched, 0);
event_call_every(&q, 0, simple_func, &touched);

equeue_break(&q);
equeue_dispatch(&q, -1);
Expand Down

0 comments on commit 28412ed

Please sign in to comment.