mirror of
https://github.com/zeromq/libzmq.git
synced 2025-03-09 15:26:04 +00:00
Problem: indentation should be 4 spaces, no tabs
Solution: fix it
This commit is contained in:
parent
406b5738b6
commit
d4c0716473
@ -333,14 +333,14 @@ int zmq::dish_session_t::pull_msg (msg_t *msg_)
|
|||||||
|
|
||||||
if (msg_->is_join ()) {
|
if (msg_->is_join ()) {
|
||||||
rc = command.init_size (group_length + 5);
|
rc = command.init_size (group_length + 5);
|
||||||
errno_assert(rc == 0);
|
errno_assert(rc == 0);
|
||||||
offset = 5;
|
offset = 5;
|
||||||
memcpy (command.data (), "\4JOIN", 5);
|
memcpy (command.data (), "\4JOIN", 5);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
rc = command.init_size (group_length + 6);
|
rc = command.init_size (group_length + 6);
|
||||||
errno_assert(rc == 0);
|
errno_assert(rc == 0);
|
||||||
offset = 6;
|
offset = 6;
|
||||||
memcpy (command.data (), "\5LEAVE", 6);
|
memcpy (command.data (), "\5LEAVE", 6);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,10 +58,10 @@ namespace zmq
|
|||||||
|
|
||||||
inline encoder_base_t (size_t bufsize_) :
|
inline encoder_base_t (size_t bufsize_) :
|
||||||
bufsize (bufsize_),
|
bufsize (bufsize_),
|
||||||
write_pos(0),
|
write_pos(0),
|
||||||
to_write(0),
|
to_write(0),
|
||||||
next(nullptr),
|
next(nullptr),
|
||||||
new_msg_flag(false),
|
new_msg_flag(false),
|
||||||
in_progress (NULL)
|
in_progress (NULL)
|
||||||
{
|
{
|
||||||
buf = (unsigned char*) malloc (bufsize_);
|
buf = (unsigned char*) malloc (bufsize_);
|
||||||
|
@ -92,7 +92,7 @@ zmq::pipe_t::pipe_t (object_t *parent_, upipe_t *inpipe_, upipe_t *outpipe_,
|
|||||||
sink (NULL),
|
sink (NULL),
|
||||||
state (active),
|
state (active),
|
||||||
delay (true),
|
delay (true),
|
||||||
routing_id(0),
|
routing_id(0),
|
||||||
conflate (conflate_)
|
conflate (conflate_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -228,8 +228,8 @@ int zmq::radio_session_t::pull_msg (msg_t *msg_)
|
|||||||
|
|
||||||
// First frame is the group
|
// First frame is the group
|
||||||
rc = msg_->init_size (length);
|
rc = msg_->init_size (length);
|
||||||
errno_assert(rc == 0);
|
errno_assert(rc == 0);
|
||||||
msg_->set_flags(msg_t::more);
|
msg_->set_flags(msg_t::more);
|
||||||
memcpy (msg_->data (), group, length);
|
memcpy (msg_->data (), group, length);
|
||||||
|
|
||||||
// Next status is the body
|
// Next status is the body
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
zmq::reaper_t::reaper_t (class ctx_t *ctx_, uint32_t tid_) :
|
zmq::reaper_t::reaper_t (class ctx_t *ctx_, uint32_t tid_) :
|
||||||
object_t (ctx_, tid_),
|
object_t (ctx_, tid_),
|
||||||
sockets (0),
|
sockets (0),
|
||||||
mailbox_handle(NULL),
|
mailbox_handle(NULL),
|
||||||
terminating (false)
|
terminating (false)
|
||||||
{
|
{
|
||||||
poller = new (std::nothrow) poller_t (*ctx_);
|
poller = new (std::nothrow) poller_t (*ctx_);
|
||||||
|
@ -540,7 +540,7 @@ int zmq::signaler_t::make_fdpair (fd_t *r_, fd_t *w_)
|
|||||||
|
|
||||||
// We don't need the listening socket anymore. Close it.
|
// We don't need the listening socket anymore. Close it.
|
||||||
rc = closesocket (listener);
|
rc = closesocket (listener);
|
||||||
wsa_assert(rc != SOCKET_ERROR);
|
wsa_assert(rc != SOCKET_ERROR);
|
||||||
|
|
||||||
if (sync != NULL) {
|
if (sync != NULL) {
|
||||||
// Exit the critical section.
|
// Exit the critical section.
|
||||||
|
@ -191,8 +191,8 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool
|
|||||||
monitor_socket (NULL),
|
monitor_socket (NULL),
|
||||||
monitor_events (0),
|
monitor_events (0),
|
||||||
thread_safe (thread_safe_),
|
thread_safe (thread_safe_),
|
||||||
poller(nullptr),
|
poller(nullptr),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
reaper_signaler (NULL)
|
reaper_signaler (NULL)
|
||||||
{
|
{
|
||||||
options.socket_id = sid_;
|
options.socket_id = sid_;
|
||||||
@ -454,7 +454,7 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_,
|
|||||||
EXIT_MUTEX ();
|
EXIT_MUTEX ();
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
strncpy(static_cast <char *> (optval_), last_endpoint.c_str(), last_endpoint.size() + 1);
|
strncpy(static_cast <char *> (optval_), last_endpoint.c_str(), last_endpoint.size() + 1);
|
||||||
*optvallen_ = last_endpoint.size () + 1;
|
*optvallen_ = last_endpoint.size () + 1;
|
||||||
EXIT_MUTEX ();
|
EXIT_MUTEX ();
|
||||||
return 0;
|
return 0;
|
||||||
@ -1504,9 +1504,9 @@ void zmq::socket_base_t::in_event ()
|
|||||||
reaper_signaler->recv();
|
reaper_signaler->recv();
|
||||||
|
|
||||||
int rc = process_commands (0, false);
|
int rc = process_commands (0, false);
|
||||||
EXIT_MUTEX();
|
EXIT_MUTEX();
|
||||||
errno_assert(rc == 0);
|
errno_assert(rc == 0);
|
||||||
check_destroy();
|
check_destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
void zmq::socket_base_t::out_event ()
|
void zmq::socket_base_t::out_event ()
|
||||||
|
@ -34,8 +34,8 @@
|
|||||||
zmq::socket_poller_t::socket_poller_t () :
|
zmq::socket_poller_t::socket_poller_t () :
|
||||||
tag (0xCAFEBABE),
|
tag (0xCAFEBABE),
|
||||||
need_rebuild (true),
|
need_rebuild (true),
|
||||||
poll_size(0),
|
poll_size(0),
|
||||||
maxfd(0),
|
maxfd(0),
|
||||||
use_signaler (false)
|
use_signaler (false)
|
||||||
#if defined ZMQ_POLL_BASED_ON_POLL
|
#if defined ZMQ_POLL_BASED_ON_POLL
|
||||||
,
|
,
|
||||||
@ -43,10 +43,10 @@ zmq::socket_poller_t::socket_poller_t () :
|
|||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
#if defined ZMQ_POLL_BASED_ON_SELECT
|
#if defined ZMQ_POLL_BASED_ON_SELECT
|
||||||
memset(&pollset_in, 0, sizeof(pollset_in));
|
memset(&pollset_in, 0, sizeof(pollset_in));
|
||||||
memset(&pollset_out, 0, sizeof(pollset_in));
|
memset(&pollset_out, 0, sizeof(pollset_in));
|
||||||
memset(&pollset_err, 0, sizeof(pollset_in));
|
memset(&pollset_err, 0, sizeof(pollset_in));
|
||||||
maxfd = 0;
|
maxfd = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,9 +63,9 @@ zmq::socks_connecter_t::socks_connecter_t (class io_thread_t *io_thread_,
|
|||||||
s (retired_fd),
|
s (retired_fd),
|
||||||
delayed_start (delayed_start_),
|
delayed_start (delayed_start_),
|
||||||
session (session_),
|
session (session_),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
handle_valid(false),
|
handle_valid(false),
|
||||||
timer_started(false),
|
timer_started(false),
|
||||||
current_reconnect_ivl (options.reconnect_ivl)
|
current_reconnect_ivl (options.reconnect_ivl)
|
||||||
{
|
{
|
||||||
zmq_assert (addr);
|
zmq_assert (addr);
|
||||||
|
@ -87,8 +87,8 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_,
|
|||||||
has_timeout_timer (false),
|
has_timeout_timer (false),
|
||||||
has_heartbeat_timer (false),
|
has_heartbeat_timer (false),
|
||||||
heartbeat_timeout (0),
|
heartbeat_timeout (0),
|
||||||
as_server(false),
|
as_server(false),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
socket (NULL)
|
socket (NULL)
|
||||||
{
|
{
|
||||||
int rc = tx_msg.init ();
|
int rc = tx_msg.init ();
|
||||||
@ -1021,8 +1021,8 @@ int zmq::stream_engine_t::produce_ping_message(msg_t * msg_)
|
|||||||
|
|
||||||
// 16-bit TTL + \4PING == 7
|
// 16-bit TTL + \4PING == 7
|
||||||
rc = msg_->init_size(7);
|
rc = msg_->init_size(7);
|
||||||
errno_assert(rc == 0);
|
errno_assert(rc == 0);
|
||||||
msg_->set_flags(msg_t::command);
|
msg_->set_flags(msg_t::command);
|
||||||
// Copy in the command message
|
// Copy in the command message
|
||||||
memcpy(msg_->data(), "\4PING", 5);
|
memcpy(msg_->data(), "\4PING", 5);
|
||||||
|
|
||||||
@ -1044,8 +1044,8 @@ int zmq::stream_engine_t::produce_pong_message(msg_t * msg_)
|
|||||||
zmq_assert (mechanism != NULL);
|
zmq_assert (mechanism != NULL);
|
||||||
|
|
||||||
rc = msg_->init_size(5);
|
rc = msg_->init_size(5);
|
||||||
errno_assert(rc == 0);
|
errno_assert(rc == 0);
|
||||||
msg_->set_flags(msg_t::command);
|
msg_->set_flags(msg_t::command);
|
||||||
|
|
||||||
memcpy(msg_->data(), "\4PONG", 5);
|
memcpy(msg_->data(), "\4PONG", 5);
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
|
|||||||
connect_timer_started (false),
|
connect_timer_started (false),
|
||||||
reconnect_timer_started (false),
|
reconnect_timer_started (false),
|
||||||
session (session_),
|
session (session_),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
current_reconnect_ivl (options.reconnect_ivl)
|
current_reconnect_ivl (options.reconnect_ivl)
|
||||||
{
|
{
|
||||||
zmq_assert (addr);
|
zmq_assert (addr);
|
||||||
|
@ -65,7 +65,7 @@ zmq::tcp_listener_t::tcp_listener_t (io_thread_t *io_thread_,
|
|||||||
own_t (io_thread_, options_),
|
own_t (io_thread_, options_),
|
||||||
io_object_t (io_thread_),
|
io_object_t (io_thread_),
|
||||||
s (retired_fd),
|
s (retired_fd),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
socket (socket_)
|
socket (socket_)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -55,9 +55,9 @@ namespace zmq
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
inline thread_t ()
|
inline thread_t ()
|
||||||
: tfn(nullptr)
|
: tfn(nullptr)
|
||||||
, arg(nullptr)
|
, arg(nullptr)
|
||||||
, descriptor(NULL)
|
, descriptor(NULL)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
zmq::udp_address_t::udp_address_t ()
|
zmq::udp_address_t::udp_address_t ()
|
||||||
: is_mutlicast(false)
|
: is_mutlicast(false)
|
||||||
{
|
{
|
||||||
memset (&bind_address, 0, sizeof bind_address);
|
memset (&bind_address, 0, sizeof bind_address);
|
||||||
memset (&dest_address, 0, sizeof dest_address);
|
memset (&dest_address, 0, sizeof dest_address);
|
||||||
|
@ -48,11 +48,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
|
|
||||||
zmq::udp_engine_t::udp_engine_t() :
|
zmq::udp_engine_t::udp_engine_t() :
|
||||||
plugged (false),
|
plugged (false),
|
||||||
fd(NULL),
|
fd(NULL),
|
||||||
address(nullptr),
|
address(nullptr),
|
||||||
send_enabled(false),
|
send_enabled(false),
|
||||||
recv_enabled(false),
|
recv_enabled(false),
|
||||||
handle(NULL),
|
handle(NULL),
|
||||||
session(NULL)
|
session(NULL)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
@ -174,7 +174,7 @@ int zmq::xpub_t::xsetsockopt (int option_, const void *optval_,
|
|||||||
|
|
||||||
if (optvallen_ > 0) {
|
if (optvallen_ > 0) {
|
||||||
int rc = welcome_msg.init_size(optvallen_);
|
int rc = welcome_msg.init_size(optvallen_);
|
||||||
errno_assert(rc == 0);
|
errno_assert(rc == 0);
|
||||||
|
|
||||||
unsigned char *data = (unsigned char*)welcome_msg.data();
|
unsigned char *data = (unsigned char*)welcome_msg.data();
|
||||||
memcpy(data, optval_, optvallen_);
|
memcpy(data, optval_, optvallen_);
|
||||||
|
@ -925,9 +925,9 @@ int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
|
|||||||
// file descriptors.
|
// file descriptors.
|
||||||
zmq_assert (nitems_ <= FD_SETSIZE);
|
zmq_assert (nitems_ <= FD_SETSIZE);
|
||||||
|
|
||||||
fd_set pollset_in = { 0 };
|
fd_set pollset_in = { 0 };
|
||||||
fd_set pollset_out = { 0 };
|
fd_set pollset_out = { 0 };
|
||||||
fd_set pollset_err = { 0 };
|
fd_set pollset_err = { 0 };
|
||||||
|
|
||||||
zmq::fd_t maxfd = 0;
|
zmq::fd_t maxfd = 0;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user