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

Fix an assertion bug in test-ratelim

Browse Source 
If the rate limit was low enough, then the echo_conns wouldn't finish
inside the 300 msec we allowed for them to close.  Instead, count the
number of connections we have, and keep waiting until they are all
closed.
This commit is contained in:
Nick Mathewson 2010-08-04 15:52:32 -04:00
parent 42f6b62414
commit b2c6202d65
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/test-ratelim.c
View File

@ -72,6 +72,8 @@ struct client_state {
ev_uint64_t received; ev_uint64_t received;
}; };
static int n_echo_conns_open = 0;
static void static void
loud_writecb(struct bufferevent *bev, void *ctx) loud_writecb(struct bufferevent *bev, void *ctx)
{ {
@ -133,6 +135,7 @@ static void
echo_eventcb(struct bufferevent *bev, short what, void *ctx) echo_eventcb(struct bufferevent *bev, short what, void *ctx)
{ {
if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) { if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) {
--n_echo_conns_open;
bufferevent_free(bev); bufferevent_free(bev);
} }
} }
@ -151,6 +154,7 @@ echo_listenercb(struct evconnlistener *listener, evutil_socket_t newsock,
bufferevent_set_rate_limit(bev, conn_bucket_cfg); bufferevent_set_rate_limit(bev, conn_bucket_cfg);
if (ratelim_group) if (ratelim_group)
bufferevent_add_to_rate_limit_group(bev, ratelim_group); bufferevent_add_to_rate_limit_group(bev, ratelim_group);
++n_echo_conns_open;
bufferevent_enable(bev, EV_READ|EV_WRITE); bufferevent_enable(bev, EV_READ|EV_WRITE);
} }
@ -166,6 +170,7 @@ test_ratelimiting(void)
struct bufferevent **bevs; struct bufferevent **bevs;
struct client_state *states; struct client_state *states;
struct bufferevent_rate_limit_group *group = NULL;
int i; int i;
@ -207,7 +212,7 @@ test_ratelimiting(void)
cfg_grouplimit, cfg_grouplimit * 4, cfg_grouplimit, cfg_grouplimit * 4,
cfg_grouplimit, cfg_grouplimit * 4, cfg_grouplimit, cfg_grouplimit * 4,
&cfg_tick); &cfg_tick);
ratelim_group = bufferevent_rate_limit_group_new( group = ratelim_group = bufferevent_rate_limit_group_new(
base, group_bucket_cfg); base, group_bucket_cfg);
expected_total_persec = cfg_grouplimit; expected_total_persec = cfg_grouplimit;
expected_avg_persec = cfg_grouplimit / cfg_n_connections; expected_avg_persec = cfg_grouplimit / cfg_n_connections;
@ -247,18 +252,27 @@ test_ratelimiting(void)
event_base_dispatch(base); event_base_dispatch(base);
for (i = 0; i < cfg_n_connections; ++i) ratelim_group = NULL; /* So no more responders get added */
for (i = 0; i < cfg_n_connections; ++i) {
bufferevent_free(bevs[i]); bufferevent_free(bevs[i]);
}
evconnlistener_free(listener); evconnlistener_free(listener);
/* Make sure no new echo_conns get added to the group. */
ratelim_group = NULL;
/* This should get _everybody_ freed */ /* This should get _everybody_ freed */
while (n_echo_conns_open) {
printf("waiting for %d conns\n", n_echo_conns_open);
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 300000; tv.tv_usec = 300000;
event_base_loopexit(base, &tv); event_base_loopexit(base, &tv);
event_base_dispatch(base); event_base_dispatch(base);
}
if (ratelim_group) if (group)
bufferevent_rate_limit_group_free(ratelim_group); bufferevent_rate_limit_group_free(group);
total_received = 0; total_received = 0;
total_persec = 0.0; total_persec = 0.0;