walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

tests: Fix failmalloc tests

This commit is contained in:
Tatsuhiro Tsujikawa 2014-05-10 19:38:37 +09:00
parent 0707720b11
commit d46e13ae52
3 changed files with 109 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

231
tests/failmalloc_test.c
View File

@ -1,7 +1,7 @@
/*
* nghttp2 - HTTP/2 C Library
*
* Copyright (c) 2012 Tatsuhiro Tsujikawa
* Copyright (c) 2012, 2014 Tatsuhiro Tsujikawa
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -46,12 +46,18 @@ typedef struct {
size_t data_source_length;
} my_user_data;
static void data_feed_init(data_feed *df, uint8_t *data, size_t data_length)
static void data_feed_init(data_feed *df, nghttp2_bufs *bufs)
{
nghttp2_buf *buf;
size_t data_length;
buf = &bufs->head->buf;
data_length = nghttp2_buf_len(buf);
assert(data_length <= sizeof(df->data));
memcpy(df->data, data, data_length);
memcpy(df->data, buf->pos, data_length);
df->datamark = df->data;
df->datalimit = df->data+data_length;
df->datalimit = df->data + data_length;
}
static ssize_t null_send_callback(nghttp2_session *session,
@ -75,7 +81,7 @@ static ssize_t data_feed_recv_callback(nghttp2_session *session,
static ssize_t fixed_length_data_source_read_callback
(nghttp2_session *session, int32_t stream_id,
uint8_t *buf, size_t len, int *eof,
uint8_t *buf, size_t len, uint32_t *data_flags,
nghttp2_data_source *source, void *user_data)
{
my_user_data *ud = (my_user_data*)user_data;
@ -87,28 +93,30 @@ static ssize_t fixed_length_data_source_read_callback
}
ud->data_source_length -= wlen;
if(ud->data_source_length == 0) {
*eof = 1;
*data_flags = NGHTTP2_DATA_FLAG_EOF;
}
return wlen;
}
#define TEST_FAILMALLOC_RUN(FUN) \
size_t nmalloc, i; \
do { \
size_t nmalloc, i; \
\
nghttp2_failmalloc = 0; \
nghttp2_nmalloc = 0; \
FUN(); \
nmalloc = nghttp2_nmalloc; \
\
nghttp2_failmalloc = 1; \
for(i = 0; i < nmalloc; ++i) { \
nghttp2_failmalloc = 0; \
nghttp2_nmalloc = 0; \
nghttp2_failstart = i; \
/* printf("i=%zu\n", i); */ \
FUN(); \
/* printf("nmalloc=%d\n", nghttp2_nmalloc); */ \
} \
nghttp2_failmalloc = 0;
nmalloc = nghttp2_nmalloc; \
\
nghttp2_failmalloc = 1; \
for(i = 0; i < nmalloc; ++i) { \
nghttp2_nmalloc = 0; \
nghttp2_failstart = i; \
/* printf("i=%zu\n", i); */ \
FUN(); \
/* printf("nmalloc=%d\n", nghttp2_nmalloc); */ \
} \
nghttp2_failmalloc = 0; \
} while(0)
static void run_nghttp2_session_send(void)
{
@ -137,13 +145,13 @@ static void run_nghttp2_session_send(void)
if(rv != 0) {
goto client_new_fail;
}
rv = nghttp2_submit_request(session, 3, nv, ARRLEN(nv), &data_prd, NULL);
if(rv != 0) {
rv = nghttp2_submit_request(session, NULL, nv, ARRLEN(nv), &data_prd, NULL);
if(rv < 0) {
goto fail;
}
rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, -1,
NGHTTP2_PRI_DEFAULT, nv, ARRLEN(nv), NULL);
if(rv != 0) {
rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, -1, NULL,
nv, ARRLEN(nv), NULL);
if(rv < 0) {
goto fail;
}
rv = nghttp2_session_send(session);
@ -152,8 +160,8 @@ static void run_nghttp2_session_send(void)
}
/* The HEADERS submitted by the previous nghttp2_submit_headers will
have stream ID 3. Send HEADERS to that stream. */
rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 3,
NGHTTP2_PRI_DEFAULT, nv, ARRLEN(nv), NULL);
rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 3, NULL,
nv, ARRLEN(nv), NULL);
if(rv != 0) {
goto fail;
}
@ -175,8 +183,8 @@ static void run_nghttp2_session_send(void)
goto fail;
}
/* Sending against half-closed stream */
rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 3,
NGHTTP2_PRI_DEFAULT, nv, ARRLEN(nv), NULL);
rv = nghttp2_submit_headers(session, NGHTTP2_FLAG_NONE, 3, NULL,
nv, ARRLEN(nv), NULL);
if(rv != 0) {
goto fail;
}
@ -205,6 +213,7 @@ static void run_nghttp2_session_send(void)
if(rv != 0) {
goto fail;
}
fail:
nghttp2_session_del(session);
client_new_fail:
@ -220,11 +229,9 @@ static void run_nghttp2_session_recv(void)
{
nghttp2_session *session;
nghttp2_session_callbacks callbacks;
nghttp2_hd_context deflater;
nghttp2_hd_deflater deflater;
nghttp2_frame frame;
uint8_t *buf = NULL;
size_t buflen = 0;
ssize_t framelen;
nghttp2_bufs bufs;
nghttp2_nv nv[] = {
MAKE_NV(":authority", "example.org"),
MAKE_NV(":scheme", "https")
@ -236,24 +243,31 @@ static void run_nghttp2_session_recv(void)
nghttp2_nv *nva;
ssize_t nvlen;
rv = frame_pack_bufs_init(&bufs);
if(rv != 0) {
return;
}
memset(&callbacks, 0, sizeof(nghttp2_session_callbacks));
callbacks.recv_callback = data_feed_recv_callback;
ud.df = &df;
nghttp2_failmalloc_pause();
nvlen = nghttp2_nv_array_copy(&nva, nv, ARRLEN(nv));
nghttp2_hd_deflate_init(&deflater, NGHTTP2_HD_SIDE_REQUEST);
nghttp2_hd_deflate_init(&deflater);
nghttp2_session_server_new(&session, &callbacks, &ud);
nghttp2_failmalloc_unpause();
/* HEADERS */
nghttp2_failmalloc_pause();
nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_STREAM,
1, NGHTTP2_PRI_DEFAULT, nva, nvlen);
framelen = nghttp2_frame_pack_headers(&buf, &buflen, &frame.headers,
&deflater);
1, NGHTTP2_HCAT_REQUEST, NULL, nva, nvlen);
nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
nghttp2_frame_headers_free(&frame.headers);
data_feed_init(&df, buf, framelen);
data_feed_init(&df, &bufs);
nghttp2_bufs_reset(&bufs);
nghttp2_failmalloc_unpause();
rv = nghttp2_session_recv(session);
@ -264,9 +278,11 @@ static void run_nghttp2_session_recv(void)
/* PING */
nghttp2_failmalloc_pause();
nghttp2_frame_ping_init(&frame.ping, NGHTTP2_FLAG_NONE, NULL);
framelen = nghttp2_frame_pack_ping(&buf, &buflen, &frame.ping);
nghttp2_frame_pack_ping(&bufs, &frame.ping);
nghttp2_frame_ping_free(&frame.ping);
data_feed_init(&df, buf, framelen);
data_feed_init(&df, &bufs);
nghttp2_bufs_reset(&bufs);
nghttp2_failmalloc_unpause();
rv = nghttp2_session_recv(session);
@ -277,8 +293,10 @@ static void run_nghttp2_session_recv(void)
/* RST_STREAM */
nghttp2_failmalloc_pause();
nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_PROTOCOL_ERROR);
framelen = nghttp2_frame_pack_rst_stream(&buf, &buflen, &frame.rst_stream);
nghttp2_frame_pack_rst_stream(&bufs, &frame.rst_stream);
nghttp2_frame_rst_stream_free(&frame.rst_stream);
nghttp2_bufs_reset(&bufs);
nghttp2_failmalloc_unpause();
rv = nghttp2_session_recv(session);
@ -294,8 +312,10 @@ static void run_nghttp2_session_recv(void)
iv[1].value = 100;
nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE,
nghttp2_frame_iv_copy(iv, 2), 2);
framelen = nghttp2_frame_pack_settings(&buf, &buflen, &frame.settings);
nghttp2_frame_pack_settings(&bufs, &frame.settings);
nghttp2_frame_settings_free(&frame.settings);
nghttp2_bufs_reset(&bufs);
nghttp2_failmalloc_unpause();
rv = nghttp2_session_recv(session);
@ -304,7 +324,7 @@ static void run_nghttp2_session_recv(void)
}
fail:
free(buf);
nghttp2_bufs_free(&bufs);
nghttp2_session_del(session);
nghttp2_hd_deflate_free(&deflater);
}
@ -316,11 +336,10 @@ void test_nghttp2_session_recv(void)
static void run_nghttp2_frame_pack_headers(void)
{
nghttp2_hd_context deflater, inflater;
nghttp2_hd_deflater deflater;
nghttp2_hd_inflater inflater;
nghttp2_frame frame, oframe;
uint8_t *buf = NULL;
size_t buflen = 0;
ssize_t framelen;
nghttp2_bufs bufs;
nghttp2_nv nv[] = {
MAKE_NV(":host", "example.org"),
MAKE_NV(":scheme", "https")
@ -329,11 +348,17 @@ static void run_nghttp2_frame_pack_headers(void)
nghttp2_nv *nva;
ssize_t nvlen;
rv = nghttp2_hd_deflate_init(&deflater, NGHTTP2_HD_SIDE_REQUEST);
rv = frame_pack_bufs_init(&bufs);
if(rv != 0) {
return;
}
rv = nghttp2_hd_deflate_init(&deflater);
if(rv != 0) {
goto deflate_init_fail;
}
rv = nghttp2_hd_inflate_init(&inflater, NGHTTP2_HD_SIDE_REQUEST);
rv = nghttp2_hd_inflate_init(&inflater);
if(rv != 0) {
goto inflate_init_fail;
}
@ -342,125 +367,81 @@ static void run_nghttp2_frame_pack_headers(void)
goto nv_copy_fail;
}
nghttp2_frame_headers_init(&frame.headers, NGHTTP2_FLAG_END_STREAM,
1, NGHTTP2_PRI_DEFAULT, nva, nvlen);
framelen = nghttp2_frame_pack_headers(&buf, &buflen, &frame.headers,
&deflater);
if(framelen < 0) {
1, NGHTTP2_HCAT_REQUEST, NULL, nva, nvlen);
rv = nghttp2_frame_pack_headers(&bufs, &frame.headers, &deflater);
if(rv != 0) {
goto fail;
}
rv = unpack_frame_with_nv_block(&oframe, NGHTTP2_HEADERS, &inflater,
buf, framelen);
rv = unpack_framebuf(&oframe, &bufs);
if(rv != 0) {
goto fail;
}
nghttp2_frame_headers_free(&oframe.headers);
fail:
free(buf);
nghttp2_frame_headers_free(&frame.headers);
nv_copy_fail:
nghttp2_hd_inflate_free(&inflater);
inflate_init_fail:
nghttp2_hd_deflate_free(&deflater);
deflate_init_fail:
;
}
static void run_nghttp2_frame_pack_ping(void)
{
nghttp2_frame frame;
uint8_t *buf = NULL;
size_t buflen = 0;
nghttp2_frame_ping_init(&frame.ping, NGHTTP2_FLAG_NONE, NULL);
nghttp2_frame_pack_ping(&buf, &buflen, &frame.ping);
free(buf);
nghttp2_frame_ping_free(&frame.ping);
}
static void run_nghttp2_frame_pack_goaway(void)
{
nghttp2_frame frame;
uint8_t *buf = NULL;
size_t buflen = 0;
nghttp2_frame_goaway_init(&frame.goaway, 1000000007, NGHTTP2_PROTOCOL_ERROR,
NULL, 0);
nghttp2_frame_pack_goaway(&buf, &buflen, &frame.goaway);
free(buf);
nghttp2_frame_goaway_free(&frame.goaway);
}
static void run_nghttp2_frame_pack_rst_stream(void)
{
nghttp2_frame frame;
uint8_t *buf = NULL;
size_t buflen = 0;
nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_PROTOCOL_ERROR);
nghttp2_frame_pack_rst_stream(&buf, &buflen, &frame.rst_stream);
free(buf);
nghttp2_frame_rst_stream_free(&frame.rst_stream);
}
static void run_nghttp2_frame_pack_window_update(void)
{
nghttp2_frame frame;
uint8_t *buf = NULL;
size_t buflen = 0;
nghttp2_frame_window_update_init(&frame.window_update, NGHTTP2_FLAG_NONE,
1000000007, 4096);
nghttp2_frame_pack_window_update(&buf, &buflen,
&frame.window_update);
free(buf);
nghttp2_frame_window_update_free(&frame.window_update);
nghttp2_bufs_free(&bufs);
}
static void run_nghttp2_frame_pack_settings(void)
{
nghttp2_frame frame, oframe;
uint8_t *buf = NULL;
size_t buflen = 0;
ssize_t framelen;
nghttp2_bufs bufs;
nghttp2_buf *buf;
nghttp2_settings_entry iv[2], *iv_copy;
int rv;
rv = frame_pack_bufs_init(&bufs);
if(rv != 0) {
return;
}
iv[0].settings_id = NGHTTP2_SETTINGS_HEADER_TABLE_SIZE;
iv[0].value = 4096;
iv[1].settings_id = NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS;
iv[1].value = 100;
iv_copy = nghttp2_frame_iv_copy(iv, 2);
if(iv_copy == NULL) {
goto iv_copy_fail;
}
nghttp2_frame_settings_init(&frame.settings, NGHTTP2_FLAG_NONE, iv_copy, 2);
framelen = nghttp2_frame_pack_settings(&buf, &buflen, &frame.settings);
if(framelen < 0) {
rv = nghttp2_frame_pack_settings(&bufs, &frame.settings);
if(rv != 0) {
goto fail;
}
rv = nghttp2_frame_unpack_settings(&oframe.settings,
&buf[0], NGHTTP2_FRAME_HDLEN,
&buf[NGHTTP2_FRAME_HDLEN],
framelen-NGHTTP2_FRAME_HDLEN);
buf = &bufs.head->buf;
rv = nghttp2_frame_unpack_settings_payload2
(&oframe.settings.iv,
&oframe.settings.niv,
buf->pos + NGHTTP2_FRAME_HDLEN,
nghttp2_buf_len(buf) - NGHTTP2_FRAME_HDLEN);
if(rv != 0) {
goto fail;
}
nghttp2_frame_settings_free(&oframe.settings);
fail:
free(buf);
nghttp2_frame_settings_free(&frame.settings);
iv_copy_fail:
;
}
static void run_nghttp2_frame(void)
{
run_nghttp2_frame_pack_headers();
run_nghttp2_frame_pack_ping();
run_nghttp2_frame_pack_goaway();
run_nghttp2_frame_pack_rst_stream();
run_nghttp2_frame_pack_window_update();
run_nghttp2_frame_pack_settings();
nghttp2_bufs_free(&bufs);
}
void test_nghttp2_frame(void)
{
TEST_FAILMALLOC_RUN(run_nghttp2_frame);
TEST_FAILMALLOC_RUN(run_nghttp2_frame_pack_headers);
TEST_FAILMALLOC_RUN(run_nghttp2_frame_pack_settings);
}

4
tests/nghttp2_test_helper.c
View File

@ -220,10 +220,10 @@ ssize_t inflate_hd(nghttp2_hd_inflater *inflater, nva_out *out,
return processed;
}
void frame_pack_bufs_init(nghttp2_bufs *bufs)
int frame_pack_bufs_init(nghttp2_bufs *bufs)
{
/* 2 for PAD_HIGH and PAD_LOW */
nghttp2_bufs_init2(bufs, 4096, 16, NGHTTP2_FRAME_HDLEN + 2);
return nghttp2_bufs_init2(bufs, 4096, 16, NGHTTP2_FRAME_HDLEN + 2);
}
void bufs_large_init(nghttp2_bufs *bufs, size_t chunk_size)

2
tests/nghttp2_test_helper.h
View File

@ -79,7 +79,7 @@ void add_out(nva_out *out, nghttp2_nv *nv);
ssize_t inflate_hd(nghttp2_hd_inflater *inflater, nva_out *out,
nghttp2_bufs *bufs, size_t offset);
void frame_pack_bufs_init(nghttp2_bufs *bufs);
int frame_pack_bufs_init(nghttp2_bufs *bufs);
void bufs_large_init(nghttp2_bufs *bufs, size_t chunk_size);