Merge lp:~alan-griffiths/mir/prerequsites-for-fixing-1483223 into lp:mir

[Alan Griffiths]

Move entry points used by android-input-static into mircommon

In part this is to see whether the team thinks moving the code like this is justified to resolve the android-input-static dependencies properly.

Move entry points used by android-input-static into mircommon

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2833
http://jenkins.qa.ubuntu.com/job/mir-ci/4519/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3470
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1002
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3418/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/668
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/668/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3418
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3418/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6204/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22437

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

That usage of mir::udev::Monitor should be gone as soon as we move evdev related input handling to input platforms. Then it being in mirplatform should not cause problems?

[Daniel van Vugt (vanvugt)]

(1) This is still series 0.16 we're on, not 0.17:
8 -set(MIR_VERSION_MINOR 16) # This should change at least with every MIRSERVER_ABI
9 +set(MIR_VERSION_MINOR 17) # This should change at least with every MIRSERVER_ABI

review: Needs Fixing

[lp:~alan-griffiths/mir/prerequsites-for-fixing-1483223]

2834. By Alan Griffiths on 2015-08-11

Fix thinko (we're still on 0.16)

[Daniel van Vugt (vanvugt)]

(1) Thanks.

(2) Udev enumeration feels like something that should only live in the server. Putting it in libmircommon means we're bloating every client with code it will never use. Is that right? Is it just the lesser evil?

review: Needs Information

[Daniel van Vugt (vanvugt)]

(3) src/server/symbols.map: MIR_SERVER_33 should be 34

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> (2) Udev enumeration feels like something that should only live in the server.
> Putting it in libmircommon means we're bloating every client with code it will
> never use. Is that right? Is it just the lesser evil?

I think Andreas is right that it /belongs/ in an input platform library. But that's not where the input code that uses it is currently linked.

The alternative to this is therefore to clean up the input stack so that chunks are not linked into mirclient. (I hope this is what will happen naturally with the other input platform work.)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2834
http://jenkins.qa.ubuntu.com/job/mir-ci/4525/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3479
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/674
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/674/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3427
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6214
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22457

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

review: Approve (continuous-integration)

[lp:~alan-griffiths/mir/prerequsites-for-fixing-1483223]

2835. By Alan Griffiths on 2015-08-11

Revert libmirserver soname bump

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2835
http://jenkins.qa.ubuntu.com/job/mir-ci/4528/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3483
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/677
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/677/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3431
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6216
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22460

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

> I think Andreas is right that it /belongs/ in an input platform library. But..

+1

review: Approve

[Kevin DuBois (kdub)]

iirc, mesa uses udev to figure out appropriate devices, so probably can't be isolated to an input platform.

[Kevin DuBois (kdub)]

review: Approve

[Daniel van Vugt (vanvugt)]

(3) The mirserver ABI bump to 34 was correct. You can't remove a function from an ABI without declaring a breakage (bump). So we need to bump it, if not here then immediately after this lands.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

^ because:

256 === modified file 'src/server/symbols.map'
257 --- src/server/symbols.map 2015-07-25 08:10:48 +0000
258 +++ src/server/symbols.map 2015-08-11 10:20:04 +0000
259 @@ -286,7 +286,6 @@
260 mir::shell::WindowManager::operator*;
261 mir::shell::WindowManager::?WindowManager*;
262 mir::shell::WindowManager::WindowManager*;
263 - mir::terminate_with_current_exception*;
264 mir::time::Alarm::?Alarm*;
265 mir::time::Alarm::Alarm*;
266 mir::time::AlarmFactory::?AlarmFactory*;

[Alan Griffiths (alan-griffiths)]

Moved this series to WIP as I now think there's a better order in which to tackle things.

Unmerged revisions

2835. By Alan Griffiths on 2015-08-11

Revert libmirserver soname bump

2834. By Alan Griffiths on 2015-08-11

Fix thinko (we're still on 0.16)

2833. By Alan Griffiths on 2015-08-10

mirserver ABI break - bump the soname

2832. By Alan Griffiths on 2015-08-10

mirserver ABI break - bump the soname

2831. By Alan Griffiths on 2015-08-10

Fix symbol versioning in mircommon

2830. By Alan Griffiths on 2015-08-10

Move mir::udev to common

2829. By Alan Griffiths on 2015-08-10

remove terminate_with_current_exception() from server symbols

=== renamed file 'include/server/mir/terminate_with_current_exception.h' => 'include/common/mir/terminate_with_current_exception.h'
--- include/server/mir/terminate_with_current_exception.h	2014-12-03 12:30:58 +0000
+++ include/common/mir/terminate_with_current_exception.h	2015-08-11 10:20:04 +0000
@@ -2,15 +2,15 @@
  * Copyright © 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
+ * under the terms of the GNU Lesser General Public License version 3,
  * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored By: Alan Griffiths <[e-mail]>
@@ -22,6 +22,11 @@
 namespace mir
 {
 void terminate_with_current_exception();
+
+/// called by main thread to rethrow any termination exception
+void check_for_termination_exception();
+
+void clear_termination_exception();
 }
 
 #endif /* MIR_TERMINATE_WITH_CURRENT_EXCEPTION_H_ */
 
=== modified file 'src/common/CMakeLists.txt'
--- src/common/CMakeLists.txt	2015-07-16 07:03:19 +0000
+++ src/common/CMakeLists.txt	2015-08-11 10:20:04 +0000
@@ -18,11 +18,14 @@
 add_subdirectory(time)
 add_subdirectory(dispatch)
 add_subdirectory(fatal)
+add_subdirectory(udev)
 
 list(APPEND MIR_COMMON_SOURCES
   $<TARGET_OBJECTS:mirtime>
   $<TARGET_OBJECTS:mirfatal>
+  $<TARGET_OBJECTS:mirudev>
   ${CMAKE_CURRENT_SOURCE_DIR}/log.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/terminate_with_current_exception.cpp
   )
 
 set(PREFIX "${CMAKE_INSTALL_PREFIX}")
 
=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2015-06-18 02:46:16 +0000
+++ src/common/symbols.map	2015-08-11 10:20:04 +0000
@@ -142,3 +142,30 @@
   };
  local: *;
 };
