[Squash] address comments

nodejs · Nov 2, 2017 · 1c6ec13 · 1c6ec13
1 parent 125e1b5
commit 1c6ec13
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/node_http2.cc b/src/node_http2.cc
@@ -893,7 +893,7 @@ int Http2Session::DoWrite(WriteWrap* req_wrap,
   return 0;
 }
 
-size_t Http2Session::AllocateSend(WriteWrap** req) {
+WriteWrap* Http2Session::AllocateSend() {
   HandleScope scope(env()->isolate());
   auto AfterWrite = [](WriteWrap* req, int status) {
     req->Dispose();
@@ -906,8 +906,8 @@ size_t Http2Session::AllocateSend(WriteWrap** req) {
       nghttp2_session_get_remote_settings(
           session(),
           NGHTTP2_SETTINGS_MAX_FRAME_SIZE);
-  *req = WriteWrap::New(env(), obj, this, AfterWrite, size);
-  return size;
+  // Max frame size + 9 bytes for the header
+  return WriteWrap::New(env(), obj, this, AfterWrite, size + 9);
 }
 
 void Http2Session::Send(WriteWrap* req, char* buf, size_t length) {

diff --git a/src/node_http2.h b/src/node_http2.h
@@ -399,7 +399,7 @@ class Http2Session : public AsyncWrap,
                   const SubmitTrailers& submit_trailers) override;
 
   void Send(WriteWrap* req, char* buf, size_t length) override;
-  size_t AllocateSend(WriteWrap** req);
+  WriteWrap* AllocateSend();
 
   int DoWrite(WriteWrap* w, uv_buf_t* bufs, size_t count,
               uv_stream_t* send_handle) override;

diff --git a/src/node_http2_core-inl.h b/src/node_http2_core-inl.h
@@ -502,7 +502,8 @@ inline void Nghttp2Session::SendPendingData() {
   // While srcLength is greater than zero
   while ((srcLength = nghttp2_session_mem_send(session_, &src)) > 0) {
     if (req == nullptr) {
-      destRemaining = AllocateSend(&req);
+      req = AllocateSend();
+      destRemaining = req->self_size();
       dest = req->Extra();
     }
     DEBUG_HTTP2("Nghttp2Session %s: nghttp2 has %d bytes to send\n",
@@ -523,7 +524,8 @@ inline void Nghttp2Session::SendPendingData() {
       destLength = 0;
       srcRemaining -= destRemaining;
       srcOffset += destRemaining;
-      destRemaining = AllocateSend(&req);
+      req = AllocateSend();
+      destRemaining = req->self_size();
       dest = req->Extra();
     }
 

diff --git a/src/node_http2_core.h b/src/node_http2_core.h
@@ -179,7 +179,7 @@ class Nghttp2Session {
 
   inline void SendPendingData();
   virtual void Send(WriteWrap* req, char* buf, size_t length) = 0;
-  virtual size_t AllocateSend(WriteWrap** req) = 0;
+  virtual WriteWrap* AllocateSend() = 0;
 
   virtual bool HasGetPaddingCallback() { return false; }
 

diff --git a/test/parallel/parallel.status b/test/parallel/parallel.status
@@ -18,7 +18,5 @@ test-npm-install:      PASS,FLAKY
 [$system==solaris] # Also applies to SmartOS
 
 [$system==freebsd]
-test-http2-compat-serverrequest-pipe: PASS,FLAKY
-test-http2-pipe:                      PASS,FLAKY
 
 [$system==aix]