Merge lp:~mir-team/unity-system-compositor/revert-stub-cookie into lp:unity-system-compositor

[Brandon Schaefer]

lp:mir does a copy_n on the empty cookie (which results in a seg fault). Needs fixing in lp:mir before this can land!

lp:mir does a copy_n on the empty cookie (which results in a seg fault). Needs fixing in lp:mir before this can land!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/337/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-armhf-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-xenial-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/337/rebuild

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:271
https://mir-jenkins.ubuntu.com/job/usc-ci/3/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/3/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-0-fetch/122/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/118/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/118/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/7/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/7/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/7/console

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Workaround went in that uses the exact size needed, no longer needed!

Unmerged revisions

271. By Brandon Schaefer on 2016-01-28

* Undo this change, needs fixing in lp:mir to do this!

=== modified file 'src/server.cpp'
--- src/server.cpp	2016-01-27 14:58:39 +0000
+++ src/server.cpp	2016-01-28 02:28:14 +0000
@@ -32,7 +32,6 @@
 #include "display_configuration_policy.h"
 #include "steady_clock.h"
 
-#include <mir/cookie/authority.h>
 #include <mir/input/cursor_listener.h>
 #include <mir/server_status_listener.h>
 #include <mir/shell/focus_controller.h>
@@ -100,33 +99,6 @@
 
     std::shared_ptr<msh::FocusController> const focus_controller;
 };
-
-struct StubCookie : public mir::cookie::Cookie
-{
-    uint64_t timestamp() const override
-    {
-        return 0;
-    }
-
-    std::vector<uint8_t> serialize() const override
-    {
-        return std::vector<uint8_t>();
-    }
-};
-
-struct StubCookieAuthority : public mir::cookie::Authority
-{
-    std::unique_ptr<mir::cookie::Cookie> make_cookie(uint64_t const& timestamp) override
-    {
-        return std::unique_ptr<StubCookie>(new StubCookie());
-    }
-
-    std::unique_ptr<mir::cookie::Cookie> make_cookie(std::vector<uint8_t> const& raw_cookie) override
-    {
-        return std::unique_ptr<StubCookie>(new StubCookie());
-    }
-};
-
 const char* const dm_from_fd = "from-dm-fd";
 const char* const dm_to_fd = "to-dm-fd";
 const char* const dm_stub = "debug-without-dm";
@@ -188,12 +160,6 @@
              the_session_switcher());
        });
 
-    override_the_cookie_authority([this]()
-    -> std::shared_ptr<mir::cookie::Authority>
-    {
-        return std::make_unique<StubCookieAuthority>();
-    });
-
     set_config_filename("unity-system-compositor.conf");
 
     apply_settings();