diff options
author | Denys Otrishko <shishugi@gmail.com> | 2019-12-01 19:20:01 +0300 |
---|---|---|
committer | Michaƫl Zasso <targos@protonmail.com> | 2019-12-09 12:23:09 +0300 |
commit | 71bb026e0c1e2afb285ecb46cb82c1834dbb1ba1 (patch) | |
tree | e9da8ea248654ea55f5e93ddad15b2bfc6231b10 /src | |
parent | 3840abed11b682e1a70f6de1a1dba04bddae547a (diff) |
http2: streamline OnStreamRead streamline memory accounting
* avoid consecutive decrement/increment session memory calls.
* only Resize the buffer when it is needed.
* flip `stream_buf_offset_` condition to the LIKELY case.
PR-URL: https://github.com/nodejs/node/pull/30351
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/node_http2.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/node_http2.cc b/src/node_http2.cc index 2bcbcbe0784..33960af1845 100644 --- a/src/node_http2.cc +++ b/src/node_http2.cc @@ -1862,7 +1862,11 @@ void Http2Session::OnStreamRead(ssize_t nread, const uv_buf_t& buf_) { statistics_.data_received += nread; - if (UNLIKELY(stream_buf_offset_ > 0)) { + if (LIKELY(stream_buf_offset_ == 0)) { + // Shrink to the actual amount of used data. + buf.Resize(nread); + IncrementCurrentSessionMemory(nread); + } else { // This is a very unlikely case, and should only happen if the ReadStart() // call in OnStreamAfterWrite() immediately provides data. If that does // happen, we concatenate the data we received with the already-stored @@ -1871,20 +1875,18 @@ void Http2Session::OnStreamRead(ssize_t nread, const uv_buf_t& buf_) { AllocatedBuffer new_buf = env()->AllocateManaged(pending_len + nread); memcpy(new_buf.data(), stream_buf_.base + stream_buf_offset_, pending_len); memcpy(new_buf.data() + pending_len, buf.data(), nread); + + // The data in stream_buf_ is already accounted for, add nread received + // bytes to session memory but remove the already processed + // stream_buf_offset_ bytes. + IncrementCurrentSessionMemory(nread - stream_buf_offset_); + buf = std::move(new_buf); nread = buf.size(); stream_buf_offset_ = 0; stream_buf_ab_.Reset(); - - // We have now fully processed the stream_buf_ input chunk (by moving the - // remaining part into buf, which will be accounted for below). - DecrementCurrentSessionMemory(stream_buf_.len); } - // Shrink to the actual amount of used data. - buf.Resize(nread); - IncrementCurrentSessionMemory(nread); - // Remember the current buffer, so that OnDataChunkReceived knows the // offset of a DATA frame's data into the socket read buffer. stream_buf_ = uv_buf_init(buf.data(), nread); |