Run include-what-you-use.

[cubemap] / udpinput.cpp

diff --git a/udpinput.cpp b/udpinput.cpp
index 4222515e71c58366cc372c9faf33ea8a5b6788f4..887850c91355d17b50d1f2f07a50be5bdd91c72c 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>

+#include <stddef.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/socket.h>


@@ -12,6 +13,7 @@
 #include "serverpool.h"
 #include "state.pb.h"
 #include "udpinput.h"
 #include "serverpool.h"
 #include "state.pb.h"
 #include "udpinput.h"

+#include "util.h"

 #include "version.h"
 
 using namespace std;
 #include "version.h"
 
 using namespace std;


@@ -52,15 +54,7 @@ InputProto UDPInput::serialize() const
 
 void UDPInput::close_socket()
 {
 
 void UDPInput::close_socket()
 {

-       int ret;
-       do {
-               ret = close(sock);
-       } while (ret == -1 && errno == EINTR);
-
-       if (ret == -1) {
-               log_perror("close()");
-       }
-
+       safe_close(sock);

        sock = -1;
 }
        
        sock = -1;
 }
        


@@ -74,15 +68,15 @@ void UDPInput::construct_header()
                "Connection: close\r\n";
 }
        
                "Connection: close\r\n";
 }
        

-void UDPInput::add_destination(const string &stream_id)
+void UDPInput::add_destination(int stream_index)

 {
 {

-       stream_ids.push_back(stream_id);
-       servers->set_header(stream_id, http_header, "");
+       stream_indices.push_back(stream_index);
+       servers->set_header(stream_index, http_header, "");

 }
 
 void UDPInput::do_work()
 {
 }
 
 void UDPInput::do_work()
 {

-       while (!should_stop) {
+       while (!should_stop()) {

                if (sock == -1) {
                        int port_num = atoi(port.c_str());
                        sock = create_server_socket(port_num, UDP_SOCKET);
                if (sock == -1) {
                        int port_num = atoi(port.c_str());
                        sock = create_server_socket(port_num, UDP_SOCKET);


@@ -94,21 +88,12 @@ void UDPInput::do_work()
                        }
                }
 
                        }
                }
 

-               // Since we are non-blocking, we need to wait for the right state first.
-               // Wait up to 50 ms, then check should_stop.
-               pollfd pfd;
-               pfd.fd = sock;
-               pfd.events = POLLIN;
-
-               int nfds = poll(&pfd, 1, 50);
-               if (nfds == 0 || (nfds == -1 && errno == EINTR)) {
+               // Wait for a packet, or a wakeup.
+               bool activity = wait_for_activity(sock, POLLIN, NULL);
+               if (!activity) {
+                       // Most likely, should_stop was set.

                        continue;
                }
                        continue;
                }

-               if (nfds == -1) {
-                       log_perror("poll");
-                       close_socket();
-                       continue;       
-               }

 
                char buf[4096];
                int ret;
 
                char buf[4096];
                int ret;


@@ -122,8 +107,8 @@ void UDPInput::do_work()
                        continue;
                }
                
                        continue;
                }
                

-               for (size_t i = 0; i < stream_ids.size(); ++i) {
-                       servers->add_data(stream_ids[i], buf, ret);
+               for (size_t i = 0; i < stream_indices.size(); ++i) {
+                       servers->add_data(stream_indices[i], buf, ret);

                }
        }
 }
                }
        }
 }