Add default timeout for the reading from socket operations

ellysh · Feb 14, 2013 · 4d96a67 · 4d96a67
1 parent 3f3241f
commit 4d96a67
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/source/common/answer.h b/source/common/answer.h
@@ -27,7 +27,7 @@ class Answer
     size_t GetSize() const;
 
     void Send(Socket& socket) const;
-    bool Receive(Socket& socket, long timeout = -1);
+    bool Receive(Socket& socket, long timeout = kDefaultTimeout);
 
 private:
     mutable zmq_msg_t msg_;

diff --git a/source/common/socket.h b/source/common/socket.h
@@ -26,7 +26,7 @@ class Socket
 
     void SendMsg(const zmq_msg_t& msg, const int flags) const;
 
-    bool ReceiveMsg(const long timeout = -1);
+    bool ReceiveMsg(const long timeout = kDefaultTimeout);
     bool PopMsg(zmq_msg_t& msg);
 
     void SetQueueSize(const int size);

diff --git a/source/common/types_zcache.h b/source/common/types_zcache.h
@@ -40,6 +40,7 @@ enum SocketType
     kPubSub
 };
 
+static const long kDefaultTimeout = 3000;
 static const port_t kErrorPort = -1;
 static std::string kTcpProtocol = "tcp://";
 static std::string kIpcProtocol = "ipc://";