Merge lp:~thomas-voss/biometryd/robustify-comms into lp:biometryd

[Thomas Voß]

Robustify comms with the service side of things.
Adjust cmds::Test to account for async operations.

Robustify comms with the service side of things.
Adjust cmds::Test to account for async operations.

[Simon Fels (morphis)]

LGTM

review: Approve

[lp:~thomas-voss/biometryd/robustify-comms]

27. By Thomas Voß on 2016-06-14

Merge trunk and apply comm fixes to newly added methods.

=== modified file 'src/biometry/cmds/test.cpp'
--- src/biometry/cmds/test.cpp	2016-06-06 08:22:20 +0000
+++ src/biometry/cmds/test.cpp	2016-06-14 21:33:22 +0000
@@ -36,11 +36,62 @@
 #include <biometry/util/streaming_configuration_builder.h>
 
 #include <iomanip>
+#include <future>
+#include <stdexcept>
 
 namespace cli = biometry::util::cli;
 
 namespace
 {
+template<typename T>
+class SyncingObserver : public biometry::Operation<T>::Observer
+{
+public:
+    typedef typename biometry::Operation<T>::Observer Super;
+
+    SyncingObserver(std::ostream& out, const std::string& name, std::uint32_t width = 80)
+        : pb{out, name, width},
+          future{promise.get_future()}
+    {
+    }
+
+    typename Super::Result sync()
+    {
+        return future.get();
+    }
+
+    // From biometry::Operation<T>::Observer
+    void on_started() override
+    {
+        pb.update(0);
+    }
+
+    void on_progress(const typename Super::Progress& progress) override
+    {
+        pb.update(*progress.percent);
+    }
+
+    void on_canceled(const typename Super::Reason& reason) override
+    {
+        promise.set_exception(std::make_exception_ptr(std::runtime_error{reason}));
+    }
+
+    void on_failed(const typename Super::Error& error) override
+    {
+        promise.set_exception(std::make_exception_ptr(std::runtime_error{error}));
+    }
+
+    void on_succeeded(const typename Super::Result& result) override
+    {
+        promise.set_value(result);
+    }
+
+private:
+    biometry::util::cli::ProgressBar pb;
+    std::promise<typename Super::Result> promise;
+    std::future<typename Super::Result> future{promise.get_future()};
+};
+
 std::shared_ptr<biometry::Device> device_from_config_file(const boost::filesystem::path& file)
 {
     using StreamingJsonConfigurationBuilder = biometry::util::StreamingConfigurationBuilder<biometry::util::JsonConfigurationBuilder>;
@@ -107,25 +158,33 @@
     static std::ofstream dev_null{"/dev/null"};
 
     ctxt.cout << std::endl;
-    ctxt.cout << "Clearing template store:" << std::endl;
-    device->template_store().clear(biometry::Application::system(), user)->start_with_observer(
-        std::make_shared<biometry::TracingObserver<biometry::TemplateStore::Clearance>>(2, ctxt.cout));
-
-    ctxt.cout << "Enrolling template:" << std::endl;
-    device->template_store().enroll(biometry::Application::system(), user)->start_with_observer(
-        std::make_shared<biometry::TracingObserver<biometry::TemplateStore::Enrollment>>(2, ctxt.cout));
-
-    ctxt.cout << "Querying template count:" << std::endl;
-    device->template_store().size(biometry::Application::system(), user)->start_with_observer(
-        std::make_shared<biometry::TracingObserver<biometry::TemplateStore::SizeQuery>>(2, ctxt.cout));
-
-    biometry::util::cli::ProgressBar pb{ctxt.cout, "Identifying user: ", 17};
+    {
+        auto observer = std::make_shared<SyncingObserver<biometry::TemplateStore::Clearance>>(ctxt.cout, "Clearing template store: ", 17);
+        device->template_store().clear(biometry::Application::system(), user)->start_with_observer(observer);
+        try { observer->sync(); } catch(...) { ctxt.cout << "  Failed to clear template store, proceeding though..." << std::endl; };
+    }
+
+    {
+        auto observer = std::make_shared<SyncingObserver<biometry::TemplateStore::Enrollment>>(ctxt.cout, "Enrolling new template:  ", 17);
+        device->template_store().enroll(biometry::Application::system(), user)->start_with_observer(observer);
+        try { observer->sync(); } catch(...) { ctxt.cout << "  Failed to enroll template, aborting ..." << std::endl; return EXIT_FAILURE; };
+    }
+
+    {
+        auto observer = std::make_shared<SyncingObserver<biometry::TemplateStore::SizeQuery>>(ctxt.cout, "Querying template count: ", 17);
+        device->template_store().size(biometry::Application::system(), user)->start_with_observer(observer);
+        try { observer->sync(); } catch(...) { ctxt.cout << "  Failed to query template count, aborting ..." << std::endl; return EXIT_FAILURE; };
+    }
+
+    biometry::util::cli::ProgressBar pb{ctxt.cout, "Identifying user:        ", 17};
 
     auto stats = biometry::util::Benchmark{[device, &ctxt]()
     {
+        auto observer = std::make_shared<SyncingObserver<biometry::Identification>>(dev_null, "  Trial: ");
         device->identifier().identify_user(biometry::Application::system(), biometry::Reason{"testing"})
-            ->start_with_observer(
-                std::make_shared<biometry::TracingObserver<biometry::Identification>>(4, dev_null));
+            ->start_with_observer(observer);
+        try { observer->sync(); } catch(...) { ctxt.cout << "  Failed to identify user." << std::endl; };
+
     }}.trials(25).on_progress([&pb](std::size_t current, std::size_t total) { pb.update(current/static_cast<double>(total)); }).run();
 
     ctxt.cout << std::endl
 
=== modified file 'src/biometry/dbus/service.cpp'
--- src/biometry/dbus/service.cpp	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/service.cpp	2016-06-14 21:33:22 +0000
@@ -20,13 +20,31 @@
 #include <biometry/dbus/service.h>
 #include <biometry/dbus/stub/service.h>
 
+#include <biometry/runtime.h>
+
 #include <core/dbus/bus.h>
 #include <core/dbus/asio/executor.h>
 
+namespace
+{
+std::shared_ptr<biometry::Runtime> runtime()
+{
+    static auto rt = biometry::Runtime::create();
+    return rt;
+}
+
+core::dbus::Bus::Ptr bus()
+{
+    auto bus = std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::system);
+    bus->install_executor(core::dbus::asio::make_executor(bus, runtime()->service()));
+
+    runtime()->start();
+
+    return bus;
+}
+}
+
 std::shared_ptr<biometry::Service> biometry::dbus::Service::create_stub()
-{
-    auto bus = std::make_shared<core::dbus::Bus>(core::dbus::WellKnownBus::system);
-    bus->install_executor(core::dbus::asio::make_executor(bus));
-
-    return biometry::dbus::stub::Service::create_for_bus(bus);
+{    
+    return biometry::dbus::stub::Service::create_for_bus(bus());
 }
 
=== modified file 'src/biometry/dbus/stub/device.cpp'
--- src/biometry/dbus/stub/device.cpp	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/stub/device.cpp	2016-06-14 21:33:22 +0000
@@ -36,7 +36,7 @@
 {
     return *template_store_([this]()
     {
-        auto result = object_->transact_method<
+        auto result = object_->invoke_method_synchronously<
                 biometry::dbus::interface::Device::Methods::TemplateStore,
                 biometry::dbus::interface::Device::Methods::TemplateStore::ResultType
         >();
@@ -49,7 +49,7 @@
 {
     return *identifier_([this]()
     {
-        auto result = object_->transact_method<
+        auto result = object_->invoke_method_synchronously<
                 biometry::dbus::interface::Device::Methods::Identifier,
                 biometry::dbus::interface::Device::Methods::Identifier::ResultType
         >();
 
=== modified file 'src/biometry/dbus/stub/identifier.cpp'
--- src/biometry/dbus/stub/identifier.cpp	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/stub/identifier.cpp	2016-06-14 21:33:22 +0000
@@ -33,7 +33,7 @@
 
 biometry::Operation<biometry::Identification>::Ptr biometry::dbus::stub::Identifier::identify_user(const Application& app, const Reason& reason)
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::Identifier::Methods::IdentifyUser,
             biometry::dbus::interface::Identifier::Methods::IdentifyUser::ResultType
     >(app, reason);
 
=== modified file 'src/biometry/dbus/stub/operation.h'
--- src/biometry/dbus/stub/operation.h	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/stub/operation.h	2016-06-14 21:33:22 +0000
@@ -99,7 +99,7 @@
 
     auto obs = biometry::dbus::skeleton::Observer<T>::create_for_object(bus, service->add_object_for_path(path), observer);
 
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::Operation::Methods::StartWithObserver,
             biometry::dbus::interface::Operation::Methods::StartWithObserver::ResultType
     >(path);
@@ -113,7 +113,7 @@
 template<typename T>
 void biometry::dbus::stub::Operation<T>::cancel()
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::Operation::Methods::Cancel,
             biometry::dbus::interface::Operation::Methods::Cancel::ResultType
     >();
 
=== modified file 'src/biometry/dbus/stub/service.cpp'
--- src/biometry/dbus/stub/service.cpp	2016-05-02 06:16:01 +0000
+++ src/biometry/dbus/stub/service.cpp	2016-06-14 21:33:22 +0000
@@ -32,7 +32,7 @@
 // From biometry::Service.
 std::shared_ptr<biometry::Device> biometry::dbus::stub::Service::default_device() const
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::Service::Methods::DefaultDevice,
             biometry::dbus::interface::Service::Methods::DefaultDevice::ResultType
     >();
 
=== modified file 'src/biometry/dbus/stub/template_store.cpp'
--- src/biometry/dbus/stub/template_store.cpp	2016-06-14 20:20:10 +0000
+++ src/biometry/dbus/stub/template_store.cpp	2016-06-14 21:33:22 +0000
@@ -36,7 +36,7 @@
 
 biometry::Operation<biometry::TemplateStore::SizeQuery>::Ptr biometry::dbus::stub::TemplateStore::size(const biometry::Application& app, const biometry::User& user)
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::TemplateStore::Methods::Size,
             biometry::dbus::interface::TemplateStore::Methods::Size::ResultType
     >(app, user);
@@ -46,7 +46,7 @@
 
 biometry::Operation<biometry::TemplateStore::List>::Ptr biometry::dbus::stub::TemplateStore::list(const biometry::Application& app, const biometry::User& user)
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::TemplateStore::Methods::List,
             biometry::dbus::interface::TemplateStore::Methods::List::ResultType
     >(app, user);
@@ -56,7 +56,7 @@
 
 biometry::Operation<biometry::TemplateStore::Enrollment>::Ptr biometry::dbus::stub::TemplateStore::enroll(const biometry::Application& app, const biometry::User& user)
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::TemplateStore::Methods::Enroll,
             biometry::dbus::interface::TemplateStore::Methods::Enroll::ResultType
     >(app, user);
@@ -66,7 +66,7 @@
 
 biometry::Operation<biometry::TemplateStore::Removal>::Ptr biometry::dbus::stub::TemplateStore::remove(const biometry::Application& app, const biometry::User& user, biometry::TemplateStore::TemplateId id)
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::TemplateStore::Methods::Remove,
             biometry::dbus::interface::TemplateStore::Methods::Remove::ResultType
     >(app, user, id);
@@ -76,7 +76,7 @@
 
 biometry::Operation<biometry::TemplateStore::Clearance>::Ptr biometry::dbus::stub::TemplateStore::clear(const biometry::Application& app, const biometry::User& user)
 {
-    auto result = object->transact_method<
+    auto result = object->invoke_method_synchronously<
             biometry::dbus::interface::TemplateStore::Methods::Clear,
             biometry::dbus::interface::TemplateStore::Methods::Clear::ResultType
     >(app, user);