Merge lp:~thomas-voss/trust-store/fix-1356468 into lp:trust-store

[Thomas Voß]

Define an explicit ctor to avoid any sort of potential races.

Define an explicit ctor to avoid any sort of potential races.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/trust-store-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/62
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/62/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/62/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

41. By Thomas Voß on 2014-09-12

Define an explicit ctor to avoid any sort of potential races.

=== modified file 'src/core/trust/daemon.cpp'
--- src/core/trust/daemon.cpp	2014-08-26 14:50:22 +0000
+++ src/core/trust/daemon.cpp	2014-09-12 07:57:53 +0000
@@ -48,8 +48,7 @@
 {
     struct Runtime
     {
-        // Do not execute in parallel, serialize
-        // accesses.
+        // We allow for parallel execution
         static constexpr std::size_t concurrency_hint{2};
 
         // Our evil singleton pattern. Not bad though, we control the
@@ -61,6 +60,34 @@
             return runtime;
         }
 
+        Runtime()
+            : signal_trap
+              {
+                  core::posix::trap_signals_for_all_subsequent_threads(
+                  {
+                      core::posix::Signal::sig_term,
+                      core::posix::Signal::sig_int
+                  })
+              },
+              io_service
+              {
+                  concurrency_hint
+              },
+              keep_alive
+              {
+                  io_service
+              },
+              worker1
+              {
+                  [this]() { io_service.run(); }
+              },
+              worker2
+              {
+                  [this]() { io_service.run(); }
+              }
+        {
+        }
+
         ~Runtime()
         {
             io_service.stop();
@@ -73,38 +100,15 @@
         }
 
         // We trap sig term to ensure a clean shutdown.
-        std::shared_ptr<core::posix::SignalTrap> signal_trap
-        {
-            core::posix::trap_signals_for_all_subsequent_threads(
-            {
-                core::posix::Signal::sig_term,
-                core::posix::Signal::sig_int
-            })
-        };
-
+        std::shared_ptr<core::posix::SignalTrap> signal_trap;
         // Our io_service instance exposed to remote agents.
-        boost::asio::io_service io_service
-        {
-            concurrency_hint
-        };
-
+        boost::asio::io_service io_service;
         // We keep the io_service alive and introduce some artificial
         // work.
-        boost::asio::io_service::work keep_alive
-        {
-            io_service
-        };
-
-        // We immediate execute the io_service instance
-        std::thread worker1
-        {
-            std::thread{[this]() { io_service.run(); }}
-        };
-
-        std::thread worker2
-        {
-            std::thread{[this]() { io_service.run(); }}
-        };
+        boost::asio::io_service::work keep_alive;
+        // We provider two workers to the io_service instance.
+        std::thread worker1;
+        std::thread worker2;
     };
 
     core::trust::Daemon::Dictionary fill_dictionary_from_unrecognized_options(const Options::parsed_options& parsed_options)