Re-run include-what-you-use.

[cubemap] / udpinput.cpp

diff --git a/udpinput.cpp b/udpinput.cpp
index 8659141b2ed0e11d8be8e93ae1d0b74c3867da86..f4c78fec4a7c8ddbf3f03e6304c5626b396c686e 100644 (file)
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -1,17 +1,21 @@
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
-#include <stdio.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <sys/socket.h>
+#include <time.h>
 #include <unistd.h>
 #include <string>
 
 #include "acceptor.h"
 #include "log.h"
+#include "mutexlock.h"
 #include "serverpool.h"
 #include "state.pb.h"
+#include "stream.h"
 #include "udpinput.h"
+#include "util.h"
 #include "version.h"
 
 using namespace std;
@@ -28,6 +32,12 @@ UDPInput::UDPInput(const string &url)
        assert(ok);
 
        construct_header();
+
+       pthread_mutex_init(&stats_mutex, NULL);
+       stats.url = url;
+       stats.bytes_received = 0;
+       stats.data_bytes_received = 0;
+       stats.connect_time = time(NULL);
 }
 
 UDPInput::UDPInput(const InputProto &serialized)
@@ -40,6 +50,16 @@ UDPInput::UDPInput(const InputProto &serialized)
        assert(ok);
 
        construct_header();
+
+       pthread_mutex_init(&stats_mutex, NULL);
+       stats.url = url;
+       stats.bytes_received = serialized.bytes_received();
+       stats.data_bytes_received = serialized.data_bytes_received();
+       if (serialized.has_connect_time()) {
+               stats.connect_time = serialized.connect_time();
+       } else {
+               stats.connect_time = time(NULL);
+       }
 }
 
 InputProto UDPInput::serialize() const
@@ -47,20 +67,15 @@ InputProto UDPInput::serialize() const
        InputProto serialized;
        serialized.set_url(url);
        serialized.set_sock(sock);
+       serialized.set_bytes_received(stats.bytes_received);
+       serialized.set_data_bytes_received(stats.data_bytes_received);
+       serialized.set_connect_time(stats.connect_time);
        return serialized;
 }
 
 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;
 }
        
@@ -70,18 +85,19 @@ void UDPInput::construct_header()
                "HTTP/1.0 200 OK\r\n"
                "Content-type: application/octet-stream\r\n"
                "Cache-control: no-cache\r\n"
-               "Server: " SERVER_IDENTIFICATION "\r\n";
+               "Server: " SERVER_IDENTIFICATION "\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()
 {
-       while (!should_stop) {
+       while (!should_stop()) {
                if (sock == -1) {
                        int port_num = atoi(port.c_str());
                        sock = create_server_socket(port_num, UDP_SOCKET);
@@ -93,26 +109,16 @@ 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;
                }
-               if (nfds == -1) {
-                       log_perror("poll");
-                       close_socket();
-                       continue;       
-               }
 
-               char buf[4096];
                int ret;
                do {
-                       ret = recv(sock, buf, sizeof(buf), 0);
+                       ret = recv(sock, packet_buf, sizeof(packet_buf), 0);
                } while (ret == -1 && errno == EINTR);
 
                if (ret <= 0) {
@@ -120,9 +126,21 @@ void UDPInput::do_work()
                        close_socket();
                        continue;
                }
+
+               {
+                       MutexLock lock(&stats_mutex);
+                       stats.bytes_received += ret;
+                       stats.data_bytes_received += ret;
+               }
                
-               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], packet_buf, ret, SUITABLE_FOR_STREAM_START);
                }
        }
 }
+
+InputStats UDPInput::get_stats() const
+{
+       MutexLock lock(&stats_mutex);
+       return stats;
+}