summaryrefslogtreecommitdiff
path: root/src/own.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2012-04-21 19:36:35 +0200
committerMartin Sustrik <sustrik@250bpm.com>2012-04-30 06:44:58 +0200
commitdce17292e1f62ca692aa36ed3eaf5bfb09e7ab69 (patch)
treeddce23a15d353099e1b20ea329cede198dfa2af2 /src/own.cpp
parent2be5bb0cd8c33505e404467102c41151dabcbcd7 (diff)
'own' command replaced by synchronous call
The commands was a vestige of the removed 'durable sockets' feature Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/own.cpp')
-rw-r--r--src/own.cpp26
1 files changed, 10 insertions, 16 deletions
diff --git a/src/own.cpp b/src/own.cpp
index 968d272..45f1cbf 100644
--- a/src/own.cpp
+++ b/src/own.cpp
@@ -76,8 +76,16 @@ void xs::own_t::launch_child (own_t *object_)
// Plug the object into the I/O thread.
send_plug (object_);
- // Take ownership of the object.
- send_own (this, object_);
+ // If the object is already being shut down, new owned objects are
+ // immediately asked to terminate. Note that linger is set to zero.
+ if (terminating) {
+ register_term_acks (1);
+ send_term (object_, 0);
+ return;
+ }
+
+ // Store the reference to the owned object.
+ owned.insert (object_);
}
void xs::own_t::process_term_req (own_t *object_)
@@ -103,20 +111,6 @@ void xs::own_t::process_term_req (own_t *object_)
send_term (object_, options.linger);
}
-void xs::own_t::process_own (own_t *object_)
-{
- // If the object is already being shut down, new owned objects are
- // immediately asked to terminate. Note that linger is set to zero.
- if (terminating) {
- register_term_acks (1);
- send_term (object_, 0);
- return;
- }
-
- // Store the reference to the owned object.
- owned.insert (object_);
-}
-
void xs::own_t::terminate ()
{
// If termination is already underway, there's no point