Fix a spurious warning.

[cubemap] / main.cpp

diff --git a/main.cpp b/main.cpp
index afc3edfc802170b111777f34901ce957d6efa4df..6c8051a351c471fac56d1e46cc695387ed8c382b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <assert.h>
 #include <getopt.h>
 #include <arpa/inet.h>
@@ -30,6 +31,7 @@
 #include "serverpool.h"
 #include "input.h"
 #include "stats.h"
+#include "util.h"
 #include "version.h"
 #include "state.pb.h"
 
@@ -43,36 +45,6 @@ void hup(int ignored)
        hupped = true;
 }
 
-// Serialize the given state to a file descriptor, and return the (still open)
-// descriptor.
-int make_tempfile(const CubemapStateProto &state)
-{
-       char tmpl[] = "/tmp/cubemapstate.XXXXXX";
-       int state_fd = mkstemp(tmpl);
-       if (state_fd == -1) {
-               perror("mkstemp");
-               exit(1);
-       }
-
-       string serialized;
-       state.SerializeToString(&serialized);
-
-       const char *ptr = serialized.data();
-       size_t to_write = serialized.size();
-       while (to_write > 0) {
-               ssize_t ret = write(state_fd, ptr, to_write);
-               if (ret == -1) {
-                       perror("write");
-                       exit(1);
-               }
-
-               ptr += ret;
-               to_write -= ret;
-       }
-
-       return state_fd;
-}
-
 CubemapStateProto collect_state(const timeval &serialize_start,
                                 const vector<Acceptor *> acceptors,
                                 const vector<Input *> inputs,
@@ -93,42 +65,6 @@ CubemapStateProto collect_state(const timeval &serialize_start,
        return state;
 }
 
-// Read the state back from the file descriptor made by make_tempfile,
-// and close it.
-CubemapStateProto read_tempfile(int state_fd)
-{
-       if (lseek(state_fd, 0, SEEK_SET) == -1) {
-               perror("lseek");
-               exit(1);
-       }
-
-       string serialized;
-       char buf[4096];
-       for ( ;; ) {
-               ssize_t ret = read(state_fd, buf, sizeof(buf));
-               if (ret == -1) {
-                       perror("read");
-                       exit(1);
-               }
-               if (ret == 0) {
-                       // EOF.
-                       break;
-               }
-
-               serialized.append(string(buf, buf + ret));
-       }
-
-       close(state_fd);  // Implicitly deletes the file.
-
-       CubemapStateProto state;
-       if (!state.ParseFromString(serialized)) {
-               fprintf(stderr, "PANIC: Failed deserialization of state.\n");
-               exit(1);
-       }
-
-       return state;
-}
-       
 // Find all port statements in the configuration file, and create acceptors for htem.
 vector<Acceptor *> create_acceptors(
        const Config &config,
@@ -335,7 +271,14 @@ start:
        map<int, Acceptor *> deserialized_acceptors;
        if (state_fd != -1) {
                fprintf(stderr, "Deserializing state from previous process... ");
-               loaded_state = read_tempfile(state_fd);
+               string serialized;
+               if (!read_tempfile(state_fd, &serialized)) {
+                       exit(1);
+               }
+               if (!loaded_state.ParseFromString(serialized)) {
+                       fprintf(stderr, "ERROR: Failed deserialization of state.\n");
+                       exit(1);
+               }
 
                serialize_start.tv_sec = loaded_state.serialize_start_sec();
                serialize_start.tv_usec = loaded_state.serialize_start_usec();
@@ -386,8 +329,6 @@ start:
        if (!config.stats_file.empty()) {
                stats_thread = new StatsThread(config.stats_file, config.stats_interval);
                stats_thread->run();
-       } else if (config.stats_interval != -1) {
-               fprintf(stderr, "WARNING: 'stats_interval' given, but no 'stats_file'. No statistics will be written.\n");
        }
 
        signal(SIGHUP, hup);
@@ -422,8 +363,14 @@ start:
        servers->stop();
 
        fprintf(stderr, "Serializing state and re-execing...\n");
-       state_fd = make_tempfile(collect_state(
-               serialize_start, acceptors, inputs, servers));
+       CubemapStateProto state = collect_state(
+                serialize_start, acceptors, inputs, servers);
+       string serialized;
+       state.SerializeToString(&serialized);
+       state_fd = make_tempfile(serialized);
+       if (state_fd == -1) {
+               exit(1);
+       }
        delete servers;
 
        if (!dry_run_config(argv[0], config_filename)) {