Remove some leftover code.

[cubemap] / cubemap.cpp

diff --git a/cubemap.cpp b/cubemap.cpp
index b00ca64df2999057c6c1c535dee05c507790b5c8..9b98ebab999fe6e0818528305df992c92b378f7e 100644 (file)
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -15,6 +15,7 @@
 #include <vector>
 #include <string>
 #include <map>
 #include <vector>
 #include <string>
 #include <map>

+#include <set>

 
 #include "metacube.h"
 #include "parse.h"
 
 #include "metacube.h"
 #include "parse.h"


@@ -78,7 +79,6 @@ int create_server_socket(int port)
 void *acceptor_thread_run(void *arg)
 {
        int server_sock = int(intptr_t(arg));
 void *acceptor_thread_run(void *arg)
 {
        int server_sock = int(intptr_t(arg));

-       int num_accepted = 0;

        for ( ;; ) {
                sockaddr_in6 addr;
                socklen_t addrlen = sizeof(addr);
        for ( ;; ) {
                sockaddr_in6 addr;
                socklen_t addrlen = sizeof(addr);


@@ -102,7 +102,6 @@ void *acceptor_thread_run(void *arg)
 
                // Pick a server, round-robin, and hand over the socket to it.
                servers->add_client(sock);
 
                // Pick a server, round-robin, and hand over the socket to it.
                servers->add_client(sock);

-               ++num_accepted; 

        }
 }
 
        }
 }
 


@@ -185,15 +184,16 @@ int main(int argc, char **argv)
        servers = new ServerPool(num_servers);
 
        int server_sock = -1, old_port = -1;
        servers = new ServerPool(num_servers);
 
        int server_sock = -1, old_port = -1;

+       set<string> deserialized_stream_ids;

        if (argc == 4 && strcmp(argv[2], "-state") == 0) {
                fprintf(stderr, "Deserializing state from previous process... ");
                int state_fd = atoi(argv[3]);
                CubemapStateProto loaded_state = read_tempfile(state_fd);
 
                // Deserialize the streams.
        if (argc == 4 && strcmp(argv[2], "-state") == 0) {
                fprintf(stderr, "Deserializing state from previous process... ");
                int state_fd = atoi(argv[3]);
                CubemapStateProto loaded_state = read_tempfile(state_fd);
 
                // Deserialize the streams.

-               // TODO: Pick up new streams from the configuration file.

                for (int i = 0; i < loaded_state.streams_size(); ++i) {
                        servers->add_stream_from_serialized(loaded_state.streams(i));
                for (int i = 0; i < loaded_state.streams_size(); ++i) {
                        servers->add_stream_from_serialized(loaded_state.streams(i));

+                       deserialized_stream_ids.insert(loaded_state.streams(i).stream_id());

                }
 
                // Put back the existing clients. It doesn't matter which server we
                }
 
                // Put back the existing clients. It doesn't matter which server we


@@ -207,19 +207,33 @@ int main(int argc, char **argv)
                old_port = loaded_state.port();
 
                fprintf(stderr, "done.\n");
                old_port = loaded_state.port();
 
                fprintf(stderr, "done.\n");

-       } else {
-               // Find all streams in the configuration file, and create them.
-               for (unsigned i = 0; i < config.size(); ++i) {
-                       if (config[i].keyword != "stream") {
-                               continue;
-                       }
-                       if (config[i].arguments.size() != 1) {
-                               fprintf(stderr, "ERROR: 'stream' takes exactly one argument\n");
-                               exit(1);
-                       }
-                       string stream_id = config[i].arguments[0];
+       }
+
+       // Find all streams in the configuration file, and create them.
+       set<string> expecting_stream_ids = deserialized_stream_ids;
+       for (unsigned i = 0; i < config.size(); ++i) {
+               if (config[i].keyword != "stream") {
+                       continue;
+               }
+               if (config[i].arguments.size() != 1) {
+                       fprintf(stderr, "ERROR: 'stream' takes exactly one argument\n");
+                       exit(1);
+               }
+               string stream_id = config[i].arguments[0];
+               if (deserialized_stream_ids.count(stream_id) == 0) {

                        servers->add_stream(stream_id);
                }
                        servers->add_stream(stream_id);
                }

+               expecting_stream_ids.erase(stream_id);
+       }
+
+       // Warn about any servers we've lost.
+       // TODO: Make an option (delete=yes?) to actually shut down streams.
+       for (set<string>::const_iterator stream_it = expecting_stream_ids.begin();
+            stream_it != expecting_stream_ids.end();
+            ++stream_it) {
+               fprintf(stderr, "WARNING: stream '%s' disappeared from the configuration file.\n",
+                       stream_it->c_str());
+               fprintf(stderr, "         It will not be deleted, but clients will not get any new inputs.\n");

        }
 
        // Open a new server socket if we do not already have one, or if we changed ports.
        }
 
        // Open a new server socket if we do not already have one, or if we changed ports.