summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2012-02-16 10:04:53 +0900
committerMartin Sustrik <sustrik@250bpm.com>2012-02-16 10:04:53 +0900
commitaaa766acf7596eb4de7afe6ae0121335f4fd05da (patch)
treeaffa1fdb70ba90ae9893d452dea13776faeb6ff4
parent71744dc8ef9b59a342b03f7ba2c3699f5ccb862a (diff)
cancel_timer function renamed to rm_timer
This is more consistent with adjacent add_fd and rm_fd functions. Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--src/io_object.cpp4
-rw-r--r--src/io_object.hpp2
-rw-r--r--src/ipc_connecter.cpp2
-rw-r--r--src/monitor.cpp2
-rw-r--r--src/pgm_receiver.cpp6
-rw-r--r--src/pgm_sender.cpp8
-rw-r--r--src/poller_base.cpp2
-rw-r--r--src/poller_base.hpp2
-rw-r--r--src/session_base.cpp2
-rw-r--r--src/tcp_connecter.cpp2
10 files changed, 16 insertions, 16 deletions
diff --git a/src/io_object.cpp b/src/io_object.cpp
index 8c4f2fe..730123e 100644
--- a/src/io_object.cpp
+++ b/src/io_object.cpp
@@ -87,9 +87,9 @@ void xs::io_object_t::add_timer (int timeout_, int id_)
poller->add_timer (timeout_, this, id_);
}
-void xs::io_object_t::cancel_timer (int id_)
+void xs::io_object_t::rm_timer (int id_)
{
- poller->cancel_timer (this, id_);
+ poller->rm_timer (this, id_);
}
void xs::io_object_t::in_event (fd_t fd_)
diff --git a/src/io_object.hpp b/src/io_object.hpp
index 61f7523..3236c22 100644
--- a/src/io_object.hpp
+++ b/src/io_object.hpp
@@ -58,7 +58,7 @@ namespace xs
void set_pollout (handle_t handle_);
void reset_pollout (handle_t handle_);
void add_timer (int timout_, int id_);
- void cancel_timer (int id_);
+ void rm_timer (int id_);
// i_poll_events interface implementation.
void in_event (fd_t fd_);
diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp
index 243d795..4f353bc 100644
--- a/src/ipc_connecter.cpp
+++ b/src/ipc_connecter.cpp
@@ -57,7 +57,7 @@ xs::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
xs::ipc_connecter_t::~ipc_connecter_t ()
{
if (wait)
- cancel_timer (reconnect_timer_id);
+ rm_timer (reconnect_timer_id);
if (handle_valid)
rm_fd (handle);
diff --git a/src/monitor.cpp b/src/monitor.cpp
index 1937039..7665005 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -59,7 +59,7 @@ void xs::monitor_t::process_plug ()
void xs::monitor_t::process_stop ()
{
- cancel_timer (timer_id);
+ rm_timer (timer_id);
send_done ();
delete this;
}
diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp
index 19866c7..c8aec2d 100644
--- a/src/pgm_receiver.cpp
+++ b/src/pgm_receiver.cpp
@@ -91,7 +91,7 @@ void xs::pgm_receiver_t::unplug ()
pending_bytes = 0;
if (has_rx_timer) {
- cancel_timer (rx_timer_id);
+ rm_timer (rx_timer_id);
has_rx_timer = false;
}
@@ -158,7 +158,7 @@ void xs::pgm_receiver_t::in_event (fd_t fd_)
return;
if (has_rx_timer) {
- cancel_timer (rx_timer_id);
+ rm_timer (rx_timer_id);
has_rx_timer = false;
}
@@ -251,7 +251,7 @@ void xs::pgm_receiver_t::in_event (fd_t fd_)
// Reset outstanding timer.
if (has_rx_timer) {
- cancel_timer (rx_timer_id);
+ rm_timer (rx_timer_id);
has_rx_timer = false;
}
diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp
index 54997cd..8637f5a 100644
--- a/src/pgm_sender.cpp
+++ b/src/pgm_sender.cpp
@@ -107,12 +107,12 @@ void xs::pgm_sender_t::plug (io_thread_t *io_thread_, session_base_t *session_)
void xs::pgm_sender_t::unplug ()
{
if (has_rx_timer) {
- cancel_timer (rx_timer_id);
+ rm_timer (rx_timer_id);
has_rx_timer = false;
}
if (has_tx_timer) {
- cancel_timer (tx_timer_id);
+ rm_timer (tx_timer_id);
has_tx_timer = false;
}
@@ -151,7 +151,7 @@ xs::pgm_sender_t::~pgm_sender_t ()
void xs::pgm_sender_t::in_event (fd_t fd_)
{
if (has_rx_timer) {
- cancel_timer (rx_timer_id);
+ rm_timer (rx_timer_id);
has_rx_timer = false;
}
@@ -190,7 +190,7 @@ void xs::pgm_sender_t::out_event (fd_t fd_)
}
if (has_tx_timer) {
- cancel_timer (tx_timer_id);
+ rm_timer (tx_timer_id);
has_tx_timer = false;
}
diff --git a/src/poller_base.cpp b/src/poller_base.cpp
index 39ae654..bc03444 100644
--- a/src/poller_base.cpp
+++ b/src/poller_base.cpp
@@ -75,7 +75,7 @@ void xs::poller_base_t::add_timer (int timeout_, i_poll_events *sink_, int id_)
timers.insert (timers_t::value_type (expiration, info));
}
-void xs::poller_base_t::cancel_timer (i_poll_events *sink_, int id_)
+void xs::poller_base_t::rm_timer (i_poll_events *sink_, int id_)
{
// Complexity of this operation is O(n). We assume it is rarely used.
for (timers_t::iterator it = timers.begin (); it != timers.end (); ++it)
diff --git a/src/poller_base.hpp b/src/poller_base.hpp
index 4822e0e..15e03a6 100644
--- a/src/poller_base.hpp
+++ b/src/poller_base.hpp
@@ -78,7 +78,7 @@ namespace xs
void add_timer (int timeout_, xs::i_poll_events *sink_, int id_);
// Cancel the timer created by sink_ object with ID equal to id_.
- void cancel_timer (xs::i_poll_events *sink_, int id_);
+ void rm_timer (xs::i_poll_events *sink_, int id_);
protected:
diff --git a/src/session_base.cpp b/src/session_base.cpp
index 6c23bb5..2bd5918 100644
--- a/src/session_base.cpp
+++ b/src/session_base.cpp
@@ -128,7 +128,7 @@ xs::session_base_t::~session_base_t ()
// If there's still a pending linger timer, remove it.
if (has_linger_timer) {
- cancel_timer (linger_timer_id);
+ rm_timer (linger_timer_id);
has_linger_timer = false;
}
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index f5a9180..fbaaf8e 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -66,7 +66,7 @@ xs::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
xs::tcp_connecter_t::~tcp_connecter_t ()
{
if (wait)
- cancel_timer (reconnect_timer_id);
+ rm_timer (reconnect_timer_id);
if (handle_valid)
rm_fd (handle);