1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http2: simplify timeout tracking

Browse Source 
There’s no need to reset the chunk counter for every write.

PR-URL: https://github.com/nodejs/node/pull/19206
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
Anna Henningsen 2018-02-22 13:48:06 +01:00
parent 98a14e026b
commit 90e70b8caf
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node_http2.cc
View File

@ -1630,10 +1630,6 @@ inline Http2Stream* Http2Session::SubmitRequest(
return stream;
}
inline void Http2Session::SetChunksSinceLastWrite(size_t n) {
chunks_sent_since_last_write_ = n;
}
// Callback used to receive inbound data from the i/o stream
void Http2Session::OnStreamRead(ssize_t nread, const uv_buf_t& buf) {
Http2Scope h2scope(this);
@ -2016,7 +2012,6 @@ inline int Http2Stream::DoWrite(WriteWrap* req_wrap,
CHECK(!this->IsDestroyed());
CHECK_EQ(send_handle, nullptr);
Http2Scope h2scope(this);
session_->SetChunksSinceLastWrite();
if (!IsWritable()) {
req_wrap->Done(UV_EOF);
return 0;
@ -2519,8 +2514,6 @@ void Http2Stream::RespondFD(const FunctionCallbackInfo<Value>& args) {
int64_t length = args[3]->IntegerValue(context).ToChecked();
int options = args[4]->IntegerValue(context).ToChecked();
stream->session()->SetChunksSinceLastWrite();
Headers list(isolate, context, headers);
args.GetReturnValue().Set(stream->SubmitFile(fd, *list, list.length(),
offset, length, options));

2
src/node_http2.h
View File

@ -884,8 +884,6 @@ class Http2Session : public AsyncWrap, public StreamListener {
// Write data to the session
inline ssize_t Write(const uv_buf_t* bufs, size_t nbufs);
inline void SetChunksSinceLastWrite(size_t n = 0);
size_t self_size() const override { return sizeof(*this); }
inline void GetTrailers(Http2Stream* stream, uint32_t* flags);