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

Make test-ratelim clean up after itself better.

Browse Source
This commit is contained in:
Nick Mathewson 2010-05-13 15:38:39 -04:00
parent 6d195109eb
commit b5bfc44d6b
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/test-ratelim.c
View File

@ -119,6 +119,22 @@ echo_readcb(struct bufferevent *bev, void *ctx)
bufferevent_disable(bev, EV_READ); bufferevent_disable(bev, EV_READ);
} }
static void
echo_writecb(struct bufferevent *bev, void *ctx)
{
struct evbuffer *output = bufferevent_get_output(bev);
if (evbuffer_get_length(output) < 512000)
bufferevent_enable(bev, EV_READ);
}
static void
echo_eventcb(struct bufferevent *bev, short what, void *ctx)
{
if (what & (BEV_EVENT_EOF|BEV_EVENT_ERROR)) {
bufferevent_free(bev);
}
}
static void static void
echo_listenercb(struct evconnlistener *listener, evutil_socket_t newsock, echo_listenercb(struct evconnlistener *listener, evutil_socket_t newsock,
struct sockaddr *sourceaddr, int socklen, void *ctx) struct sockaddr *sourceaddr, int socklen, void *ctx)
@ -128,7 +144,7 @@ echo_listenercb(struct evconnlistener *listener, evutil_socket_t newsock,
struct bufferevent *bev; struct bufferevent *bev;
bev = bufferevent_socket_new(base, newsock, flags); bev = bufferevent_socket_new(base, newsock, flags);
bufferevent_setcb(bev, echo_readcb, NULL, NULL, NULL); bufferevent_setcb(bev, echo_readcb, echo_writecb, echo_eventcb, NULL);
if (conn_bucket_cfg) if (conn_bucket_cfg)
bufferevent_set_rate_limit(bev, conn_bucket_cfg); bufferevent_set_rate_limit(bev, conn_bucket_cfg);
if (ratelim_group) if (ratelim_group)
@ -226,6 +242,19 @@ test_ratelimiting(void)
event_base_dispatch(base); event_base_dispatch(base);
for (i = 0; i < cfg_n_connections; ++i)
bufferevent_free(bevs[i]);
evconnlistener_free(listener);
/* This should get _everybody_ freed */
tv.tv_sec = 0;
tv.tv_usec = 300000;
event_base_loopexit(base, &tv);
event_base_dispatch(base);
if (ratelim_group)
bufferevent_rate_limit_group_free(ratelim_group);
total_received = 0; total_received = 0;
total_persec = 0.0; total_persec = 0.0;
total_sq_persec = 0.0; total_sq_persec = 0.0;
@ -350,7 +379,10 @@ main(int argc, char **argv)
err = WSAStartup(wVersionRequested, &wsaData); err = WSAStartup(wVersionRequested, &wsaData);
#endif #endif
#ifndef WIN32
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
return 1;
#endif
for (i = 1; i < argc; ++i) { for (i = 1; i < argc; ++i) {
for (j = 0; options[j].name; ++j) { for (j = 0; options[j].name; ++j) {
if (!strcmp(argv[i],options[j].name)) { if (!strcmp(argv[i],options[j].name)) {