Merge lp:~cyphermox/mtp/dbus-cpp-except into lp:mtp

[Mathieu Trudel-Lapierre]

Watch for exceptions in the dbus thread; and stop mtp-server gracefully if there are any.

Watch for exceptions in the dbus thread; and stop mtp-server gracefully if there are any.

[lp:~cyphermox/mtp/dbus-cpp-except]

53. By Mathieu Trudel-Lapierre on 2014-10-29

Watch for exceptions in the dbus thread; and stop mtp-server gracefully if there are any.

[Manuel de la Peña (mandel)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/mtp-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/mtp-utopic-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-utopic-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mtp-ci/27/rebuild

review: Approve (continuous-integration)

[lp:~cyphermox/mtp/dbus-cpp-except]

54. By Mathieu Trudel-Lapierre on 2014-10-31

Simplify the main loop for the MtpServer object.

55. By Mathieu Trudel-Lapierre on 2014-10-31

Initialize mRunning to a sane value when we call run()

=== modified file 'include/MtpServer.h'
--- include/MtpServer.h	2013-11-27 17:21:38 +0000
+++ include/MtpServer.h	2014-10-31 15:57:06 +0000
@@ -39,6 +39,9 @@
 
     MtpDatabase*        mDatabase;
 
+    // keep state whether the server should be running
+    bool                mRunning;
+
     // appear as a PTP device
     bool                mPtp;
 
@@ -101,6 +104,7 @@
     void                removeStorage(MtpStorage* storage);
 
     void                run();
+    void                stop();
 
     void                sendObjectAdded(MtpObjectHandle handle);
     void                sendObjectRemoved(MtpObjectHandle handle);

=== modified file 'server/server.cpp'
--- server/server.cpp	2014-09-04 01:11:14 +0000
+++ server/server.cpp	2014-10-31 15:57:06 +0000
@@ -113,6 +113,8 @@
 
 private:
     struct passwd *userdata;
+    dbus::Bus::Ptr bus;
+    boost::thread dbus_thread;
 
     // Mtp stuff
     MtpServer* server;
@@ -238,6 +240,17 @@
         read_more_notify();
     }
 
+    void drive_bus()
+    {
+        try {
+            bus->run();
+        }
+        catch (...) {
+            PLOG(ERROR) << "There was an unexpected error in DBus; terminating.";
+            server->stop();
+        }
+    }
+
 public:
 
     MtpDaemon(int fd):
@@ -272,14 +285,12 @@
                 FileSystemConfig::directory_perm);
 
         // security / screen locking
-        auto bus = core::the_session_bus();
+        bus = core::the_session_bus();
         bus->install_executor(core::dbus::asio::make_executor(bus));
-        std::thread t {std::bind(&dbus::Bus::run, bus)};
+        dbus_thread = boost::thread(&MtpDaemon::drive_bus, this);
         auto greeter_service = dbus::Service::use_service(bus, "com.canonical.UnityGreeter");
         dbus::Object::Ptr greeter = greeter_service->object_for_path(dbus::types::ObjectPath("/"));
 
-        t.detach();
-
         is_active = greeter->get_property<core::UnityGreeter::Properties::IsActive>();
     }
 
@@ -339,6 +350,7 @@
         // Cleanup
         inotify_rm_watch(inotify_fd, watch_fd);
         io_svc.stop();
+        dbus_thread.detach();
         notifier_thread.detach();
         io_service_thread.join();
         close(inotify_fd);

=== modified file 'src/MtpServer.cpp'
--- src/MtpServer.cpp	2014-03-27 15:50:32 +0000
+++ src/MtpServer.cpp	2014-10-31 15:57:06 +0000
@@ -158,12 +158,17 @@
     return (getStorage(id) != NULL);
 }
 
+void MtpServer::stop() {
+    mRunning = false;
+}
+
 void MtpServer::run() {
     int fd = mFD;
 
     VLOG(1) << "MtpServer::run fd: " << fd;
 
-    while (1) {
+    mRunning = true;
+    while (mRunning) {
         int ret = mRequest.read(fd);
         if (ret < 0) {
             PLOG(ERROR) << "request read returned " << ret;