Merge lp:~kdub/mir/log-more-egl-info into lp:mir

[Kevin DuBois]

logging: log the egl extensions in the --display-report log option.

logging: log the egl extensions in the --display-report log option.

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:4141
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kdub/mir/log-more-egl-info/+merge/321981/+edit-commit-message

https://mir-jenkins.ubuntu.com/job/mir-ci/3315/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4480/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4597
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4586
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4586
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4586
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4586
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4511
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4511/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4511
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4511/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4511
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4511/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4511/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4511/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4511
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4511/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4511
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4511/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3315/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Sounds good.

Nits:

1. Needless string copy could just remain a pointer: std::string extensions { ext ? ext : "" };

2. Tests like this are low value and probably need not exist...
+ EXPECT_CALL(mock_egl, eglQueryString(disp, EGL_EXTENSIONS)).WillOnce(Return(ext_str));

review: Approve

[Alberto Aguirre (albaguirre)]

OK.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~kdub/mir/log-more-egl-info/+merge/321981/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'src/server/report/logging/display_report.cpp'
--- src/server/report/logging/display_report.cpp	2017-01-18 02:29:37 +0000
+++ src/server/report/logging/display_report.cpp	2017-04-05 12:16:38 +0000
@@ -90,6 +90,23 @@
 
 void mrl::DisplayReport::report_egl_configuration(EGLDisplay disp, EGLConfig config)
 {
+    auto ext = eglQueryString(disp, EGL_EXTENSIONS);
+    std::string extensions { ext ? ext : "" };
+    logger->log(ml::Severity::informational, "Display EGL Extensions: " + extensions, component());
+
+    auto client_ext = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+    if (client_ext)
+    {
+        logger->log(ml::Severity::informational,
+            "EGL_EXT_client_extensions: " + std::string{client_ext}, component());
+    }
+    else
+    {
+        logger->log(ml::Severity::informational, "EGL_EXT_client_extensions not supported", component());
+        //clear out error
+        eglGetError();
+    }
+
     #define STRMACRO(X) {#X, X}
     struct {std::string name; EGLint val;} egl_string_mapping [] =
     {

=== modified file 'tests/unit-tests/logging/test_display_report.cpp'
--- tests/unit-tests/logging/test_display_report.cpp	2017-01-18 02:29:37 +0000
+++ tests/unit-tests/logging/test_display_report.cpp	2017-04-05 12:16:38 +0000
@@ -28,6 +28,7 @@
 namespace ml  = mir::logging;
 namespace mrl = mir::report::logging;
 namespace mtd = mir::test::doubles;
+using namespace testing;
 
 namespace
 {
@@ -41,7 +42,9 @@
 struct DisplayReport : public testing::Test
 {
     std::shared_ptr<MockLogger> logger{std::make_shared<MockLogger>()};
-    mtd::MockEGL mock_egl;
+    testing::NiceMock<mtd::MockEGL> mock_egl;
+    EGLDisplay disp = reinterpret_cast<EGLDisplay>(9);
+    EGLConfig config = reinterpret_cast<EGLConfig>(8);
 };
 
 char const* const component = "graphics";
@@ -95,18 +98,22 @@
 
 TEST_F(DisplayReport, eglconfig)
 {
-    using namespace testing;
-    EGLDisplay disp = reinterpret_cast<EGLDisplay>(9);
-    EGLConfig config = reinterpret_cast<EGLConfig>(8);
     int dummy_value = 7;
+    auto ext_str = "EGL_EXT_imaginary";
+    auto client_ext_str = "EGL_EXT_oil_platform";
+
+    EXPECT_CALL(mock_egl, eglQueryString(disp, EGL_EXTENSIONS)).WillOnce(Return(ext_str));
+    EXPECT_CALL(mock_egl, eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS)).WillOnce(Return(client_ext_str));
     EXPECT_CALL(mock_egl, eglGetConfigAttrib(disp, config,_,_))
         .Times(AnyNumber())
         .WillRepeatedly(DoAll(SetArgPointee<3>(dummy_value),Return(EGL_TRUE)));
 
     EXPECT_CALL(*logger, log(
-        ml::Severity::informational,
-        "Display EGL Configuration:",
-        component));
+        ml::Severity::informational, "Display EGL Extensions: " + std::string{ext_str}, component));
+    EXPECT_CALL(*logger, log(
+        ml::Severity::informational, "EGL_EXT_client_extensions: " + std::string{client_ext_str}, component));
+    EXPECT_CALL(*logger, log(
+        ml::Severity::informational, "Display EGL Configuration:", component));
     for(auto &i : egl_string_mapping)
     {
         EXPECT_CALL(*logger, log(
@@ -119,9 +126,17 @@
     report.report_egl_configuration(disp, config);
 }
 
+TEST_F(DisplayReport, eglconfig_clears_eglerror_when_there_are_no_extensions)
+{
+    EXPECT_CALL(mock_egl, eglQueryString(disp, EGL_EXTENSIONS)).WillOnce(Return(nullptr));
+    EXPECT_CALL(mock_egl, eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS)).WillOnce(Return(nullptr));
+    EXPECT_CALL(mock_egl, eglGetError());
+    mrl::DisplayReport report(logger);
+    report.report_egl_configuration(disp, config);
+}
+
 TEST_F(DisplayReport, reports_vsync)
 {
-    using namespace testing;
     std::chrono::nanoseconds const nanos_per_frame{16666666};
     std::string const interval_str{"interval 16.666ms"};
     unsigned int display1_id {1223};
@@ -149,7 +164,6 @@
 
 TEST_F(DisplayReport, reports_vsync_steady_interval_despite_missed_frames)
 {
-    using namespace testing;
     int const hz = 60;
     std::string const interval_str{"interval 16.666ms (60.00Hz)"};
     unsigned const id{123};