From 7e2d99b33864fb54acec01b19542805257ffafa1 Mon Sep 17 00:00:00 2001
From: Ron Korving <rkorving@wizcorp.jp>
Date: Fri, 3 Jun 2016 14:20:35 +0900
Subject: [PATCH] This fixes burst sends on "req" sockets. (#536)

* This fixes burst sends on "req" sockets.

* Fix missing read flush triggered during send
---
 binding.cc             |  6 +++++-
 lib/index.js           |  5 +++++
 test/socket.req-rep.js | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/binding.cc b/binding.cc
index 5f401ca..3c38a41 100644
--- a/binding.cc
+++ b/binding.cc
@@ -1274,8 +1274,12 @@ namespace zmq {
           readsReady = true;
         }
 
-        if ((events & ZMQ_POLLOUT) == 0)
+        if ((events & ZMQ_POLLOUT) == 0) {
+          if (readsReady) {
+            socket->NotifyReadReady();
+          }
           return info.GetReturnValue().Set(false);
+        }
       }
 
       Local<Object> buf = batch->Get(i).As<Object>();
diff --git a/lib/index.js b/lib/index.js
index 613e2a9..ea67db9 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -682,6 +682,11 @@ Socket.prototype._flushReads = function() {
   } while (received);
 
   this._isFlushingReads = false;
+
+  // if many sends happened, but ended up in the queue (eg. in a req/rep scenario where each send must be followed by a
+  // response), we can try to send again now
+
+  this._flushWrites();
 };
 
 Socket.prototype._flushWrites = function() {
diff --git a/test/socket.req-rep.js b/test/socket.req-rep.js
index 93ce601..cbf2890 100644
--- a/test/socket.req-rep.js
+++ b/test/socket.req-rep.js
@@ -56,4 +56,40 @@ describe('socket.req-rep', function(){
     }
   });
 
+  it('should support a burst', function (done) {
+    var rep = zmq.socket('rep');
+    var req = zmq.socket('req');
+    var n = 10;
+
+    rep.on('message', function (msg) {
+      msg.should.be.an.instanceof(Buffer);
+      msg.toString().should.equal('hello');
+      rep.send('world');
+    });
+
+    rep.bind('inproc://reqrepburst', function (error) {
+      if (error) throw error;
+      req.connect('inproc://reqrepburst');
+
+      var received = 0;
+
+      req.on('message', function(msg){
+        msg.should.be.an.instanceof(Buffer);
+        msg.toString().should.equal('world');
+
+        received += 1;
+
+        if (received === n) {
+          rep.close();
+          req.close();
+          done();
+        }
+      });
+
+      for (var i = 0; i < n; i += 1) {
+        req.send('hello');
+      }
+    });
+  });
+
 });