From 0b655ea6a1b3a68963f88d747ec18da4387442c0 Mon Sep 17 00:00:00 2001
From: Emil Tin <emil@tin.dk>
Date: Sat, 22 Mar 2014 00:06:35 +0100
Subject: [PATCH] trial option

---
 Util/ProgramOptions.h            |  8 +++-
 features/options/options.feature |  1 +
 routed.cpp                       | 72 +++++++++++++++++---------------
 3 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h
index 71435d230..e68b5e069 100644
--- a/Util/ProgramOptions.h
+++ b/Util/ProgramOptions.h
@@ -66,7 +66,8 @@ inline bool GenerateServerProgramOptions(
     std::string & ip_address,
     int & ip_port,
     int & requested_num_threads,
-    bool & use_shared_memory
+    bool & use_shared_memory,
+    bool & trial
 ) {
 
     // declare a group of options that will be allowed only on command line
@@ -80,6 +81,11 @@ inline bool GenerateServerProgramOptions(
                 &paths["config"]
             )->default_value("server.ini"),
             "Path to a configuration file"
+        )
+        (
+            "trial",
+            boost::program_options::value<bool>(&trial)->implicit_value(true),
+            "Quit after initialization"
         );
 
     // declare a group of options that will be allowed both on command line
diff --git a/features/options/options.feature b/features/options/options.feature
index a04b9c506..01b31bc9f 100644
--- a/features/options/options.feature
+++ b/features/options/options.feature
@@ -21,6 +21,7 @@ Feature: Command line options
         And stdout should contain "--version"
         And stdout should contain "--help"
         And stdout should contain "--config"
+        And stdout should contain "--trial"
         And stdout should contain "Configuration:"
         And stdout should contain "--hsgrdata arg"
         And stdout should contain "--nodesdata arg"
diff --git a/routed.cpp b/routed.cpp
index f192af449..a707d4e9c 100644
--- a/routed.cpp
+++ b/routed.cpp
@@ -76,20 +76,20 @@ int main (int argc, const char * argv[])
         bool use_shared_memory = false;
         std::string ip_address;
         int ip_port, requested_thread_num;
+        bool trial = false;
 
         ServerPaths server_paths;
-        if  (!GenerateServerProgramOptions
-                (
-                    argc,
-                    argv,
-                    server_paths,
-                    ip_address,
-                    ip_port,
-                    requested_thread_num,
-                    use_shared_memory
-                )
-            )
-        {
+        if( !GenerateServerProgramOptions(
+                argc,
+                argv,
+                server_paths,
+                ip_address,
+                ip_port,
+                requested_thread_num,
+                use_shared_memory,
+                trial
+             )
+        ) {
             return 0;
         }
 
@@ -149,33 +149,37 @@ int main (int argc, const char * argv[])
 
         routing_server->GetRequestHandlerPtr().RegisterRoutingMachine(&osrm_lib);
 
-        boost::thread server_thread(boost::bind(&Server::Run, routing_server));
+        if( trial ) {
+            std::cout << "[server] trial run, quitting after successful initialization" << std::endl;
+        } else {
+            boost::thread server_thread(boost::bind(&Server::Run, routing_server));
 
 #ifndef _WIN32
-        sigset_t wait_mask;
-        pthread_sigmask(SIG_SETMASK, &old_mask, 0);
-        sigemptyset(&wait_mask);
-        sigaddset(&wait_mask, SIGINT);
-        sigaddset(&wait_mask, SIGQUIT);
-        sigaddset(&wait_mask, SIGTERM);
-        pthread_sigmask(SIG_BLOCK, &wait_mask, 0);
-        std::cout << "[server] running and waiting for requests" << std::endl;
-        sigwait(&wait_mask, &sig);
+            sigset_t wait_mask;
+            pthread_sigmask(SIG_SETMASK, &old_mask, 0);
+            sigemptyset(&wait_mask);
+            sigaddset(&wait_mask, SIGINT);
+            sigaddset(&wait_mask, SIGQUIT);
+            sigaddset(&wait_mask, SIGTERM);
+            pthread_sigmask(SIG_BLOCK, &wait_mask, 0);
+            std::cout << "[server] running and waiting for requests" << std::endl;
+            sigwait(&wait_mask, &sig);
 #else
-        // Set console control handler to allow server to be stopped.
-        console_ctrl_function = boost::bind(&Server::Stop, routing_server);
-        SetConsoleCtrlHandler(console_ctrl_handler, TRUE);
-        std::cout << "[server] running and waiting for requests" << std::endl;
-        routing_server->Run();
+            // Set console control handler to allow server to be stopped.
+            console_ctrl_function = boost::bind(&Server::Stop, routing_server);
+            SetConsoleCtrlHandler(console_ctrl_handler, TRUE);
+            std::cout << "[server] running and waiting for requests" << std::endl;
+            routing_server->Run();
 #endif
-        std::cout << "[server] initiating shutdown" << std::endl;
-        routing_server->Stop();
-        std::cout << "[server] stopping threads" << std::endl;
+            std::cout << "[server] initiating shutdown" << std::endl;
+            routing_server->Stop();
+            std::cout << "[server] stopping threads" << std::endl;
 
-        if (!server_thread.timed_join(boost::posix_time::seconds(2)))
-        {
-       	    SimpleLogger().Write(logDEBUG) <<
-                "Threads did not finish within 2 seconds. Hard abort!";
+            if (!server_thread.timed_join(boost::posix_time::seconds(2)))
+            {
+                SimpleLogger().Write(logDEBUG) <<
+                    "Threads did not finish within 2 seconds. Hard abort!";
+            }
         }
 
         std::cout << "[server] freeing objects" << std::endl;