+MIR_COMMON_5.1 {
+ global: mir_*;
+  extern "C++" {
+    mir::check_for_termination_exception*;
+    mir::clear_termination_exception*;
+    mir::terminate_with_current_exception*;
+    mir::udev::Context::?Context*;
+    mir::udev::Context::Context*;
+    mir::udev::Enumerator::begin*;
+    mir::udev::Enumerator::end*;
+    mir::udev::Enumerator::?Enumerator*;
+    mir::udev::Enumerator::Enumerator*;
+    mir::udev::Enumerator::iterator::operator*;
+    mir::udev::Enumerator::match_parent*;
+    mir::udev::Enumerator::match_subsystem*;
+    mir::udev::Enumerator::match_sysname*;
+    mir::udev::Enumerator::scan_devices*;
+    mir::udev::Monitor::enable*;
+    mir::udev::Monitor::fd*;
+    mir::udev::Monitor::filter_by_subsystem*;
+    mir::udev::Monitor::?Monitor*;
+    mir::udev::Monitor::Monitor*;
+    mir::udev::Monitor::process_events*;
+    mir::udev::operator*;
+  };
+ local: *;
+};
 
=== added file 'src/common/terminate_with_current_exception.cpp'
--- src/common/terminate_with_current_exception.cpp	1970-01-01 00:00:00 +0000
+++ src/common/terminate_with_current_exception.cpp	2015-08-11 10:20:04 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/terminate_with_current_exception.h"
+
+#include <unistd.h>
+#include <csignal>
+
+#include <exception>
+#include <mutex>
+
+namespace
+{
+std::exception_ptr termination_exception;
+std::mutex termination_exception_mutex;
+}
+
+void mir::clear_termination_exception()
+{
+    std::lock_guard<std::mutex> lock{termination_exception_mutex};
+    termination_exception = nullptr;
+}
+
+void mir::check_for_termination_exception()
+{
+    std::lock_guard<std::mutex> lock{termination_exception_mutex};
+    if (termination_exception)
+        std::rethrow_exception(termination_exception);
+}
+
+void mir::terminate_with_current_exception()
+{
+    std::lock_guard<std::mutex> lock{termination_exception_mutex};
+    if (!termination_exception)
+    {
+        termination_exception = std::current_exception();
+        kill(getpid(), SIGTERM);
+    }
+}
 
=== renamed directory 'src/platform/udev' => 'src/common/udev'
=== modified file 'src/common/udev/CMakeLists.txt'
--- src/platform/udev/CMakeLists.txt	2015-03-31 02:35:42 +0000
+++ src/common/udev/CMakeLists.txt	2015-08-11 10:20:04 +0000
@@ -2,5 +2,5 @@
   udev_wrapper.cpp
 )
 
-list(APPEND MIR_PLATFORM_REFERENCES ${UDEV_LDFLAGS} ${UDEV_LIBRARIES})
-set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
+list(APPEND MIR_COMMON_REFERENCES ${UDEV_LDFLAGS} ${UDEV_LIBRARIES})
+set(MIR_COMMON_REFERENCES ${MIR_COMMON_REFERENCES} PARENT_SCOPE)
 
