mirror of
https://github.com/zeromq/libzmq.git
synced 2025-10-15 23:20:09 +02:00
Consolidate TCP-specific common code into their own files.
The TCP keepalive tuning code has been moved into the newly added files; this also allows future TCP-specific code to be added into these files, without bloating the IP level code and establishes a known file structure for other IP-based transports. Remember: this is a no-op change, hence no API or functionality was changed as part of this commit.
This commit is contained in:
Hiten P
@@ -65,6 +65,7 @@ libzmq_la_SOURCES = \
|
|||||||
stdint.hpp \
|
stdint.hpp \
|
||||||
stream_engine.hpp \
|
stream_engine.hpp \
|
||||||
sub.hpp \
|
sub.hpp \
|
||||||
|
tcp.hpp \
|
||||||
tcp_address.hpp \
|
tcp_address.hpp \
|
||||||
tcp_connecter.hpp \
|
tcp_connecter.hpp \
|
||||||
tcp_listener.hpp \
|
tcp_listener.hpp \
|
||||||
@@ -123,6 +124,7 @@ libzmq_la_SOURCES = \
|
|||||||
socket_base.cpp \
|
socket_base.cpp \
|
||||||
stream_engine.cpp \
|
stream_engine.cpp \
|
||||||
sub.cpp \
|
sub.cpp \
|
||||||
|
tcp.cpp \
|
||||||
tcp_address.cpp \
|
tcp_address.cpp \
|
||||||
tcp_connecter.cpp \
|
tcp_connecter.cpp \
|
||||||
tcp_listener.cpp \
|
tcp_listener.cpp \
|
||||||
|
|||||||
83
src/ip.cpp
83
src/ip.cpp
@@ -66,89 +66,6 @@ zmq::fd_t zmq::open_socket (int domain_, int type_, int protocol_)
|
|||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
void zmq::tune_tcp_socket (fd_t s_)
|
|
||||||
{
|
|
||||||
// Disable Nagle's algorithm. We are doing data batching on 0MQ level,
|
|
||||||
// so using Nagle wouldn't improve throughput in anyway, but it would
|
|
||||||
// hurt latency.
|
|
||||||
int nodelay = 1;
|
|
||||||
int rc = setsockopt (s_, IPPROTO_TCP, TCP_NODELAY, (char*) &nodelay,
|
|
||||||
sizeof (int));
|
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
|
||||||
wsa_assert (rc != SOCKET_ERROR);
|
|
||||||
#else
|
|
||||||
errno_assert (rc == 0);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef ZMQ_HAVE_OPENVMS
|
|
||||||
// Disable delayed acknowledgements as they hurt latency is serious manner.
|
|
||||||
int nodelack = 1;
|
|
||||||
rc = setsockopt (s_, IPPROTO_TCP, TCP_NODELACK, (char*) &nodelack,
|
|
||||||
sizeof (int));
|
|
||||||
errno_assert (rc != SOCKET_ERROR);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void zmq::tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_)
|
|
||||||
{
|
|
||||||
// Tuning TCP keep-alives if platform allows it
|
|
||||||
// All values = -1 means skip and leave it for OS
|
|
||||||
#ifdef ZMQ_HAVE_SO_KEEPALIVE
|
|
||||||
if (keepalive_ != -1) {
|
|
||||||
int rc = setsockopt (s_, SOL_SOCKET, SO_KEEPALIVE, (char*) &keepalive_, sizeof (int));
|
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
|
||||||
wsa_assert (rc != SOCKET_ERROR);
|
|
||||||
#else
|
|
||||||
errno_assert (rc == 0);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef ZMQ_HAVE_TCP_KEEPCNT
|
|
||||||
if (keepalive_cnt_ != -1) {
|
|
||||||
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPCNT, &keepalive_cnt_, sizeof (int));
|
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
|
||||||
wsa_assert (rc != SOCKET_ERROR);
|
|
||||||
#else
|
|
||||||
errno_assert (rc == 0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif // ZMQ_HAVE_TCP_KEEPCNT
|
|
||||||
|
|
||||||
#ifdef ZMQ_HAVE_TCP_KEEPIDLE
|
|
||||||
if (keepalive_idle_ != -1) {
|
|
||||||
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPIDLE, &keepalive_idle_, sizeof (int));
|
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
|
||||||
wsa_assert (rc != SOCKET_ERROR);
|
|
||||||
#else
|
|
||||||
errno_assert (rc == 0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#else // ZMQ_HAVE_TCP_KEEPIDLE
|
|
||||||
#ifdef ZMQ_HAVE_TCP_KEEPALIVE
|
|
||||||
if (keepalive_idle_ != -1) {
|
|
||||||
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPALIVE, &keepalive_idle_, sizeof (int));
|
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
|
||||||
wsa_assert (rc != SOCKET_ERROR);
|
|
||||||
#else
|
|
||||||
errno_assert (rc == 0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif // ZMQ_HAVE_TCP_KEEPALIVE
|
|
||||||
#endif // ZMQ_HAVE_TCP_KEEPIDLE
|
|
||||||
|
|
||||||
#ifdef ZMQ_HAVE_TCP_KEEPINTVL
|
|
||||||
if (keepalive_intvl_ != -1) {
|
|
||||||
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPINTVL, &keepalive_intvl_, sizeof (int));
|
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
|
||||||
wsa_assert (rc != SOCKET_ERROR);
|
|
||||||
#else
|
|
||||||
errno_assert (rc == 0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif // ZMQ_HAVE_TCP_KEEPINTVL
|
|
||||||
}
|
|
||||||
#endif // ZMQ_HAVE_SO_KEEPALIVE
|
|
||||||
}
|
|
||||||
|
|
||||||
void zmq::unblock_socket (fd_t s_)
|
void zmq::unblock_socket (fd_t s_)
|
||||||
{
|
{
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
|||||||
@@ -30,12 +30,6 @@ namespace zmq
|
|||||||
// Same as socket(2), but allows for transparent tweaking the options.
|
// Same as socket(2), but allows for transparent tweaking the options.
|
||||||
fd_t open_socket (int domain_, int type_, int protocol_);
|
fd_t open_socket (int domain_, int type_, int protocol_);
|
||||||
|
|
||||||
// Tunes the supplied TCP socket for the best latency.
|
|
||||||
void tune_tcp_socket (fd_t s_);
|
|
||||||
|
|
||||||
// Tunes TCP keep-alives
|
|
||||||
void tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_);
|
|
||||||
|
|
||||||
// Sets the socket into non-blocking mode.
|
// Sets the socket into non-blocking mode.
|
||||||
void unblock_socket (fd_t s_);
|
void unblock_socket (fd_t s_);
|
||||||
|
|
||||||
|
|||||||
122
src/tcp.cpp
Normal file
122
src/tcp.cpp
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2010-2011 250bpm s.r.o.
|
||||||
|
Copyright (c) 2007-2009 iMatix Corporation
|
||||||
|
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
|
||||||
|
|
||||||
|
This file is part of 0MQ.
|
||||||
|
|
||||||
|
0MQ is free software; you can redistribute it and/or modify it under
|
||||||
|
the terms of the GNU Lesser General Public License as published by
|
||||||
|
the Free Software Foundation; either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
0MQ is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "ip.hpp"
|
||||||
|
#include "tcp.hpp"
|
||||||
|
#include "err.hpp"
|
||||||
|
#include "platform.hpp"
|
||||||
|
|
||||||
|
#if defined ZMQ_HAVE_WINDOWS
|
||||||
|
#include "windows.hpp"
|
||||||
|
#else
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <netinet/tcp.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined ZMQ_HAVE_OPENVMS
|
||||||
|
#include <ioctl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void zmq::tune_tcp_socket (fd_t s_)
|
||||||
|
{
|
||||||
|
// Disable Nagle's algorithm. We are doing data batching on 0MQ level,
|
||||||
|
// so using Nagle wouldn't improve throughput in anyway, but it would
|
||||||
|
// hurt latency.
|
||||||
|
int nodelay = 1;
|
||||||
|
int rc = setsockopt (s_, IPPROTO_TCP, TCP_NODELAY, (char*) &nodelay,
|
||||||
|
sizeof (int));
|
||||||
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
wsa_assert (rc != SOCKET_ERROR);
|
||||||
|
#else
|
||||||
|
errno_assert (rc == 0);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef ZMQ_HAVE_OPENVMS
|
||||||
|
// Disable delayed acknowledgements as they hurt latency is serious manner.
|
||||||
|
int nodelack = 1;
|
||||||
|
rc = setsockopt (s_, IPPROTO_TCP, TCP_NODELACK, (char*) &nodelack,
|
||||||
|
sizeof (int));
|
||||||
|
errno_assert (rc != SOCKET_ERROR);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void zmq::tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_)
|
||||||
|
{
|
||||||
|
// Tuning TCP keep-alives if platform allows it
|
||||||
|
// All values = -1 means skip and leave it for OS
|
||||||
|
#ifdef ZMQ_HAVE_SO_KEEPALIVE
|
||||||
|
if (keepalive_ != -1) {
|
||||||
|
int rc = setsockopt (s_, SOL_SOCKET, SO_KEEPALIVE, (char*) &keepalive_, sizeof (int));
|
||||||
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
wsa_assert (rc != SOCKET_ERROR);
|
||||||
|
#else
|
||||||
|
errno_assert (rc == 0);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef ZMQ_HAVE_TCP_KEEPCNT
|
||||||
|
if (keepalive_cnt_ != -1) {
|
||||||
|
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPCNT, &keepalive_cnt_, sizeof (int));
|
||||||
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
wsa_assert (rc != SOCKET_ERROR);
|
||||||
|
#else
|
||||||
|
errno_assert (rc == 0);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif // ZMQ_HAVE_TCP_KEEPCNT
|
||||||
|
|
||||||
|
#ifdef ZMQ_HAVE_TCP_KEEPIDLE
|
||||||
|
if (keepalive_idle_ != -1) {
|
||||||
|
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPIDLE, &keepalive_idle_, sizeof (int));
|
||||||
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
wsa_assert (rc != SOCKET_ERROR);
|
||||||
|
#else
|
||||||
|
errno_assert (rc == 0);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#else // ZMQ_HAVE_TCP_KEEPIDLE
|
||||||
|
#ifdef ZMQ_HAVE_TCP_KEEPALIVE
|
||||||
|
if (keepalive_idle_ != -1) {
|
||||||
|
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPALIVE, &keepalive_idle_, sizeof (int));
|
||||||
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
wsa_assert (rc != SOCKET_ERROR);
|
||||||
|
#else
|
||||||
|
errno_assert (rc == 0);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif // ZMQ_HAVE_TCP_KEEPALIVE
|
||||||
|
#endif // ZMQ_HAVE_TCP_KEEPIDLE
|
||||||
|
|
||||||
|
#ifdef ZMQ_HAVE_TCP_KEEPINTVL
|
||||||
|
if (keepalive_intvl_ != -1) {
|
||||||
|
int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPINTVL, &keepalive_intvl_, sizeof (int));
|
||||||
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
wsa_assert (rc != SOCKET_ERROR);
|
||||||
|
#else
|
||||||
|
errno_assert (rc == 0);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif // ZMQ_HAVE_TCP_KEEPINTVL
|
||||||
|
}
|
||||||
|
#endif // ZMQ_HAVE_SO_KEEPALIVE
|
||||||
|
}
|
||||||
38
src/tcp.hpp
Normal file
38
src/tcp.hpp
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2010-2011 250bpm s.r.o.
|
||||||
|
Copyright (c) 2007-2009 iMatix Corporation
|
||||||
|
Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
|
||||||
|
|
||||||
|
This file is part of 0MQ.
|
||||||
|
|
||||||
|
0MQ is free software; you can redistribute it and/or modify it under
|
||||||
|
the terms of the GNU Lesser General Public License as published by
|
||||||
|
the Free Software Foundation; either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
0MQ is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __ZMQ_TCP_HPP_INCLUDED__
|
||||||
|
#define __ZMQ_TCP_HPP_INCLUDED__
|
||||||
|
|
||||||
|
#include "fd.hpp"
|
||||||
|
|
||||||
|
namespace zmq
|
||||||
|
{
|
||||||
|
|
||||||
|
// Tunes the supplied TCP socket for the best latency.
|
||||||
|
void tune_tcp_socket (fd_t s_);
|
||||||
|
|
||||||
|
// Tunes TCP keep-alives
|
||||||
|
void tune_tcp_keepalives (fd_t s_, int keepalive_, int keepalive_cnt_, int keepalive_idle_, int keepalive_intvl_);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -29,6 +29,7 @@
|
|||||||
#include "random.hpp"
|
#include "random.hpp"
|
||||||
#include "err.hpp"
|
#include "err.hpp"
|
||||||
#include "ip.hpp"
|
#include "ip.hpp"
|
||||||
|
#include "tcp.hpp"
|
||||||
#include "address.hpp"
|
#include "address.hpp"
|
||||||
#include "tcp_address.hpp"
|
#include "tcp_address.hpp"
|
||||||
#include "session_base.hpp"
|
#include "session_base.hpp"
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
#include "config.hpp"
|
#include "config.hpp"
|
||||||
#include "err.hpp"
|
#include "err.hpp"
|
||||||
#include "ip.hpp"
|
#include "ip.hpp"
|
||||||
|
#include "tcp.hpp"
|
||||||
#include "socket_base.hpp"
|
#include "socket_base.hpp"
|
||||||
|
|
||||||
#ifdef ZMQ_HAVE_WINDOWS
|
#ifdef ZMQ_HAVE_WINDOWS
|
||||||
|
|||||||
Reference in New Issue
Block a user