From c193fd146661b39027c5e3fa0776dcdf8c6af5e2 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Thu, 29 Apr 2010 17:20:23 +0200
Subject: lock-free polling removed; ZMQ_POLL flag removed

---
 src/app_thread.cpp | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'src/app_thread.cpp')

diff --git a/src/app_thread.cpp b/src/app_thread.cpp
index 9ff2112..0dad660 100644
--- a/src/app_thread.cpp
+++ b/src/app_thread.cpp
@@ -36,7 +36,6 @@
 #include "app_thread.hpp"
 #include "dispatcher.hpp"
 #include "fd_signaler.hpp"
-#include "ypollset.hpp"
 #include "err.hpp"
 #include "pipe.hpp"
 #include "config.hpp"
@@ -59,27 +58,16 @@
 #define ZMQ_DELAY_COMMANDS
 #endif
 
-zmq::app_thread_t::app_thread_t (dispatcher_t *dispatcher_, int thread_slot_,
-      int flags_) :
+zmq::app_thread_t::app_thread_t (dispatcher_t *dispatcher_, int thread_slot_) :
     object_t (dispatcher_, thread_slot_),
     last_processing_time (0),
     terminated (false)
 {
-    if (flags_ & ZMQ_POLL) {
-        signaler = new (std::nothrow) fd_signaler_t;
-        zmq_assert (signaler);
-    }
-    else {
-        signaler = new (std::nothrow) ypollset_t;
-        zmq_assert (signaler);
-    }
 }
 
 zmq::app_thread_t::~app_thread_t ()
 {
     zmq_assert (sockets.empty ());
-    zmq_assert (signaler);
-    delete signaler;
 }
 
 void zmq::app_thread_t::stop ()
@@ -87,16 +75,16 @@ void zmq::app_thread_t::stop ()
     send_stop ();
 }
 
-zmq::i_signaler *zmq::app_thread_t::get_signaler ()
+zmq::fd_signaler_t *zmq::app_thread_t::get_signaler ()
 {
-    return signaler;
+    return &signaler;
 }
 
 bool zmq::app_thread_t::process_commands (bool block_, bool throttle_)
 {
     uint64_t signals;
     if (block_)
-        signals = signaler->poll ();
+        signals = signaler.poll ();
     else {
 
 #if defined ZMQ_DELAY_COMMANDS
@@ -129,7 +117,7 @@ bool zmq::app_thread_t::process_commands (bool block_, bool throttle_)
 #endif
 
         //  Check whether there are any commands pending for this thread.
-        signals = signaler->check ();
+        signals = signaler.check ();
     }
 
     if (signals) {
-- 
cgit v1.2.3