=== renamed directory 'src/include/platform/mir/udev' => 'src/include/common/mir/udev'
=== modified file 'src/platform/CMakeLists.txt'
--- src/platform/CMakeLists.txt	2015-06-18 02:46:16 +0000
+++ src/platform/CMakeLists.txt	2015-08-11 10:20:04 +0000
@@ -13,7 +13,6 @@
 set(MIR_PLATFORM_OBJECTS
   $<TARGET_OBJECTS:mirplatformgraphicscommon>
   $<TARGET_OBJECTS:miroptions>
-  $<TARGET_OBJECTS:mirudev>
 )
 
 set(MIR_PLATFORM_REFERENCES
@@ -23,7 +22,6 @@
 
 add_subdirectory(graphics/)
 add_subdirectory(options)
-add_subdirectory(udev)
 
 set(MIR_PLATFORM_OBJECTS ${MIR_PLATFORM_OBJECTS} PARENT_SCOPE)
 set(MIR_PLATFORM_REFERENCES ${MIR_PLATFORM_REFERENCES} PARENT_SCOPE)
 
=== modified file 'src/platform/symbols.map'
--- src/platform/symbols.map	2015-07-20 03:16:27 +0000
+++ src/platform/symbols.map	2015-08-11 10:20:04 +0000
@@ -257,24 +257,6 @@
     mir::graphics::red_channel_depth*;
     mir::graphics::SimpleGLProgram::SimpleGLProgram*;
     mir::graphics::tessellate_renderable_into_rectangle*;
-    mir::udev::Context::?Context*;
-    mir::udev::Context::Context*;
-    mir::udev::Enumerator::begin*;
-    mir::udev::Enumerator::end*;
-    mir::udev::Enumerator::?Enumerator*;
-    mir::udev::Enumerator::Enumerator*;
-    mir::udev::Enumerator::iterator::operator*;
-    mir::udev::Enumerator::match_parent*;
-    mir::udev::Enumerator::match_subsystem*;
-    mir::udev::Enumerator::match_sysname*;
-    mir::udev::Enumerator::scan_devices*;
-    mir::udev::Monitor::enable*;
-    mir::udev::Monitor::fd*;
-    mir::udev::Monitor::filter_by_subsystem*;
-    mir::udev::Monitor::?Monitor*;
-    mir::udev::Monitor::Monitor*;
-    mir::udev::Monitor::process_events*;
-    mir::udev::operator*;
   };
  local: *;
 };
 
=== modified file 'src/server/run_mir.cpp'
--- src/server/run_mir.cpp	2015-06-17 05:20:42 +0000
+++ src/server/run_mir.cpp	2015-08-11 10:20:04 +0000
@@ -40,8 +40,6 @@
 auto const intercepted = { SIGQUIT, SIGABRT, SIGFPE, SIGSEGV, SIGBUS };
 
 std::weak_ptr<mir::EmergencyCleanup> weak_emergency_cleanup;
-std::exception_ptr termination_exception;
-std::mutex termination_exception_mutex;
 
 extern "C" void perform_emergency_cleanup()
 {
@@ -76,10 +74,7 @@
     std::function<void(int)> const& terminator)
 {
     DisplayServer* server_ptr{nullptr};
-    {
-        std::lock_guard<std::mutex> lock{termination_exception_mutex};
-        termination_exception = nullptr;
-    }
+    clear_termination_exception();
 
     auto const main_loop = config.the_main_loop();
 
@@ -114,17 +109,5 @@
     init(server);
     server.run();
 
-    std::lock_guard<std::mutex> lock{termination_exception_mutex};
-    if (termination_exception)
-        std::rethrow_exception(termination_exception);
-}
-
-void mir::terminate_with_current_exception()
-{
-    std::lock_guard<std::mutex> lock{termination_exception_mutex};
-    if (!termination_exception)
-    {
-        termination_exception = std::current_exception();
-        kill(getpid(), SIGTERM);
-    }
+    check_for_termination_exception();
 }
 
=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2015-07-25 08:10:48 +0000
+++ src/server/symbols.map	2015-08-11 10:20:04 +0000
@@ -286,7 +286,6 @@
     mir::shell::WindowManager::operator*;
     mir::shell::WindowManager::?WindowManager*;
     mir::shell::WindowManager::WindowManager*;
-    mir::terminate_with_current_exception*;
     mir::time::Alarm::?Alarm*;
     mir::time::Alarm::Alarm*;
     mir::time::AlarmFactory::?AlarmFactory*;