Skip to content

http2: cleanup and refactoring of http2 internals #32884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jasnell wants to merge 18 commits into from
Closed

http2: cleanup and refactoring of http2 internals #32884

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f38c9ea
http2: cleanup constants in http2 binding
jasnell Apr 15, 2020
219e339
http2: refactor GetPackedSettings to avoid unnecessary AsyncWrap
jasnell Apr 15, 2020
5499c7c
http2: simplify settings to reduce duplicate code
jasnell Apr 15, 2020
dd06df1
http2: improve style consistency and correctness
jasnell Apr 16, 2020
a2efaa7
http2: make EmitStatistics function private
jasnell Apr 16, 2020
b23cecc
http2: un-nest Http2Settings and Http2Ping
jasnell Apr 16, 2020
681bfe4
http2: refactoring and cleanup of Http2Settings and Http2Ping
jasnell Apr 16, 2020
0e0a3a2
http2: avoid ** syntax for readability
jasnell Apr 16, 2020
e39420f
http2: avoid most uses to ToChecked/ToLocalChecked
jasnell Apr 16, 2020
e8a2f5e
http2: use const references for Http2Priority
jasnell Apr 16, 2020
52fcf89
http2: remove unnecessary GetStream function
jasnell Apr 16, 2020
7aefc8f
http2: refactor Http2Scope to use BaseObjectPtr
jasnell Apr 16, 2020
d9c5a40
http2: move utility function to anonymous namespace
jasnell Apr 16, 2020
6b86554
http2: refactor and simplify Origins
jasnell Apr 16, 2020
4ccd690
http2: use BaseObjectPtr for Http2Streams map
jasnell Apr 16, 2020
fe77e23
http2: move MemoryInfo impl to cc
jasnell Apr 16, 2020
764c71d
http2: fixup lint and style issues
jasnell Apr 16, 2020
1342b24
[Squash] fixup
jasnell Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
http2: simplify settings to reduce duplicate code 
Signed-off-by: James M Snell <jasnell@gmail.com>
  • Loading branch information
@jasnell
jasnell committed Apr 16, 2020
commit 5499c7c621d9deef9bd6b1f20df93d08bdbdea77
62 changes: 19 additions & 43 deletions src/node_http2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,9 @@ size_t Http2Session::Http2Settings::Init(

size_t count = 0;

GRABSETTING(entries, count, HEADER_TABLE_SIZE);
GRABSETTING(entries, count, MAX_CONCURRENT_STREAMS);
GRABSETTING(entries, count, MAX_FRAME_SIZE);
GRABSETTING(entries, count, INITIAL_WINDOW_SIZE);
GRABSETTING(entries, count, MAX_HEADER_LIST_SIZE);
GRABSETTING(entries, count, ENABLE_PUSH);
GRABSETTING(entries, count, ENABLE_CONNECT_PROTOCOL);
#define V(name) GRABSETTING(entries, count, name);
HTTP2_SETTINGS(V)
#undef V

return count;
}
Expand Down Expand Up @@ -289,48 +285,28 @@ Local<Value> Http2Session::Http2Settings::Pack(
void Http2Session::Http2Settings::Update(Http2Session* session,
get_setting fn) {
AliasedUint32Array& buffer = session->http2_state()->settings_buffer;
buffer[IDX_SETTINGS_HEADER_TABLE_SIZE] =
fn(**session, NGHTTP2_SETTINGS_HEADER_TABLE_SIZE);
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS] =
fn(**session, NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS);
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE] =
fn(**session, NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE);
buffer[IDX_SETTINGS_MAX_FRAME_SIZE] =
fn(**session, NGHTTP2_SETTINGS_MAX_FRAME_SIZE);
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE] =
fn(**session, NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE);
buffer[IDX_SETTINGS_ENABLE_PUSH] =
fn(**session, NGHTTP2_SETTINGS_ENABLE_PUSH);
buffer[IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL] =
fn(**session, NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL);

#define V(name) \
buffer[IDX_SETTINGS_ ## name] = fn(**session, NGHTTP2_SETTINGS_ ## name);
HTTP2_SETTINGS(V)
#undef V

}

// Initializes the shared TypedArray with the default settings values.
void Http2Session::Http2Settings::RefreshDefaults(Http2State* http2_state) {
AliasedUint32Array& buffer = http2_state->settings_buffer;
uint32_t flags = 0;

#define V(name) \
do { \
buffer[IDX_SETTINGS_ ## name] = DEFAULT_SETTINGS_ ## name; \
flags |= 1 << IDX_SETTINGS_ ## name; \
} while (0);
HTTP2_SETTINGS(V)
#undef V

buffer[IDX_SETTINGS_HEADER_TABLE_SIZE] =
DEFAULT_SETTINGS_HEADER_TABLE_SIZE;
buffer[IDX_SETTINGS_ENABLE_PUSH] =
DEFAULT_SETTINGS_ENABLE_PUSH;
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS] =
DEFAULT_SETTINGS_MAX_CONCURRENT_STREAMS;
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE] =
DEFAULT_SETTINGS_INITIAL_WINDOW_SIZE;
buffer[IDX_SETTINGS_MAX_FRAME_SIZE] =
DEFAULT_SETTINGS_MAX_FRAME_SIZE;
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE] =
DEFAULT_SETTINGS_MAX_HEADER_LIST_SIZE;
buffer[IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL] =
DEFAULT_SETTINGS_ENABLE_CONNECT_PROTOCOL;
buffer[IDX_SETTINGS_COUNT] =
(1 << IDX_SETTINGS_HEADER_TABLE_SIZE) |
(1 << IDX_SETTINGS_ENABLE_PUSH) |
(1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS) |
(1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE) |
(1 << IDX_SETTINGS_MAX_FRAME_SIZE) |
(1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE) |
(1 << IDX_SETTINGS_ENABLE_CONNECT_PROTOCOL);
buffer[IDX_SETTINGS_COUNT] = flags;
}


Expand Down
9 changes: 9 additions & 0 deletions src/node_http2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,15 @@ class Origins {
V(PADDING_STRATEGY_CALLBACK) \
HTTP2_ERROR_CODES(V)

#define HTTP2_SETTINGS(V) \
V(HEADER_TABLE_SIZE) \
V(ENABLE_PUSH) \
V(MAX_CONCURRENT_STREAMS) \
V(INITIAL_WINDOW_SIZE) \
V(MAX_FRAME_SIZE) \
V(MAX_HEADER_LIST_SIZE) \
V(ENABLE_CONNECT_PROTOCOL) \

} // namespace http2
} // namespace node

Expand Down