GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

test/regress_be: bufferevent_enable() shouldn't call eventcb by it's own

Browse Source 
It must enter the event loop regardless BEV_OPT_DEFER_CALLBACKS, to avoid
potential errors with subsequent connect(), you will find more info in #43,
since this is a regression for it.
This commit is contained in:
Azat Khuzhin 2015-09-10 11:18:20 +03:00
parent 37dc9e0eca
commit a0f308da99
1 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
test/regress_bufferevent.c
View File

@ -597,6 +597,7 @@ static int bufferevent_connect_test_flags = 0;
static int bufferevent_trigger_test_flags = 0; static int bufferevent_trigger_test_flags = 0;
static int n_strings_read = 0; static int n_strings_read = 0;
static int n_reads_invoked = 0; static int n_reads_invoked = 0;
static int n_events_invoked = 0;
#define TEST_STR "Now is the time for all good events to signal for " \ #define TEST_STR "Now is the time for all good events to signal for " \
"the good of their protocol" "the good of their protocol"
@ -670,6 +671,14 @@ end:
; ;
} }
static void
reader_eventcb_simple(struct bufferevent *bev, short what, void *ctx)
{
TT_BLATHER(("Read eventcb simple invoked on %d.",
(int)bufferevent_getfd(bev)));
n_events_invoked++;
}
static void static void
reader_readcb(struct bufferevent *bev, void *ctx) reader_readcb(struct bufferevent *bev, void *ctx)
{ {
@ -755,6 +764,45 @@ end:
bufferevent_free(bev2); bufferevent_free(bev2);
} }
static void
test_bufferevent_connect_fail_eventcb(void *arg)
{
struct basic_test_data *data = arg;
int flags = BEV_OPT_CLOSE_ON_FREE | (long)data->setup_data;
struct bufferevent *bev = NULL;
struct evconnlistener *lev = NULL;
struct sockaddr_in localhost;
ev_socklen_t slen = sizeof(localhost);
evutil_socket_t fake_listener = -1;
fake_listener = fake_listener_create(&localhost);
tt_int_op(n_events_invoked, ==, 0);
bev = bufferevent_socket_new(data->base, -1, flags);
tt_assert(bev);
bufferevent_setcb(bev, reader_readcb, reader_readcb,
reader_eventcb_simple, data->base);
bufferevent_enable(bev, EV_READ|EV_WRITE);
tt_int_op(n_events_invoked, ==, 0);
tt_int_op(n_reads_invoked, ==, 0);
/** @see also test_bufferevent_connect_fail() */
bufferevent_socket_connect(bev, (struct sockaddr *)&localhost, slen);
tt_int_op(n_events_invoked, ==, 0);
tt_int_op(n_reads_invoked, ==, 0);
event_base_dispatch(data->base);
tt_int_op(n_events_invoked, ==, 1);
tt_int_op(n_reads_invoked, ==, 0);
end:
if (lev)
evconnlistener_free(lev);
if (bev)
bufferevent_free(bev);
if (fake_listener >= 0)
evutil_closesocket(fake_listener);
}
static void static void
want_fail_eventcb(struct bufferevent *bev, short what, void *ctx) want_fail_eventcb(struct bufferevent *bev, short what, void *ctx)
{ {
@ -1152,6 +1200,13 @@ struct testcase_t bufferevent_testcases[] = {
{ "bufferevent_zlib", NULL, TT_SKIP, NULL, NULL }, { "bufferevent_zlib", NULL, TT_SKIP, NULL, NULL },
#endif #endif
{ "bufferevent_connect_fail_eventcb_defer",
test_bufferevent_connect_fail_eventcb,
TT_FORK|TT_NEED_BASE, &basic_setup, (void*)BEV_OPT_DEFER_CALLBACKS },
{ "bufferevent_connect_fail_eventcb",
test_bufferevent_connect_fail_eventcb,
TT_FORK|TT_NEED_BASE, &basic_setup, NULL },
END_OF_TESTCASES, END_OF_TESTCASES,
}; };
@ -1176,5 +1231,13 @@ struct testcase_t bufferevent_iocp_testcases[] = {
TT_FORK|TT_NEED_BASE|TT_ENABLE_IOCP, &basic_setup, TT_FORK|TT_NEED_BASE|TT_ENABLE_IOCP, &basic_setup,
(void*)"unset_connectex" }, (void*)"unset_connectex" },
{ "bufferevent_connect_fail_eventcb_defer",
test_bufferevent_connect_fail_eventcb,
TT_FORK|TT_NEED_BASE|TT_ENABLE_IOCP, &basic_setup,
(void*)BEV_OPT_DEFER_CALLBACKS },
{ "bufferevent_connect_fail",
test_bufferevent_connect_fail_eventcb,
TT_FORK|TT_NEED_BASE|TT_ENABLE_IOCP, &basic_setup, NULL },
END_OF_TESTCASES, END_OF_TESTCASES,
}; };