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

Use 4086 as max DATA payload size to make DATA frame fit into 4K buffer

This commit is contained in:
Tatsuhiro Tsujikawa 2014-03-05 22:48:17 +09:00
parent 382024a180
commit 547d6d1fb5
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nghttp2_frame.h
View File

@ -42,8 +42,10 @@
/* The maximum payload length of a frame */ /* The maximum payload length of a frame */
#define NGHTTP2_MAX_FRAME_LENGTH ((1 << 14) - 1) #define NGHTTP2_MAX_FRAME_LENGTH ((1 << 14) - 1)
/* The maximum length of DATA frame payload. */ /* The maximum length of DATA frame payload. To fit entire DATA frame
#define NGHTTP2_DATA_PAYLOAD_LENGTH 4096 into 4096K buffer, we use subtract header size (8 bytes) + 2 bytes
padding. See nghttp2_session_pack_data(). */
#define NGHTTP2_DATA_PAYLOAD_LENGTH 4086
/* The number of bytes of frame header. */ /* The number of bytes of frame header. */
#define NGHTTP2_FRAME_HEAD_LENGTH 8 #define NGHTTP2_FRAME_HEAD_LENGTH 8

5
lib/nghttp2_session.h
View File

@ -74,9 +74,8 @@ typedef struct {
/* Buffer length for inbound raw byte stream. */ /* Buffer length for inbound raw byte stream. */
#define NGHTTP2_INBOUND_BUFFER_LENGTH 16384 #define NGHTTP2_INBOUND_BUFFER_LENGTH 16384
#define NGHTTP2_INITIAL_OUTBOUND_FRAMEBUF_LENGTH (NGHTTP2_DATA_PAYLOAD_LENGTH+8) #define NGHTTP2_INITIAL_OUTBOUND_FRAMEBUF_LENGTH 4096
#define NGHTTP2_INITIAL_INBOUND_FRAMEBUF_LENGTH \
NGHTTP2_INITIAL_OUTBOUND_FRAMEBUF_LENGTH
#define NGHTTP2_INITIAL_NV_BUFFER_LENGTH 4096 #define NGHTTP2_INITIAL_NV_BUFFER_LENGTH 4096
/* Internal state when receiving incoming frame */ /* Internal state when receiving incoming frame */

22
tests/nghttp2_session_test.c
View File

@ -3317,7 +3317,7 @@ void test_nghttp2_session_stop_data_with_rst_stream(void)
data_prd.read_callback = fixed_length_data_source_read_callback; data_prd.read_callback = fixed_length_data_source_read_callback;
ud.frame_send_cb_called = 0; ud.frame_send_cb_called = 0;
ud.data_source_length = 16*1024; ud.data_source_length = NGHTTP2_DATA_PAYLOAD_LENGTH * 4;
nghttp2_session_server_new(&session, &callbacks, &ud); nghttp2_session_server_new(&session, &callbacks, &ud);
nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE,
@ -3330,7 +3330,7 @@ void test_nghttp2_session_stop_data_with_rst_stream(void)
CU_ASSERT(0 == nghttp2_session_send(session)); CU_ASSERT(0 == nghttp2_session_send(session));
CU_ASSERT(NGHTTP2_DATA == ud.sent_frame_type); CU_ASSERT(NGHTTP2_DATA == ud.sent_frame_type);
/* data for DATA[1] is read from data_prd but it is not sent */ /* data for DATA[1] is read from data_prd but it is not sent */
CU_ASSERT(ud.data_source_length == 8*1024); CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOAD_LENGTH * 2);
nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_CANCEL); nghttp2_frame_rst_stream_init(&frame.rst_stream, 1, NGHTTP2_CANCEL);
CU_ASSERT(0 == nghttp2_session_on_rst_stream_received(session, &frame)); CU_ASSERT(0 == nghttp2_session_on_rst_stream_received(session, &frame));
@ -3342,7 +3342,7 @@ void test_nghttp2_session_stop_data_with_rst_stream(void)
CU_ASSERT(0 == nghttp2_session_send(session)); CU_ASSERT(0 == nghttp2_session_send(session));
/* With RST_STREAM, stream is canceled and further DATA on that /* With RST_STREAM, stream is canceled and further DATA on that
stream are not sent. */ stream are not sent. */
CU_ASSERT(ud.data_source_length == 8*1024); CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOAD_LENGTH * 2);
CU_ASSERT(NULL == nghttp2_session_get_stream(session, 1)); CU_ASSERT(NULL == nghttp2_session_get_stream(session, 1));
@ -3363,7 +3363,7 @@ void test_nghttp2_session_defer_data(void)
data_prd.read_callback = defer_data_source_read_callback; data_prd.read_callback = defer_data_source_read_callback;
ud.frame_send_cb_called = 0; ud.frame_send_cb_called = 0;
ud.data_source_length = 16*1024; ud.data_source_length = NGHTTP2_DATA_PAYLOAD_LENGTH * 4;
nghttp2_session_server_new(&session, &callbacks, &ud); nghttp2_session_server_new(&session, &callbacks, &ud);
nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE, nghttp2_session_open_stream(session, 1, NGHTTP2_STREAM_FLAG_NONE,
@ -3376,7 +3376,7 @@ void test_nghttp2_session_defer_data(void)
CU_ASSERT(0 == nghttp2_session_send(session)); CU_ASSERT(0 == nghttp2_session_send(session));
CU_ASSERT(NGHTTP2_HEADERS == ud.sent_frame_type); CU_ASSERT(NGHTTP2_HEADERS == ud.sent_frame_type);
/* No data is read */ /* No data is read */
CU_ASSERT(ud.data_source_length == 16*1024); CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOAD_LENGTH * 4);
ud.block_count = 1; ud.block_count = 1;
nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL); nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL);
@ -3390,9 +3390,9 @@ void test_nghttp2_session_defer_data(void)
OB_DATA(item)->data_prd.read_callback = OB_DATA(item)->data_prd.read_callback =
fixed_length_data_source_read_callback; fixed_length_data_source_read_callback;
ud.block_count = 1; ud.block_count = 1;
/* Reads 2 4KiB blocks */ /* Reads 2 DATA chunks */
CU_ASSERT(0 == nghttp2_session_send(session)); CU_ASSERT(0 == nghttp2_session_send(session));
CU_ASSERT(ud.data_source_length == 8*1024); CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOAD_LENGTH * 2);
/* Deferred again */ /* Deferred again */
OB_DATA(item)->data_prd.read_callback = defer_data_source_read_callback; OB_DATA(item)->data_prd.read_callback = defer_data_source_read_callback;
@ -3400,7 +3400,7 @@ void test_nghttp2_session_defer_data(void)
sent. No read_callback invocation. */ sent. No read_callback invocation. */
ud.block_count = 1; ud.block_count = 1;
CU_ASSERT(0 == nghttp2_session_send(session)); CU_ASSERT(0 == nghttp2_session_send(session));
CU_ASSERT(ud.data_source_length == 8*1024); CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOAD_LENGTH * 2);
/* Resume deferred DATA */ /* Resume deferred DATA */
@ -3958,7 +3958,7 @@ void test_nghttp2_session_data_backoff_by_high_pri_frame(void)
data_prd.read_callback = fixed_length_data_source_read_callback; data_prd.read_callback = fixed_length_data_source_read_callback;
ud.frame_send_cb_called = 0; ud.frame_send_cb_called = 0;
ud.data_source_length = 16*1024; ud.data_source_length = NGHTTP2_DATA_PAYLOAD_LENGTH * 4;
nghttp2_session_client_new(&session, &callbacks, &ud); nghttp2_session_client_new(&session, &callbacks, &ud);
nghttp2_submit_request(session, NGHTTP2_PRI_DEFAULT, NULL, 0, nghttp2_submit_request(session, NGHTTP2_PRI_DEFAULT, NULL, 0,
@ -3969,7 +3969,7 @@ void test_nghttp2_session_data_backoff_by_high_pri_frame(void)
CU_ASSERT(0 == nghttp2_session_send(session)); CU_ASSERT(0 == nghttp2_session_send(session));
CU_ASSERT(NGHTTP2_DATA == ud.sent_frame_type); CU_ASSERT(NGHTTP2_DATA == ud.sent_frame_type);
/* data for DATA[1] is read from data_prd but it is not sent */ /* data for DATA[1] is read from data_prd but it is not sent */
CU_ASSERT(ud.data_source_length == 8*1024); CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOAD_LENGTH * 2);
nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL); nghttp2_submit_ping(session, NGHTTP2_FLAG_NONE, NULL);
ud.block_count = 2; ud.block_count = 2;
@ -3977,7 +3977,7 @@ void test_nghttp2_session_data_backoff_by_high_pri_frame(void)
CU_ASSERT(0 == nghttp2_session_send(session)); CU_ASSERT(0 == nghttp2_session_send(session));
CU_ASSERT(NGHTTP2_PING == ud.sent_frame_type); CU_ASSERT(NGHTTP2_PING == ud.sent_frame_type);
/* data for DATA[2] is read from data_prd but it is not sent */ /* data for DATA[2] is read from data_prd but it is not sent */
CU_ASSERT(ud.data_source_length == 4*1024); CU_ASSERT(ud.data_source_length == NGHTTP2_DATA_PAYLOAD_LENGTH);
ud.block_count = 2; ud.block_count = 2;
/* Sends DATA[2..3] */ /* Sends DATA[2..3] */