Add time out

snoweye · Feb 27, 2021 · dff14fe · dff14fe
1 parent 89bf775
commit dff14fe
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 4 deletions.
diff --git a/R/111_control.r b/R/111_control.r
@@ -147,7 +147,25 @@ ZMQ.SO <- function(
   HANDSHAKE_IVL = 66L,
   IDENTITY_FD = 67L,
   SOCKS_PROXY = 68L,
-  XPUB_NODROP = 69L
+  XPUB_NODROP = 69L,
+  BLOCKY = 70L,
+  XPUB_MANUAL = 71L,
+  XPUB_WELCOME_MSG = 72L,
+  STREAM_NOTIFY = 73L,
+  INVERT_MATCHING = 74L,
+  HEARTBEAT_IVL = 75L,
+  HEARTBEAT_TTL = 76L,
+  HEARTBEAT_TIMEOUT = 77L,
+  XPUB_VERBOSER = 78L,
+  CONNECT_TIMEOUT = 79L,
+  TCP_MAXRT = 80L,
+  THREAD_SAFE = 81L,
+  MULTICAST_MAXTPDU = 84L,
+  VMCI_BUFFER_SIZE = 85L,
+  VMCI_BUFFER_MIN_SIZE = 86L,
+  VMCI_BUFFER_MAX_SIZE = 87L,
+  VMCI_CONNECT_TIMEOUT = 88L,
+  USE_FD = 89L
 ){
   list(
     AFFINITY = AFFINITY,
@@ -209,7 +227,25 @@ ZMQ.SO <- function(
     HANDSHAKE_IVL = HANDSHAKE_IVL,
     IDENTITY_FD = IDENTITY_FD,
     SOCKS_PROXY = SOCKS_PROXY,
-    XPUB_NODROP = XPUB_NODROP
+    XPUB_NODROP = XPUB_NODROP,
+    BLOCKY = BLOCKY,
+    XPUB_MANUAL = XPUB_MANUAL,
+    XPUB_WELCOME_MSG = XPUB_WELCOME_MSG,
+    STREAM_NOTIFY = STREAM_NOTIFY,
+    INVERT_MATCHING = INVERT_MATCHING,
+    HEARTBEAT_IVL = HEARTBEAT_IVL,
+    HEARTBEAT_TTL = HEARTBEAT_TTL,
+    HEARTBEAT_TIMEOUT = HEARTBEAT_TIMEOUT,
+    XPUB_VERBOSER = XPUB_VERBOSER,
+    CONNECT_TIMEOUT = CONNECT_TIMEOUT,
+    TCP_MAXRT = TCP_MAXRT,
+    THREAD_SAFE = THREAD_SAFE,
+    MULTICAST_MAXTPDU = MULTICAST_MAXTPDU,
+    VMCI_BUFFER_SIZE = VMCI_BUFFER_SIZE,
+    VMCI_BUFFER_MIN_SIZE = VMCI_BUFFER_MIN_SIZE,
+    VMCI_BUFFER_MAX_SIZE = VMCI_BUFFER_MAX_SIZE,
+    VMCI_CONNECT_TIMEOUT = VMCI_CONNECT_TIMEOUT,
+    USE_FD = USE_FD
   )
 }
 

diff --git a/man/zz_zmq_control.Rd b/man/zz_zmq_control.Rd
diff --git a/tests/send_recv.R b/tests/send_recv.R
@@ -5,11 +5,17 @@ suppressPackageStartupMessages(library(pbdZMQ))
 # Server
 server_context = zmq.ctx.new()
 server_socket = zmq.socket(server_context, .pbd_env$ZMQ.ST$REP)
+zmq.setsockopt(server_socket, .pbd_env$ZMQ.SO$CONNECT_TIMEOUT, 5000L)
+zmq.setsockopt(server_socket, .pbd_env$ZMQ.SO$RCVTIMEO, 5000L)
+zmq.setsockopt(server_socket, .pbd_env$ZMQ.SO$SNDTIMEO, 5000L)
 zmq.bind(server_socket, "tcp://*:55555")
 
 # Client
 client_context = zmq.ctx.new()
 client_socket = zmq.socket(client_context, .pbd_env$ZMQ.ST$REQ)
+zmq.setsockopt(client_socket, .pbd_env$ZMQ.SO$CONNECT_TIMEOUT, 5000L)
+zmq.setsockopt(client_socket, .pbd_env$ZMQ.SO$RCVTIMEO, 5000L)
+zmq.setsockopt(client_socket, .pbd_env$ZMQ.SO$SNDTIMEO, 5000L)
 zmq.connect(client_socket, "tcp://localhost:55555")
 
 tester = function(indata)