Merge lp:~vanvugt/mir/fix-1438536 into lp:mir

[Daniel van Vugt]

When enumerating graphics drivers politely log what is found, instead of
<WARNING> about spurious failures to load non-graphics drivers that we
don't care about. (LP: #1438536)

Before:

[1429866151.970301] <WARNING> Platform Probing: Failed to probe module. Not a platform library or incorrect ABI version? Error: bin/../lib/server-modules/input-stub.so: undefined symbol: probe_graphics_platform, version MIR_GRAPHICS_PLATFORM_2
[1429866151.970394] Platform Loader: Selected driver: mesa (version 0.13.0)

After:

[1429865885.612831] mirplatform: Found graphics driver: dummy
[1429865885.612882] mirplatform: Found graphics driver: android
[1429865885.613125] mirplatform: Found graphics driver: mesa
[1429865885.613402] Platform Loader: Selected driver: mesa (version 0.13.0)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2509
http://jenkins.qa.ubuntu.com/job/mir-ci/3607/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1604
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1604/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2118
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5036
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19890

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

It would be helpful to also print the name (and perhaps path) of the shared object for each platform.

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

=== modified file 'src/platform/graphics/platform_probe.cpp'
--- src/platform/graphics/platform_probe.cpp	2015-04-13 14:07:18 +0000
+++ src/platform/graphics/platform_probe.cpp	2015-04-24 08:59:56 +0000
@@ -16,14 +16,12 @@
  * Authored by: Christopher James Halse Rogers <[e-mail]>
  */
 
-#include "mir/logging/logger.h"
+#include "mir/log.h"
 #include "mir/graphics/platform.h"
 #include "mir/graphics/platform_probe.h"
 
 #include <boost/throw_exception.hpp>
 
-namespace ml = mir::logging;
-
 std::shared_ptr<mir::SharedLibrary>
 mir::graphics::module_for_device(std::vector<std::shared_ptr<SharedLibrary>> const& modules)
 {
@@ -33,21 +31,25 @@
     {
         try
         {
-            auto probe = module->load_function<mir::graphics::PlatformProbe>("probe_graphics_platform",
-                                                                             MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+            auto probe = module->load_function<PlatformProbe>(
+                 "probe_graphics_platform",
+                 MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+
             auto module_priority = probe();
             if (module_priority > best_priority_so_far)
             {
                 best_priority_so_far = module_priority;
                 best_module_so_far = module;
             }
+
+            auto describe = module->load_function<DescribeModule>(
+                "describe_graphics_module",
+                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+            auto desc = describe();
+            mir::log_info("Found graphics driver: %s", desc->name);
         }
-        catch (std::runtime_error const& err)
+        catch (std::runtime_error const&)
         {
-            // Tried to probe a SharedLibrary that isn't a platform module?
-            ml::log(ml::Severity::warning,
-                    std::string{"Failed to probe module. Not a platform library or incorrect ABI version? Error: "} + err.what(),
-                    "Platform Probing");
         }
     }
     if (best_priority_so_far > mir::graphics::unsupported)