Merge lp:~cemil-azizoglu/mir/fix-1661704 into lp:mir

[Cemil Azizoglu]

Check returned wh against null before calling its method.

Check returned wh against null before calling its method.

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

FAILED: Continuous integration, rev:4011
https://mir-jenkins.ubuntu.com/job/mir-ci/2936/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3886/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3965
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3955
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3955
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3955
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3913/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3913/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3913/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3913/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/3913
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3913/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3913/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4012
https://mir-jenkins.ubuntu.com/job/mir-ci/2939/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3890/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3969
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3959
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3959
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3959
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3917/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3917/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3917/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3917/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/3917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3917/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/3917
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3917/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:4013
https://mir-jenkins.ubuntu.com/job/mir-ci/2941/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3893
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3972
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3961
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3961
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3961
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3919/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/3919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3919/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3919/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3919/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/3919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3919/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/3919
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3919/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Ah yes, NULL wait handles. The old mir_wait* functions we just deprecated would have solved this :)

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1072/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3894/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1130/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3973
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3963
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3963
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3963
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3921
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3921/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/3921
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3921/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3921
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3921/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3921
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3921/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/3921
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3921/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3921/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Bug 1661187

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

review: Approve (continuous-integration)

=== modified file 'include/client/mir_toolkit/mir_window.h'
--- include/client/mir_toolkit/mir_window.h	2017-02-02 19:17:46 +0000
+++ include/client/mir_toolkit/mir_window.h	2017-02-03 22:38:23 +0000
@@ -784,7 +784,7 @@
  *         be freed with a call to mir_persistent_id_release()
  */
 MirPersistentId* mir_window_request_persistent_id_sync(MirWindow* window)
-__attribute__((deprecated("Use mir_window_request_persistent_id_sync")));
+__attribute__((deprecated("Use mir_window_request_window_id_sync")));
 MirWindowId* mir_window_request_window_id_sync(MirWindow* window);
 #ifdef __cplusplus
 }

=== modified file 'src/client/mir_surface_api.cpp'
--- src/client/mir_surface_api.cpp	2017-02-02 19:17:46 +0000
+++ src/client/mir_surface_api.cpp	2017-02-03 22:38:23 +0000
@@ -825,7 +825,8 @@
     mir::require(mir_window_is_valid(window));
 
     MirWindowId* result = nullptr;
-    mir_window_request_persistent_id_helper(window, &assign_surface_id_result, &result)->wait_for_all();
+    if (auto wh = mir_window_request_persistent_id_helper(window, &assign_surface_id_result, &result))
+        wh->wait_for_all();
     return result;
 }
 
@@ -1262,7 +1263,8 @@
 MirWindowId* mir_surface_request_persistent_id_sync(MirSurface *surface)
 {
     MirWindowId* result = nullptr;
-    mir_window_request_persistent_id_helper(surface, &assign_surface_id_result, &result)->wait_for_all();
+    if (auto wh = mir_window_request_persistent_id_helper(surface, &assign_surface_id_result, &result))
+        wh->wait_for_all();
     return result;
 }
 
@@ -1318,6 +1320,7 @@
     mir::require(mir_window_is_valid(window));
 
     MirWindowId* result = nullptr;
-    mir_window_request_persistent_id_helper(window, &assign_surface_id_result, &result)->wait_for_all();
+    if (auto wh = mir_window_request_persistent_id_helper(window, &assign_surface_id_result, &result))
+        wh->wait_for_all();
     return result;
 }

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2017-02-01 19:54:40 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2017-02-03 22:38:23 +0000
@@ -1185,6 +1185,31 @@
 }
 #pragma GCC diagnostic pop
 
+//lp:1661704
+TEST_F(ClientLibrary, can_get_window_id_more_than_once_in_quick_succession)
+{
+    auto connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);
+
+    auto surface_spec = mir_create_normal_window_spec(connection, 800, 600);
+    mir_window_spec_set_pixel_format(surface_spec, mir_pixel_format_argb_8888);
+    auto window = mir_create_window_sync(surface_spec);
+    mir_window_spec_release(surface_spec);
+
+    ASSERT_THAT(window, IsValid());
+
+    MirWindowId* surface_id;
+    MirWindowId* window_id = nullptr; //circumvent ‘window_id’ uninitialized error
+    surface_id = mir_window_request_window_id_sync(window);
+    EXPECT_NO_THROW({
+        window_id = mir_window_request_window_id_sync(window);
+    });
+
+    mir_window_id_release(surface_id);
+    mir_window_id_release(window_id);
+    mir_window_release_sync(window);
+    mir_connection_release(connection);
+}
+
 TEST_F(ClientLibrary, creates_buffer_streams)
 {
     connection = mir_connect_sync(new_connection().c_str(), __PRETTY_FUNCTION__);