cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-17 08:17:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in the new main/event_foreach test

Browse Source 
It wasn't making sure that the events weren't internal.
This commit is contained in:
Nick Mathewson 2013-04-26 19:14:05 -04:00
parent d5967397b0
commit 702c9aa403
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/regress.c
View File

@ -2684,6 +2684,8 @@ foreach_count_cb(const struct event_base *base, const struct event *ev, void *ar
{ {
struct foreach_helper *h = event_get_callback_arg(ev); struct foreach_helper *h = event_get_callback_arg(ev);
struct timeval *tv = arg; struct timeval *tv = arg;
if (event_get_callback(ev) != timeout_cb)
return 0;
tt_ptr_op(event_get_base(ev), ==, base); tt_ptr_op(event_get_base(ev), ==, base);
tt_int_op(tv->tv_sec, ==, 10); tt_int_op(tv->tv_sec, ==, 10);
h->ev = ev; h->ev = ev;
@ -2698,6 +2700,8 @@ foreach_find_cb(const struct event_base *base, const struct event *ev, void *arg
{ {
const struct event **ev_out = arg; const struct event **ev_out = arg;
struct foreach_helper *h = event_get_callback_arg(ev); struct foreach_helper *h = event_get_callback_arg(ev);
if (event_get_callback(ev) != timeout_cb)
return 0;
if (h->count == 99) { if (h->count == 99) {
*ev_out = ev; *ev_out = ev;
return 101; return 101;
@ -2716,15 +2720,15 @@ test_event_foreach(void *arg)
struct timeval ten_sec = {10,0}; struct timeval ten_sec = {10,0};
const struct event *ev_found = NULL; const struct event *ev_found = NULL;
tt_int_op(-1, ==, event_base_foreach_event(NULL, foreach_count_cb, NULL));
tt_int_op(-1, ==, event_base_foreach_event(base, NULL, NULL));
for (i = 0; i < 5; ++i) { for (i = 0; i < 5; ++i) {
visited[i].count = 0; visited[i].count = 0;
visited[i].ev = NULL; visited[i].ev = NULL;
ev[i] = event_new(base, -1, 0, timeout_cb, &visited[i]); ev[i] = event_new(base, -1, 0, timeout_cb, &visited[i]);
} }
tt_int_op(-1, ==, event_base_foreach_event(NULL, foreach_count_cb, NULL));
tt_int_op(-1, ==, event_base_foreach_event(base, NULL, NULL));
event_add(ev[0], &ten_sec); event_add(ev[0], &ten_sec);
event_add(ev[1], &ten_sec); event_add(ev[1], &ten_sec);
event_active(ev[1], EV_TIMEOUT, 1); event_active(ev[1], EV_TIMEOUT, 1);