cleanup_test();
}
-/*
- * simple bufferevent test
- */
-
-static void
-readcb(struct bufferevent *bev, void *arg)
-{
- if (EVBUFFER_LENGTH(bev->input) == 8333) {
- struct evbuffer *evbuf = evbuffer_new();
- assert(evbuf != NULL);
-
- /* gratuitous test of bufferevent_read_buffer */
- bufferevent_read_buffer(bev, evbuf);
-
- bufferevent_disable(bev, EV_READ);
-
- if (EVBUFFER_LENGTH(evbuf) == 8333) {
- test_ok++;
- }
-
- evbuffer_free(evbuf);
- }
-}
-
-static void
-writecb(struct bufferevent *bev, void *arg)
-{
- if (EVBUFFER_LENGTH(bev->output) == 0) {
- test_ok++;
- }
-}
-
-static void
-errorcb(struct bufferevent *bev, short what, void *arg)
-{
- test_ok = -2;
-}
-
-/*XXXX move to regress_bufferevent.c; make static again. */
-void
-test_bufferevent(void)
-{
- struct bufferevent *bev1, *bev2;
- char buffer[8333];
- int i;
-
- setup_test("Bufferevent: ");
-
- bev1 = bufferevent_new(pair[0], readcb, writecb, errorcb, NULL);
- bev2 = bufferevent_new(pair[1], readcb, writecb, errorcb, NULL);
-
- bufferevent_disable(bev1, EV_READ);
- bufferevent_enable(bev2, EV_READ);
-
- for (i = 0; i < sizeof(buffer); i++)
- buffer[i] = i;
-
- bufferevent_write(bev1, buffer, sizeof(buffer));
-
- event_dispatch();
-
- bufferevent_free(bev1);
- bufferevent_free(bev2);
-
- if (test_ok != 2)
- test_ok = 0;
-
- cleanup_test();
-}
-
-/*
- * test watermarks and bufferevent
- */
-
-static void
-wm_readcb(struct bufferevent *bev, void *arg)
-{
- struct evbuffer *evbuf = evbuffer_new();
- int len = EVBUFFER_LENGTH(bev->input);
- static int nread;
-
- assert(len >= 10 && len <= 20);
-
- assert(evbuf != NULL);
-
- /* gratuitous test of bufferevent_read_buffer */
- bufferevent_read_buffer(bev, evbuf);
-
- nread += len;
- if (nread == 65000) {
- bufferevent_disable(bev, EV_READ);
- test_ok++;
- }
-
- evbuffer_free(evbuf);
-}
-
-static void
-wm_writecb(struct bufferevent *bev, void *arg)
-{
- assert(EVBUFFER_LENGTH(bev->output) <= 100);
- if (EVBUFFER_LENGTH(bev->output) == 0) {
- evbuffer_drain(bev->output, EVBUFFER_LENGTH(bev->output));
- test_ok++;
- }
-}
-
-static void
-wm_errorcb(struct bufferevent *bev, short what, void *arg)
-{
- test_ok = -2;
-}
-
-/*XXXX move to regress_bufferevent.c; make static again. */
-void
-test_bufferevent_watermarks(void)
-{
- struct bufferevent *bev1, *bev2;
- char buffer[65000];
- int i;
-
- setup_test("Bufferevent Watermarks: ");
-
- bev1 = bufferevent_new(pair[0], NULL, wm_writecb, wm_errorcb, NULL);
- bev2 = bufferevent_new(pair[1], wm_readcb, NULL, wm_errorcb, NULL);
-
- bufferevent_disable(bev1, EV_READ);
- bufferevent_enable(bev2, EV_READ);
-
- for (i = 0; i < sizeof(buffer); i++)
- buffer[i] = (char)i;
-
- bufferevent_write(bev1, buffer, sizeof(buffer));
-
- /* limit the reading on the receiving bufferevent */
- bufferevent_setwatermark(bev2, EV_READ, 10, 20);
-
- /* Tell the sending bufferevent not to notify us till it's down to
- 100 bytes. */
- bufferevent_setwatermark(bev1, EV_WRITE, 100, 2000);
-
- event_dispatch();
-
- tt_int_op(test_ok, ==, 2);
-
- /* The write callback drained all the data from outbuf, so we
- * should have removed the write event... */
- tt_assert(!event_pending(&bev2->ev_write, EV_WRITE, NULL));
-
-end:
- bufferevent_free(bev1);
- bufferevent_free(bev2);
-
- cleanup_test();
-}
-
-/*
- * Test bufferevent filters
- */
-
-/* strip an 'x' from each byte */
-
-static enum bufferevent_filter_result
-bufferevent_input_filter(struct evbuffer *src, struct evbuffer *dst,
- ssize_t lim, enum bufferevent_flush_mode state, void *ctx)
-{
- const unsigned char *buffer;
- int i;
-
- buffer = evbuffer_pullup(src, EVBUFFER_LENGTH(src));
- for (i = 0; i < EVBUFFER_LENGTH(src); i += 2) {
- assert(buffer[i] == 'x');
- evbuffer_add(dst, buffer + i + 1, 1);
-
- if (i + 2 > EVBUFFER_LENGTH(src))
- break;
- }
-
- evbuffer_drain(src, i);
- return (BEV_OK);
-}
-
-/* add an 'x' before each byte */
-
-static enum bufferevent_filter_result
-bufferevent_output_filter(struct evbuffer *src, struct evbuffer *dst,
- ssize_t lim, enum bufferevent_flush_mode state, void *ctx)
-{
- const unsigned char *buffer;
- int i;
-
- buffer = evbuffer_pullup(src, EVBUFFER_LENGTH(src));
- for (i = 0; i < EVBUFFER_LENGTH(src); ++i) {
- evbuffer_add(dst, "x", 1);
- evbuffer_add(dst, buffer + i, 1);
- }
-
- evbuffer_drain(src, EVBUFFER_LENGTH(src));
- return (BEV_OK);
-}
-
-
-/*XXXX move to regress_bufferevent.c; make static again. */
-void
-test_bufferevent_filters(void)
-{
- struct bufferevent *bev1, *bev2;
- char buffer[8333];
- int i;
-
- test_ok = 0;
- setup_test("Bufferevent Filters: ");
-
- bev1 = bufferevent_socket_new(NULL, pair[0], 0);
- bev2 = bufferevent_socket_new(NULL, pair[1], 0);
-
- for (i = 0; i < sizeof(buffer); i++)
- buffer[i] = i;
-
- bev1 = bufferevent_filter_new(bev1, NULL, bufferevent_output_filter,
- 0, NULL, NULL);
-
- bev2 = bufferevent_filter_new(bev2, bufferevent_input_filter,
- NULL, 0, NULL, NULL);
- bufferevent_setcb(bev1, NULL, writecb, errorcb, NULL);
- bufferevent_setcb(bev2, readcb, NULL, errorcb, NULL);
-
- bufferevent_disable(bev1, EV_READ);
- bufferevent_enable(bev2, EV_READ);
- /* insert some filters */
- bufferevent_write(bev1, buffer, sizeof(buffer));
-
- event_dispatch();
-
- bufferevent_free(bev1);
- bufferevent_free(bev2);
-
- if (test_ok != 2)
- test_ok = 0;
-
- cleanup_test();
-}
-
struct test_pri_event {
struct event ev;
int count;
#include "tinytest.h"
#include "tinytest_macros.h"
-/*XXX move these to regress_bufferevent.c when bufferevent changes are
- * merged. */
-void test_bufferevent(void);
-void test_bufferevent_watermarks(void);
-void test_bufferevent_filters(void);
-
extern struct testcase_t legacy_testcases[];
extern struct testcase_t evbuffer_testcases[];
extern struct testcase_t bufferevent_testcases[];
#include "regress.h"
+/*
+ * simple bufferevent test
+ */
+
+static void
+readcb(struct bufferevent *bev, void *arg)
+{
+ if (EVBUFFER_LENGTH(bev->input) == 8333) {
+ struct evbuffer *evbuf = evbuffer_new();
+ assert(evbuf != NULL);
+
+ /* gratuitous test of bufferevent_read_buffer */
+ bufferevent_read_buffer(bev, evbuf);
+
+ bufferevent_disable(bev, EV_READ);
+
+ if (EVBUFFER_LENGTH(evbuf) == 8333) {
+ test_ok++;
+ }
+
+ evbuffer_free(evbuf);
+ }
+}
+
+static void
+writecb(struct bufferevent *bev, void *arg)
+{
+ if (EVBUFFER_LENGTH(bev->output) == 0) {
+ test_ok++;
+ }
+}
+
+static void
+errorcb(struct bufferevent *bev, short what, void *arg)
+{
+ test_ok = -2;
+}
+
+static void
+test_bufferevent(void)
+{
+ struct bufferevent *bev1, *bev2;
+ char buffer[8333];
+ int i;
+
+ bev1 = bufferevent_new(pair[0], readcb, writecb, errorcb, NULL);
+ bev2 = bufferevent_new(pair[1], readcb, writecb, errorcb, NULL);
+
+ bufferevent_disable(bev1, EV_READ);
+ bufferevent_enable(bev2, EV_READ);
+
+ for (i = 0; i < sizeof(buffer); i++)
+ buffer[i] = i;
+
+ bufferevent_write(bev1, buffer, sizeof(buffer));
+
+ event_dispatch();
+
+ bufferevent_free(bev1);
+ bufferevent_free(bev2);
+
+ if (test_ok != 2)
+ test_ok = 0;
+
+}
+
+/*
+ * test watermarks and bufferevent
+ */
+
+static void
+wm_readcb(struct bufferevent *bev, void *arg)
+{
+ struct evbuffer *evbuf = evbuffer_new();
+ int len = EVBUFFER_LENGTH(bev->input);
+ static int nread;
+
+ assert(len >= 10 && len <= 20);
+
+ assert(evbuf != NULL);
+
+ /* gratuitous test of bufferevent_read_buffer */
+ bufferevent_read_buffer(bev, evbuf);
+
+ nread += len;
+ if (nread == 65000) {
+ bufferevent_disable(bev, EV_READ);
+ test_ok++;
+ }
+
+ evbuffer_free(evbuf);
+}
+
+static void
+wm_writecb(struct bufferevent *bev, void *arg)
+{
+ assert(EVBUFFER_LENGTH(bev->output) <= 100);
+ if (EVBUFFER_LENGTH(bev->output) == 0) {
+ evbuffer_drain(bev->output, EVBUFFER_LENGTH(bev->output));
+ test_ok++;
+ }
+}
+
+static void
+wm_errorcb(struct bufferevent *bev, short what, void *arg)
+{
+ test_ok = -2;
+}
+
+static void
+test_bufferevent_watermarks(void)
+{
+ struct bufferevent *bev1, *bev2;
+ char buffer[65000];
+ int i;
+
+ bev1 = bufferevent_new(pair[0], NULL, wm_writecb, wm_errorcb, NULL);
+ bev2 = bufferevent_new(pair[1], wm_readcb, NULL, wm_errorcb, NULL);
+
+ bufferevent_disable(bev1, EV_READ);
+ bufferevent_enable(bev2, EV_READ);
+
+ for (i = 0; i < sizeof(buffer); i++)
+ buffer[i] = (char)i;
+
+ bufferevent_write(bev1, buffer, sizeof(buffer));
+
+ /* limit the reading on the receiving bufferevent */
+ bufferevent_setwatermark(bev2, EV_READ, 10, 20);
+
+ /* Tell the sending bufferevent not to notify us till it's down to
+ 100 bytes. */
+ bufferevent_setwatermark(bev1, EV_WRITE, 100, 2000);
+
+ event_dispatch();
+
+ tt_int_op(test_ok, ==, 2);
+
+ /* The write callback drained all the data from outbuf, so we
+ * should have removed the write event... */
+ tt_assert(!event_pending(&bev2->ev_write, EV_WRITE, NULL));
+
+end:
+ bufferevent_free(bev1);
+ bufferevent_free(bev2);
+}
+
+/*
+ * Test bufferevent filters
+ */
+
+/* strip an 'x' from each byte */
+
+static enum bufferevent_filter_result
+bufferevent_input_filter(struct evbuffer *src, struct evbuffer *dst,
+ ssize_t lim, enum bufferevent_flush_mode state, void *ctx)
+{
+ const unsigned char *buffer;
+ int i;
+
+ buffer = evbuffer_pullup(src, EVBUFFER_LENGTH(src));
+ for (i = 0; i < EVBUFFER_LENGTH(src); i += 2) {
+ assert(buffer[i] == 'x');
+ evbuffer_add(dst, buffer + i + 1, 1);
+
+ if (i + 2 > EVBUFFER_LENGTH(src))
+ break;
+ }
+
+ evbuffer_drain(src, i);
+ return (BEV_OK);
+}
+
+/* add an 'x' before each byte */
+
+static enum bufferevent_filter_result
+bufferevent_output_filter(struct evbuffer *src, struct evbuffer *dst,
+ ssize_t lim, enum bufferevent_flush_mode state, void *ctx)
+{
+ const unsigned char *buffer;
+ int i;
+
+ buffer = evbuffer_pullup(src, EVBUFFER_LENGTH(src));
+ for (i = 0; i < EVBUFFER_LENGTH(src); ++i) {
+ evbuffer_add(dst, "x", 1);
+ evbuffer_add(dst, buffer + i, 1);
+ }
+
+ evbuffer_drain(src, EVBUFFER_LENGTH(src));
+ return (BEV_OK);
+}
+
+
+static void
+test_bufferevent_filters(void)
+{
+ struct bufferevent *bev1, *bev2;
+ char buffer[8333];
+ int i;
+
+ test_ok = 0;
+
+ bev1 = bufferevent_socket_new(NULL, pair[0], 0);
+ bev2 = bufferevent_socket_new(NULL, pair[1], 0);
+
+ for (i = 0; i < sizeof(buffer); i++)
+ buffer[i] = i;
+
+ bev1 = bufferevent_filter_new(bev1, NULL, bufferevent_output_filter,
+ 0, NULL, NULL);
+
+ bev2 = bufferevent_filter_new(bev2, bufferevent_input_filter,
+ NULL, 0, NULL, NULL);
+ bufferevent_setcb(bev1, NULL, writecb, errorcb, NULL);
+ bufferevent_setcb(bev2, readcb, NULL, errorcb, NULL);
+
+ bufferevent_disable(bev1, EV_READ);
+ bufferevent_enable(bev2, EV_READ);
+ /* insert some filters */
+ bufferevent_write(bev1, buffer, sizeof(buffer));
+
+ event_dispatch();
+
+ bufferevent_free(bev1);
+ bufferevent_free(bev2);
+
+ if (test_ok != 2)
+ test_ok = 0;
+}
+
struct testcase_t bufferevent_testcases[] = {
LEGACY(bufferevent, TT_ISOLATED),
projects / libevent / commitdiff