Removing zmq_pollfd as it is replaced by zmq_poller

src/socket_poller.hpp

@@ -30,10 +30,23 @@
 #ifndef __ZMQ_SOCKET_POLLER_HPP_INCLUDED__
 #define __ZMQ_SOCKET_POLLER_HPP_INCLUDED__
 
+#include "poller.hpp"
+
+#if defined ZMQ_POLL_BASED_ON_POLL
+#include <poll.h>
+#endif
+
+#if defined ZMQ_HAVE_WINDOWS
+#include "windows.hpp"
+#else
+#include <unistd.h>
+#endif
+
 #include <vector>
 #include <algorithm>
 
-#include "../include/zmq.h"
+#include "socket_base.hpp"
+#include "signaler.hpp"
 
 namespace zmq
 {
@@ -46,28 +59,19 @@ namespace zmq
 
         typedef struct event_t
         {
-            void *socket;
-#if defined _WIN32
-            SOCKET fd;
-#else
-            int fd;
-#endif
+            socket_base_t *socket;
+            fd_t fd;
             void *user_data; 
             short events;
         } event_t;
 
-        int add (void *socket, void *user_data, short events);
-        int modify (void *socket, short events);
-        int remove (void *socket);
-#if defined _WIN32
-        int add_fd (SOCKET fd, void *user_data, short events);
-        int modify_fd (SOCKET fd, short events);
-        int remove_fd (SOCKET fd);
-#else
-        int add_fd (int fd, void *user_data, short events);
-        int modify_fd (int fd, short events);
-        int remove_fd (int fd);
-#endif
+        int add (socket_base_t *socket, void *user_data, short events);
+        int modify (socket_base_t *socket, short events);
+        int remove (socket_base_t *socket);
+
+        int add_fd (fd_t fd, void *user_data, short events);
+        int modify_fd (fd_t fd, short events);
+        int remove_fd (fd_t fd);
 
         int wait (event_t *event, long timeout);
 
@@ -75,29 +79,45 @@ namespace zmq
         bool check_tag ();
 
     private:
-        void rebuild ();
+        int rebuild ();     
 
         //  Used to check whether the object is a socket_poller.
         uint32_t tag;
 
-        //  Pollfd used for thread safe sockets polling
-        void *pollfd;
+        //  Signaler used for thread safe sockets polling
+        signaler_t signaler;
+
+        typedef struct item_t {
+            socket_base_t *socket;
+            fd_t fd;
+            void *user_data; 
+            short events;
+#if defined ZMQ_POLL_BASED_ON_POLL
+            int  pollfd_index;
+#endif
+        } item_t;
 
         //  List of sockets
-        typedef std::vector <event_t> events_t;
-        events_t events;
-
-        //  Current zmq_poll set
-        zmq_pollitem_t *poll_set;
-
-        //  Matching set to events
-        event_t *poll_events;
-
-        //  Size of the pollset
-        int poll_size;
+        typedef std::vector <item_t> items_t;
+        items_t items;
 
         //  Does the pollset needs rebuilding?
         bool need_rebuild;
+
+        //  Should the signaler be used for the thread safe polling?
+        bool use_signaler;
+   
+        //  Size of the pollset
+        int poll_size;
+   
+#if defined ZMQ_POLL_BASED_ON_POLL
+        pollfd *pollfds;
+#elif defined ZMQ_POLL_BASED_ON_SELECT
+        fd_set pollset_in;
+        fd_set pollset_out;
+        fd_set pollset_err;
+        zmq::fd_t maxfd;
+#endif
         
         socket_poller_t (const socket_poller_t&);
         const socket_poller_t &operator = (const socket_poller_t&);