Support parsing streams from config file. Also support multiple streams (includes...

[cubemap] / cubemap.cpp

diff --git a/cubemap.cpp b/cubemap.cpp
index ad218db29bcfb8985a5d70160886a6f9439f7c24..b00ca64df2999057c6c1c535dee05c507790b5c8 100644 (file)
--- a/cubemap.cpp
+++ b/cubemap.cpp
@@ -17,6 +17,7 @@
 #include <map>
 
 #include "metacube.h"
 #include <map>
 
 #include "metacube.h"

+#include "parse.h"

 #include "server.h"
 #include "serverpool.h"
 #include "input.h"
 #include "server.h"
 #include "serverpool.h"
 #include "input.h"


@@ -171,120 +172,6 @@ CubemapStateProto read_tempfile(int state_fd)
        return state;
 }
 
        return state;
 }
 

-// Split a line on whitespace, e.g. "foo  bar baz" -> {"foo", "bar", "baz"}.
-vector<string> split_tokens(const string &line)
-{
-       vector<string> ret;
-       string current_token;
-
-       for (size_t i = 0; i < line.size(); ++i) {
-               if (isspace(line[i])) {
-                       if (!current_token.empty()) {
-                               ret.push_back(current_token);
-                       }
-                       current_token.clear();
-               } else {
-                       current_token.push_back(line[i]);
-               }
-       }
-       if (!current_token.empty()) {
-               ret.push_back(current_token);
-       }
-       return ret;
-}
-
-struct ConfigLine {
-       string keyword;
-       vector<string> arguments;
-       map<string, string> parameters;
-};
-
-// Parse the configuration file.
-vector<ConfigLine> parse_config(const string &filename)
-{
-       vector<ConfigLine> ret;
-
-       FILE *fp = fopen(filename.c_str(), "r");
-       if (fp == NULL) {
-               perror(filename.c_str());
-               exit(1);
-       }
-
-       char buf[4096];
-       while (!feof(fp)) {
-               if (fgets(buf, sizeof(buf), fp) == NULL) {
-                       break;
-               }
-
-               // Chop off the string at the first #, \r or \n.
-               buf[strcspn(buf, "#\r\n")] = 0;
-
-               // Remove all whitespace from the end of the string.
-               size_t len = strlen(buf);
-               while (len > 0 && isspace(buf[len - 1])) {
-                       buf[--len] = 0;
-               }
-
-               // If the line is now all blank, ignore it.
-               if (len == 0) {
-                       continue;
-               }
-
-               vector<string> tokens = split_tokens(buf);
-               assert(!tokens.empty());
-               
-               ConfigLine line;
-               line.keyword = tokens[0];
-
-               for (size_t i = 1; i < tokens.size(); ++i) {
-                       // foo=bar is a parameter; anything else is an argument.
-                       size_t equals_pos = tokens[i].find_first_of('=');
-                       if (equals_pos == string::npos) {
-                               line.arguments.push_back(tokens[i]);
-                       } else {
-                               string key = tokens[i].substr(0, equals_pos);
-                               string value = tokens[i].substr(equals_pos + 1, string::npos);
-                               line.parameters.insert(make_pair(key, value));
-                       }
-               }
-
-               ret.push_back(line);
-       }
-
-       fclose(fp);
-       return ret;
-}
-
-// Note: Limits are inclusive.
-int fetch_config_int(const vector<ConfigLine> &config, const string &keyword, int min_limit, int max_limit)
-{
-       bool value_found = false;
-       int value = -1;
-       for (unsigned i = 0; i < config.size(); ++i) {
-               if (config[i].keyword != keyword) {
-                       continue;
-               }
-               if (config[i].parameters.size() > 0 ||
-                   config[i].arguments.size() != 1) {
-                       fprintf(stderr, "ERROR: '%s' takes one argument and no parameters\n", keyword.c_str());
-                       exit(1);
-               }
-               value_found = true;
-               value = atoi(config[i].arguments[0].c_str());  // TODO: verify int validity.
-       }
-       if (!value_found) {
-               fprintf(stderr, "ERROR: Missing '%s' statement in config file.\n",
-                       keyword.c_str());
-               exit(1);
-       }
-       if (value < min_limit || value > max_limit) {
-               fprintf(stderr, "ERROR: '%s' is set to %d, must be in [%d,%d]\n",
-                       keyword.c_str(), value, min_limit, max_limit);
-               exit(1);
-       }
-       return value;
-}
-

 int main(int argc, char **argv)
 {
        fprintf(stderr, "\nCubemap starting.\n");
 int main(int argc, char **argv)
 {
        fprintf(stderr, "\nCubemap starting.\n");


@@ -304,6 +191,7 @@ int main(int argc, char **argv)
                CubemapStateProto loaded_state = read_tempfile(state_fd);
 
                // Deserialize the streams.
                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));
                }


@@ -319,9 +207,19 @@ 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{
-               // TODO: This should come from the config file.
-               servers->add_stream(STREAM_ID);
+       } 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];
+                       servers->add_stream(stream_id);
+               }

        }
 
        // 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.


@@ -339,9 +237,26 @@ int main(int argc, char **argv)
        pthread_t acceptor_thread;
        pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
 
        pthread_t acceptor_thread;
        pthread_create(&acceptor_thread, NULL, acceptor_thread_run, reinterpret_cast<void *>(server_sock));
 

-       // TODO: This should come from the config file.
-       Input input(STREAM_ID, STREAM_URL);
-       input.run();
+       // Find all streams in the configuration file, and create inputs for them.
+       vector<Input *> inputs;
+       for (unsigned i = 0; i < config.size(); ++i) {
+               if (config[i].keyword != "stream") {
+                       continue;
+               }
+               assert(config[i].arguments.size() == 1);
+               string stream_id = config[i].arguments[0];
+
+               if (config[i].parameters.count("src") == 0) {
+                       fprintf(stderr, "WARNING: stream '%s' has no src= attribute, clients will not get any data.\n",
+                               stream_id.c_str());
+                       continue;
+               }
+
+               string src = config[i].parameters["src"];
+               Input *input = new Input(stream_id, src);
+               input->run();
+               inputs.push_back(input);
+       }

 
        signal(SIGHUP, hup);
 
 
        signal(SIGHUP, hup);
 


@@ -349,7 +264,11 @@ int main(int argc, char **argv)
                usleep(100000);
        }
 
                usleep(100000);
        }
 

-       input.stop();
+       // OK, we've been HUPed. Time to shut down everything, serialize, and re-exec.
+       for (size_t i = 0; i < inputs.size(); ++i) {
+               inputs[i]->stop();
+               delete inputs[i];  // TODO: serialize instead of using libcurl.
+       }

 
        CubemapStateProto state;
        state.set_server_sock(server_sock);
 
        CubemapStateProto state;
        state.set_server_sock(server_sock);