mirror of
https://github.com/zeromq/libzmq.git
synced 2025-10-29 12:18:04 +01:00
Problem: inconsistent naming style for private data members, conflicts with naming of local variables and member functions
Solution: apply and check _lower_case naming style for private data members
This commit is contained in:
@@ -38,26 +38,26 @@
|
||||
|
||||
zmq::io_thread_t::io_thread_t (ctx_t *ctx_, uint32_t tid_) :
|
||||
object_t (ctx_, tid_),
|
||||
mailbox_handle (static_cast<poller_t::handle_t> (NULL))
|
||||
_mailbox_handle (static_cast<poller_t::handle_t> (NULL))
|
||||
{
|
||||
poller = new (std::nothrow) poller_t (*ctx_);
|
||||
alloc_assert (poller);
|
||||
_poller = new (std::nothrow) poller_t (*ctx_);
|
||||
alloc_assert (_poller);
|
||||
|
||||
if (mailbox.get_fd () != retired_fd) {
|
||||
mailbox_handle = poller->add_fd (mailbox.get_fd (), this);
|
||||
poller->set_pollin (mailbox_handle);
|
||||
if (_mailbox.get_fd () != retired_fd) {
|
||||
_mailbox_handle = _poller->add_fd (_mailbox.get_fd (), this);
|
||||
_poller->set_pollin (_mailbox_handle);
|
||||
}
|
||||
}
|
||||
|
||||
zmq::io_thread_t::~io_thread_t ()
|
||||
{
|
||||
LIBZMQ_DELETE (poller);
|
||||
LIBZMQ_DELETE (_poller);
|
||||
}
|
||||
|
||||
void zmq::io_thread_t::start ()
|
||||
{
|
||||
// Start the underlying I/O thread.
|
||||
poller->start ();
|
||||
_poller->start ();
|
||||
}
|
||||
|
||||
void zmq::io_thread_t::stop ()
|
||||
@@ -67,12 +67,12 @@ void zmq::io_thread_t::stop ()
|
||||
|
||||
zmq::mailbox_t *zmq::io_thread_t::get_mailbox ()
|
||||
{
|
||||
return &mailbox;
|
||||
return &_mailbox;
|
||||
}
|
||||
|
||||
int zmq::io_thread_t::get_load ()
|
||||
{
|
||||
return poller->get_load ();
|
||||
return _poller->get_load ();
|
||||
}
|
||||
|
||||
void zmq::io_thread_t::in_event ()
|
||||
@@ -81,12 +81,12 @@ void zmq::io_thread_t::in_event ()
|
||||
// process in a single go?
|
||||
|
||||
command_t cmd;
|
||||
int rc = mailbox.recv (&cmd, 0);
|
||||
int rc = _mailbox.recv (&cmd, 0);
|
||||
|
||||
while (rc == 0 || errno == EINTR) {
|
||||
if (rc == 0)
|
||||
cmd.destination->process_command (cmd);
|
||||
rc = mailbox.recv (&cmd, 0);
|
||||
rc = _mailbox.recv (&cmd, 0);
|
||||
}
|
||||
|
||||
errno_assert (rc != 0 && errno == EAGAIN);
|
||||
@@ -106,13 +106,13 @@ void zmq::io_thread_t::timer_event (int)
|
||||
|
||||
zmq::poller_t *zmq::io_thread_t::get_poller ()
|
||||
{
|
||||
zmq_assert (poller);
|
||||
return poller;
|
||||
zmq_assert (_poller);
|
||||
return _poller;
|
||||
}
|
||||
|
||||
void zmq::io_thread_t::process_stop ()
|
||||
{
|
||||
zmq_assert (mailbox_handle);
|
||||
poller->rm_fd (mailbox_handle);
|
||||
poller->stop ();
|
||||
zmq_assert (_mailbox_handle);
|
||||
_poller->rm_fd (_mailbox_handle);
|
||||
_poller->stop ();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user