Merge lp:~alan-griffiths/mir/fix-1276704 into lp:mir

[Alan Griffiths]

frontend, shell: provide the client process ID in the shell::Session interface (LP: #1276704)

frontend, shell: provide the client process ID in the shell::Session interface

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1381
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/803/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/842/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/839
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/437/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/533
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/533/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/537/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/438/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/803/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1382
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/804/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/439
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/534
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/534/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/538
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/440
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/440/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/430
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3760

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/804/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Gives me what I need, thanks!

review: Approve

[Daniel van Vugt (vanvugt)]

I haven't reviewed it, but it seems we're desperate to push this to archive, so top-approving.

=== modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.cpp'
--- examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2014-01-13 06:12:33 +0000
+++ examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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 as
@@ -41,6 +41,8 @@
 
 #include <xkbcommon/xkbcommon-keysyms.h>
 
+#include <unistd.h>
+
 #include <functional>
 
 #include <assert.h>
@@ -93,7 +95,7 @@
         .of_size(surface_size)
         .of_buffer_usage(mg::BufferUsage::hardware)
         .of_pixel_format(mir_pixel_format_argb_8888);
-    auto session = shell->open_session("Inprocess client", std::make_shared<NullEventSink>());
+    auto session = shell->open_session(getpid(), "Inprocess client", std::make_shared<NullEventSink>());
     // TODO: Why do we get an ID? ~racarr
     auto surface = session->get_surface(shell->create_surface_for(session, params));
 
 
=== modified file 'include/server/mir/frontend/shell.h'
--- include/server/mir/frontend/shell.h	2014-01-13 06:12:33 +0000
+++ include/server/mir/frontend/shell.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -20,6 +20,9 @@
 #define MIR_FRONTEND_SHELL_H_
 
 #include "mir/frontend/surface_id.h"
+
+#include <sys/types.h>
+
 #include <memory>
 
 namespace mir
@@ -39,7 +42,10 @@
     virtual ~Shell() = default;
 
     virtual std::shared_ptr<Session> open_session(
-        std::string const& name, std::shared_ptr<EventSink> const& sink) = 0;
+        pid_t client_pid,
+        std::string const& name,
+        std::shared_ptr<EventSink> const& sink) = 0;
+
     virtual void close_session(std::shared_ptr<Session> const& session)  = 0;
 
     virtual SurfaceId create_surface_for(std::shared_ptr<Session> const& session,
 
=== modified file 'include/server/mir/shell/session.h'
--- include/server/mir/shell/session.h	2014-01-13 06:12:33 +0000
+++ include/server/mir/shell/session.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -7,11 +7,11 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.   If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored By: Robert Carr <[e-mail]>
  */
@@ -22,9 +22,10 @@
 #include "mir/frontend/session.h"
 #include "mir/shell/snapshot.h"
 
+#include <sys/types.h>
+
 namespace mir
 {
-
 namespace shell
 {
 class Surface;
@@ -34,12 +35,12 @@
 public:
     virtual std::string name() const = 0;
     virtual void force_requests_to_complete() = 0;
+    virtual pid_t process_id() const = 0;
 
     virtual void take_snapshot(SnapshotCallback const& snapshot_taken) = 0;
     virtual std::shared_ptr<Surface> default_surface() const = 0;
     virtual void set_lifecycle_state(MirLifecycleState state) = 0;
 };
-
 }
 }
 
 
=== modified file 'include/test/mir_test_doubles/mock_shell.h'
--- include/test/mir_test_doubles/mock_shell.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/mock_shell.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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 as
@@ -34,8 +34,11 @@
 
 struct MockShell : public frontend::Shell
 {
-    MOCK_METHOD2(open_session, std::shared_ptr<frontend::Session>(
-        std::string const&, std::shared_ptr<frontend::EventSink> const&));
+    MOCK_METHOD3(open_session, std::shared_ptr<frontend::Session>(
+        pid_t client_pid,
+        std::string const&,
+        std::shared_ptr<frontend::EventSink> const&));
+
     MOCK_METHOD1(close_session, void(std::shared_ptr<frontend::Session> const&));
 
     MOCK_METHOD2(create_surface_for, frontend::SurfaceId(std::shared_ptr<frontend::Session> const&, shell::SurfaceCreationParameters const&));
 
=== modified file 'include/test/mir_test_doubles/mock_shell_session.h'
--- include/test/mir_test_doubles/mock_shell_session.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test_doubles/mock_shell_session.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -42,6 +42,7 @@
     MOCK_CONST_METHOD0(default_surface, std::shared_ptr<shell::Surface>());
 
     MOCK_CONST_METHOD0(name, std::string());
+    MOCK_CONST_METHOD0(process_id, pid_t());
     MOCK_METHOD0(force_requests_to_complete, void());
 
     MOCK_METHOD0(hide, void());
 
=== modified file 'include/test/mir_test_doubles/stub_ipc_factory.h'
--- include/test/mir_test_doubles/stub_ipc_factory.h	2014-01-21 06:27:40 +0000
+++ include/test/mir_test_doubles/stub_ipc_factory.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -41,7 +41,7 @@
     }
 
     std::shared_ptr<protobuf::DisplayServer> make_ipc_server(
-        std::shared_ptr<frontend::EventSink> const&, bool) override
+        pid_t, std::shared_ptr<frontend::EventSink> const&, bool) override
     {
         return server;
     }
 
=== modified file 'include/test/mir_test_doubles/stub_shell.h'
--- include/test/mir_test_doubles/stub_shell.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/stub_shell.h	2014-02-07 14:29:43 +0000
@@ -34,7 +34,7 @@
     StubShell() : stub_session(std::make_shared<StubSession>())
     {
     }
-    std::shared_ptr<frontend::Session> open_session(std::string const& /* name */, std::shared_ptr<frontend::EventSink> const& /* sink */) override
+    std::shared_ptr<frontend::Session> open_session(pid_t, std::string const& /* name */, std::shared_ptr<frontend::EventSink> const& /* sink */) override
     {
         return stub_session;
     }
 
=== modified file 'include/test/mir_test_doubles/stub_shell_session.h'
--- include/test/mir_test_doubles/stub_shell_session.h	2014-01-13 06:12:33 +0000
+++ include/test/mir_test_doubles/stub_shell_session.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -45,6 +45,11 @@
     {
         return std::string();
     }
+    pid_t process_id() const override
+    {
+        return -1;
+    }
+
     void force_requests_to_complete() override
     {
     }
 
=== modified file 'src/server/frontend/default_configuration.cpp'
--- src/server/frontend/default_configuration.cpp	2014-01-30 13:27:59 +0000
+++ src/server/frontend/default_configuration.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -64,7 +64,9 @@
     std::shared_ptr<mf::Screencast> const screencast;
 
     virtual std::shared_ptr<mir::protobuf::DisplayServer> make_ipc_server(
-        std::shared_ptr<mf::EventSink> const& sink, bool authorized_to_resize_display)
+        pid_t client_pid,
+        std::shared_ptr<mf::EventSink> const& sink,
+        bool authorized_to_resize_display) override
     {
         std::shared_ptr<mf::DisplayChanger> changer;
         if(authorized_to_resize_display)
@@ -77,6 +79,7 @@
         }
 
         return std::make_shared<mf::SessionMediator>(
+            client_pid,
             shell,
             graphics_platform,
             changer,
 
=== modified file 'src/server/frontend/protobuf_ipc_factory.h'
--- src/server/frontend/protobuf_ipc_factory.h	2014-01-21 06:27:40 +0000
+++ src/server/frontend/protobuf_ipc_factory.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -19,6 +19,8 @@
 #ifndef MIR_FRONTEND_PROTOBUF_IPC_FACTORY_H_
 #define MIR_FRONTEND_PROTOBUF_IPC_FACTORY_H_
 
+#include <sys/types.h>
+
 #include <memory>
 
 namespace mir
@@ -37,7 +39,10 @@
 {
 public:
     virtual std::shared_ptr<protobuf::DisplayServer> make_ipc_server(
-        std::shared_ptr<EventSink> const& sink, bool authorized_to_resize_display) = 0;
+        pid_t client_pid,
+        std::shared_ptr<EventSink> const& sink,
+        bool authorized_to_resize_display) = 0;
+
     virtual std::shared_ptr<ResourceCache> resource_cache() = 0;
 
 protected:
 
=== modified file 'src/server/frontend/protobuf_session_creator.cpp'
--- src/server/frontend/protobuf_session_creator.cpp	2014-01-22 15:54:11 +0000
+++ src/server/frontend/protobuf_session_creator.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -69,7 +69,7 @@
         auto const event_sink = std::make_shared<detail::EventSender>(messenger);
         auto const msg_processor = create_processor(
             message_sender,
-            ipc_factory->make_ipc_server(event_sink, authorized_to_resize_display),
+            ipc_factory->make_ipc_server(client_pid, event_sink, authorized_to_resize_display),
             report);
 
         const auto& session = std::make_shared<mfd::SocketSession>(messenger, next_id(), connected_sessions, msg_processor);
 
=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2014-02-06 09:51:46 +0000
+++ src/server/frontend/session_mediator.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -56,6 +56,7 @@
 namespace geom = mir::geometry;
 
 mf::SessionMediator::SessionMediator(
+    pid_t client_pid,
     std::shared_ptr<frontend::Shell> const& shell,
     std::shared_ptr<graphics::Platform> const & graphics_platform,
     std::shared_ptr<mf::DisplayChanger> const& display_changer,
@@ -64,6 +65,7 @@
     std::shared_ptr<EventSink> const& sender,
     std::shared_ptr<ResourceCache> const& resource_cache,
     std::shared_ptr<Screencast> const& screencast) :
+    client_pid(client_pid),
     shell(shell),
     graphics_platform(graphics_platform),
     surface_pixel_formats(surface_pixel_formats),
@@ -95,7 +97,7 @@
 
     {
         std::unique_lock<std::mutex> lock(session_mutex);
-        weak_session = shell->open_session(request->application_name(), event_sink);
+        weak_session = shell->open_session(client_pid, request->application_name(), event_sink);
     }
 
     auto ipc_package = graphics_platform->get_ipc_package();
 
=== modified file 'src/server/frontend/session_mediator.h'
--- src/server/frontend/session_mediator.h	2014-02-06 09:51:46 +0000
+++ src/server/frontend/session_mediator.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -60,6 +60,7 @@
 {
 public:
     SessionMediator(
+        pid_t client_pid,
         std::shared_ptr<Shell> const& shell,
         std::shared_ptr<graphics::Platform> const& graphics_platform,
         std::shared_ptr<frontend::DisplayChanger> const& display_changer,
@@ -135,6 +136,7 @@
                               bool need_full_ipc);
 
     void advance_buffer(SurfaceId surf_id, Surface& surface, std::function<void(graphics::Buffer*, bool)> complete);
+    pid_t client_pid;
     std::shared_ptr<Shell> const shell;
     std::shared_ptr<graphics::Platform> const graphics_platform;
 
 
=== modified file 'src/server/scene/application_session.cpp'
--- src/server/scene/application_session.cpp	2014-01-13 06:12:33 +0000
+++ src/server/scene/application_session.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -37,11 +37,13 @@
 
 ms::ApplicationSession::ApplicationSession(
     std::shared_ptr<msh::SurfaceFactory> const& surface_factory,
+    pid_t pid,
     std::string const& session_name,
     std::shared_ptr<SnapshotStrategy> const& snapshot_strategy,
     std::shared_ptr<msh::SessionListener> const& session_listener,
     std::shared_ptr<mf::EventSink> const& sink) :
     surface_factory(surface_factory),
+    pid(pid),
     session_name(session_name),
     snapshot_strategy(snapshot_strategy),
     session_listener(session_listener),
@@ -125,6 +127,11 @@
     return session_name;
 }
 
+pid_t ms::ApplicationSession::process_id() const
+{
+    return pid;
+}
+
 void ms::ApplicationSession::force_requests_to_complete()
 {
     std::unique_lock<std::mutex> lock(surfaces_mutex);
 
=== modified file 'src/server/scene/application_session.h'
--- src/server/scene/application_session.h	2014-01-13 06:12:33 +0000
+++ src/server/scene/application_session.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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,
@@ -45,6 +45,7 @@
 public:
     ApplicationSession(
         std::shared_ptr<shell::SurfaceFactory> const& surface_factory,
+        pid_t pid,
         std::string const& session_name,
         std::shared_ptr<SnapshotStrategy> const& snapshot_strategy,
         std::shared_ptr<shell::SessionListener> const& session_listener,
@@ -60,6 +61,7 @@
     std::shared_ptr<shell::Surface> default_surface() const;
 
     std::string name() const;
+    pid_t process_id() const override;
 
     void force_requests_to_complete();
 
@@ -77,6 +79,7 @@
 
 private:
     std::shared_ptr<shell::SurfaceFactory> const surface_factory;
+    pid_t const pid;
     std::string const session_name;
     std::shared_ptr<SnapshotStrategy> const snapshot_strategy;
     std::shared_ptr<shell::SessionListener> const session_listener;
 
=== modified file 'src/server/scene/session_manager.cpp'
--- src/server/scene/session_manager.cpp	2014-01-13 06:12:33 +0000
+++ src/server/scene/session_manager.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -73,12 +73,14 @@
         close_session(session);
 }
 
-std::shared_ptr<mf::Session> ms::SessionManager::open_session(std::string const& name,
-                                                std::shared_ptr<mf::EventSink> const& sender)
+std::shared_ptr<mf::Session> ms::SessionManager::open_session(
+    pid_t client_pid,
+    std::string const& name,
+    std::shared_ptr<mf::EventSink> const& sender)
 {
     std::shared_ptr<msh::Session> new_session =
         std::make_shared<ApplicationSession>(
-            surface_factory, name, snapshot_strategy, session_listener, sender);
+            surface_factory, client_pid, name, snapshot_strategy, session_listener, sender);
 
     app_container->insert_session(new_session);
 
 
=== modified file 'src/server/scene/session_manager.h'
--- src/server/scene/session_manager.h	2014-01-13 06:12:33 +0000
+++ src/server/scene/session_manager.h	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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,
@@ -55,7 +55,10 @@
     virtual ~SessionManager();
 
     virtual std::shared_ptr<frontend::Session> open_session(
-        std::string const& name, std::shared_ptr<frontend::EventSink> const& sink);
+        pid_t client_pid,
+        std::string const& name,
+        std::shared_ptr<frontend::EventSink> const& sink);
+
     virtual void close_session(std::shared_ptr<frontend::Session> const& session);
 
     frontend::SurfaceId create_surface_for(std::shared_ptr<frontend::Session> const& session,
 
=== modified file 'tests/integration-tests/test_session.cpp'
--- tests/integration-tests/test_session.cpp	2014-01-31 11:13:57 +0000
+++ tests/integration-tests/test_session.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-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 as
@@ -170,6 +170,7 @@
 
     ms::ApplicationSession session{
         conf.the_shell_surface_factory(),
+        __LINE__,
         "stress",
         conf.the_snapshot_strategy(),
         std::make_shared<msh::NullSessionListener>(),
 
=== modified file 'tests/integration-tests/test_session_manager.cpp'
--- tests/integration-tests/test_session_manager.cpp	2014-01-13 06:12:33 +0000
+++ tests/integration-tests/test_session_manager.cpp	2014-02-07 14:29:43 +0000
@@ -76,9 +76,9 @@
 
     EXPECT_CALL(focus_setter, set_focus_to(_)).Times(3);
 
-    auto session1 = session_manager.open_session("Visual Basic Studio", std::make_shared<mtd::NullEventSink>());
-    auto session2 = session_manager.open_session("Microsoft Access", std::make_shared<mtd::NullEventSink>());
-    auto session3 = session_manager.open_session("WordPerfect", std::make_shared<mtd::NullEventSink>());
+    auto session1 = session_manager.open_session(__LINE__, "Visual Basic Studio", std::make_shared<mtd::NullEventSink>());
+    auto session2 = session_manager.open_session(__LINE__, "Microsoft Access", std::make_shared<mtd::NullEventSink>());
+    auto session3 = session_manager.open_session(__LINE__, "WordPerfect", std::make_shared<mtd::NullEventSink>());
 
     Mock::VerifyAndClearExpectations(&focus_setter);
 
@@ -105,9 +105,9 @@
 
     EXPECT_CALL(focus_setter, set_focus_to(_)).Times(3);
 
-    auto session1 = session_manager.open_session("Visual Basic Studio", std::make_shared<mtd::NullEventSink>());
-    auto session2 = session_manager.open_session("Microsoft Access", std::make_shared<mtd::NullEventSink>());
-    auto session3 = session_manager.open_session("WordPerfect", std::make_shared<mtd::NullEventSink>());
+    auto session1 = session_manager.open_session(__LINE__, "Visual Basic Studio", std::make_shared<mtd::NullEventSink>());
+    auto session2 = session_manager.open_session(__LINE__, "Microsoft Access", std::make_shared<mtd::NullEventSink>());
+    auto session3 = session_manager.open_session(__LINE__, "WordPerfect", std::make_shared<mtd::NullEventSink>());
 
     Mock::VerifyAndClearExpectations(&focus_setter);
 
 
=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2014-02-06 09:51:46 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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 as
@@ -206,7 +206,7 @@
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
           stub_screencast{std::make_shared<StubScreencast>()},
-          mediator{shell, graphics_platform, graphics_changer,
+          mediator{__LINE__, shell, graphics_platform, graphics_changer,
                    surface_pixel_formats, report,
                    std::make_shared<mtd::NullEventSink>(),
                    resource_cache, stub_screencast},
@@ -215,7 +215,7 @@
     {
         using namespace ::testing;
 
-        ON_CALL(*shell, open_session(_, _)).WillByDefault(Return(stubbed_session));
+        ON_CALL(*shell, open_session(_, _, _)).WillByDefault(Return(stubbed_session));
         ON_CALL(*shell, create_surface_for(_, _))
             .WillByDefault(WithArg<1>(Invoke(stubbed_session.get(), &StubbedSession::create_surface)));
     }
@@ -370,7 +370,7 @@
         .Times(1)
         .WillOnce(Return(mt::fake_shared(config)));
     mf::SessionMediator mediator(
-        shell, graphics_platform, mock_display,
+        __LINE__, shell, graphics_platform, mock_display,
         surface_pixel_formats, report,
         std::make_shared<mtd::NullEventSink>(),
         resource_cache, std::make_shared<mtd::NullScreencast>());
@@ -602,7 +602,7 @@
         .WillOnce(Return(mt::fake_shared(stub_display_config)));
 
     mf::SessionMediator session_mediator{
-        shell, graphics_platform, mock_display_selector,
+        __LINE__, shell, graphics_platform, mock_display_selector,
         surface_pixel_formats, report,
         std::make_shared<mtd::NullEventSink>(), resource_cache,
         std::make_shared<mtd::NullScreencast>()};
 
=== modified file 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
--- tests/unit-tests/frontend/test_session_mediator_android.cpp	2014-01-29 18:02:33 +0000
+++ tests/unit-tests/frontend/test_session_mediator_android.cpp	2014-02-07 14:29:43 +0000
@@ -57,7 +57,7 @@
           surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{shell, graphics_platform, display_changer,
+          mediator{__LINE__, shell, graphics_platform, display_changer,
                    surface_pixel_formats, report,
                    std::make_shared<mtd::NullEventSink>(),
                    resource_cache, std::make_shared<mtd::NullScreencast>()},
 
=== modified file 'tests/unit-tests/frontend/test_session_mediator_mesa.cpp'
--- tests/unit-tests/frontend/test_session_mediator_mesa.cpp	2014-01-29 18:02:33 +0000
+++ tests/unit-tests/frontend/test_session_mediator_mesa.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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 as
@@ -70,7 +70,7 @@
           surface_pixel_formats{mir_pixel_format_argb_8888, mir_pixel_format_xrgb_8888},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{shell, mock_platform, display_changer,
+          mediator{__LINE__, shell, mock_platform, display_changer,
                    surface_pixel_formats, report,
                    std::make_shared<mtd::NullEventSink>(),
                    resource_cache, std::make_shared<mtd::NullScreencast>()},
 
=== modified file 'tests/unit-tests/scene/test_application_session.cpp'
--- tests/unit-tests/scene/test_application_session.cpp	2014-01-13 06:12:33 +0000
+++ tests/unit-tests/scene/test_application_session.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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 as
@@ -69,10 +69,13 @@
     EXPECT_CALL(listener, destroying_surface(_, _))
         .Times(1);
 
-    ms::ApplicationSession session(mt::fake_shared(surface_factory), "Foo",
-                                    std::make_shared<mtd::NullSnapshotStrategy>(),
-                                    mt::fake_shared(listener),
-                                    mt::fake_shared(sender));
+    ms::ApplicationSession session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        mt::fake_shared(listener),
+        mt::fake_shared(sender));
 
     msh::SurfaceCreationParameters params;
     auto surf = session.create_surface(params);
@@ -97,9 +100,13 @@
     EXPECT_CALL(listener, destroying_surface(_, _)).Times(1);
 
     {
-        ms::ApplicationSession session(mt::fake_shared(surface_factory), "Foo",
-            std::make_shared<mtd::NullSnapshotStrategy>(), mt::fake_shared(listener),
-                mt::fake_shared(sender));
+        ms::ApplicationSession session(
+            mt::fake_shared(surface_factory),
+            __LINE__,
+            "Foo",
+            std::make_shared<mtd::NullSnapshotStrategy>(),
+            mt::fake_shared(listener),
+            mt::fake_shared(sender));
 
         msh::SurfaceCreationParameters params;
         session.create_surface(params);
@@ -123,9 +130,13 @@
             .WillOnce(Return(make_mock_surface()));
     }
 
-    ms::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo",
-                                        std::make_shared<mtd::NullSnapshotStrategy>(),
-                                        std::make_shared<msh::NullSessionListener>(), mt::fake_shared(sender));
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
 
 
     msh::SurfaceCreationParameters params;
@@ -156,9 +167,13 @@
     mtd::MockSurfaceFactory surface_factory;
     ON_CALL(surface_factory, create_surface(_, _, _, _)).WillByDefault(Return(mock_surface));
 
-    ms::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo",
-                                        std::make_shared<mtd::NullSnapshotStrategy>(),
-                                        std::make_shared<msh::NullSessionListener>(), mt::fake_shared(sender));
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
 
     EXPECT_CALL(surface_factory, create_surface(_, _, _, _));
 
@@ -177,15 +192,20 @@
     app_session.destroy_surface(surf);
 }
 
-TEST(Session, get_invalid_surface_throw_behavior)
+TEST(ApplicationSession, get_invalid_surface_throw_behavior)
 {
     using namespace ::testing;
 
     mtd::NullEventSink sender;
     mtd::MockSurfaceFactory surface_factory;
-    ms::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo",
-                                        std::make_shared<mtd::NullSnapshotStrategy>(),
-                                        std::make_shared<msh::NullSessionListener>(), mt::fake_shared(sender));
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
+
     mf::SurfaceId invalid_surface_id(1);
 
     EXPECT_THROW({
@@ -193,15 +213,20 @@
     }, std::runtime_error);
 }
 
-TEST(Session, destroy_invalid_surface_throw_behavior)
+TEST(ApplicationSession, destroy_invalid_surface_throw_behavior)
 {
     using namespace ::testing;
 
     mtd::NullEventSink sender;
     mtd::MockSurfaceFactory surface_factory;
-    ms::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo",
-                                        std::make_shared<mtd::NullSnapshotStrategy>(),
-                                        std::make_shared<msh::NullSessionListener>(), mt::fake_shared(sender));
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
+
     mf::SurfaceId invalid_surface_id(1);
 
     EXPECT_THROW({
@@ -209,7 +234,7 @@
     }, std::runtime_error);
 }
 
-TEST(Session, uses_snapshot_strategy)
+TEST(ApplicationSession, uses_snapshot_strategy)
 {
     using namespace ::testing;
 
@@ -226,9 +251,13 @@
     auto snapshot_strategy = std::make_shared<MockSnapshotStrategy>();
     mtd::NullEventSink sender;
     mtd::MockSurfaceFactory surface_factory;
-    ms::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo",
-                                        snapshot_strategy,
-                                        std::make_shared<msh::NullSessionListener>(), mt::fake_shared(sender));
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        snapshot_strategy,
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
 
     EXPECT_CALL(*snapshot_strategy, take_snapshot_of(_,_));
 
@@ -245,7 +274,7 @@
     MOCK_METHOD1(handle_display_config_change, void(mir::graphics::DisplayConfiguration const&));
 };
 }
-TEST(Session, display_config_sender)
+TEST(ApplicationSession, display_config_sender)
 {
     using namespace ::testing;
 
@@ -256,14 +285,18 @@
     EXPECT_CALL(sender, handle_display_config_change(testing::Ref(stub_config)))
         .Times(1);
 
-    ms::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo",
-                                        std::make_shared<mtd::NullSnapshotStrategy>(),
-                                        std::make_shared<msh::NullSessionListener>(), mt::fake_shared(sender));
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
 
     app_session.send_display_config(stub_config);
 }
 
-TEST(Session, lifecycle_event_sender)
+TEST(ApplicationSession, lifecycle_event_sender)
 {
     using namespace ::testing;
 
@@ -271,11 +304,35 @@
     mtd::MockSurfaceFactory surface_factory;
     MockEventSink sender;
 
-    ms::ApplicationSession app_session(mt::fake_shared(surface_factory), "Foo",
-                                        std::make_shared<mtd::NullSnapshotStrategy>(),
-                                        std::make_shared<msh::NullSessionListener>(), mt::fake_shared(sender));
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        __LINE__,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
 
     EXPECT_CALL(sender, handle_lifecycle_event(exp_state)).Times(1);
 
     app_session.set_lifecycle_state(mir_lifecycle_state_will_suspend);
 }
+
+TEST(ApplicationSession, process_id)
+{
+    using namespace ::testing;
+
+    pid_t const pid{__LINE__};
+
+    mtd::MockSurfaceFactory surface_factory;
+    MockEventSink sender;
+
+    ms::ApplicationSession app_session(
+        mt::fake_shared(surface_factory),
+        pid,
+        "Foo",
+        std::make_shared<mtd::NullSnapshotStrategy>(),
+        std::make_shared<msh::NullSessionListener>(),
+        mt::fake_shared(sender));
+
+    EXPECT_THAT(app_session.process_id(), Eq(pid));
+}
 
=== modified file 'tests/unit-tests/scene/test_session_manager.cpp'
--- tests/unit-tests/scene/test_session_manager.cpp	2014-01-13 06:12:33 +0000
+++ tests/unit-tests/scene/test_session_manager.cpp	2014-02-07 14:29:43 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012 Canonical Ltd.
+ * Copyright © 2012-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 as
@@ -104,7 +104,7 @@
     EXPECT_CALL(focus_setter, set_focus_to(_));
     EXPECT_CALL(focus_setter, set_focus_to(std::shared_ptr<msh::Session>())).Times(1);
 
-    auto session = session_manager.open_session("Visual Basic Studio", std::shared_ptr<mf::EventSink>());
+    auto session = session_manager.open_session(__LINE__, "Visual Basic Studio", std::shared_ptr<mf::EventSink>());
     session_manager.close_session(session);
 }
 
@@ -126,7 +126,7 @@
     EXPECT_CALL(focus_setter, set_focus_to(_)).Times(1);
     EXPECT_CALL(focus_setter, set_focus_to(std::shared_ptr<msh::Session>())).Times(1);
 
-    auto session = session_manager.open_session("Visual Basic Studio", std::shared_ptr<mf::EventSink>());
+    auto session = session_manager.open_session(__LINE__, "Visual Basic Studio", std::shared_ptr<mf::EventSink>());
     session->create_surface(msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}));
 
     session_manager.close_session(session);
@@ -140,7 +140,7 @@
     EXPECT_CALL(container, insert_session(_)).Times(1);
     EXPECT_CALL(focus_setter, set_focus_to(_)).WillOnce(SaveArg<0>(&new_session));
 
-    auto session = session_manager.open_session("Visual Basic Studio", std::shared_ptr<mf::EventSink>());
+    auto session = session_manager.open_session(__LINE__, "Visual Basic Studio", std::shared_ptr<mf::EventSink>());
     EXPECT_EQ(session, new_session);
 }
 
@@ -161,7 +161,7 @@
         EXPECT_CALL(focus_setter, set_focus_to(_)).Times(1); // Post Surface creation
     }
 
-    auto session1 = session_manager.open_session("Weather Report", std::shared_ptr<mf::EventSink>());
+    auto session1 = session_manager.open_session(__LINE__, "Weather Report", std::shared_ptr<mf::EventSink>());
     session_manager.create_surface_for(session1, msh::a_surface());
 }
 
@@ -200,7 +200,7 @@
     EXPECT_CALL(session_listener, stopping(_)).Times(1);
     EXPECT_CALL(session_listener, unfocused()).Times(1);
 
-    auto session = session_manager.open_session("XPlane", std::shared_ptr<mf::EventSink>());
+    auto session = session_manager.open_session(__LINE__, "XPlane", std::shared_ptr<mf::EventSink>());
     session_manager.close_session(session);
 }
 
@@ -237,8 +237,8 @@
 
     EXPECT_CALL(session_event_sink, handle_focus_change(_)).Times(2);
 
-    auto session = session_manager.open_session("XPlane", std::shared_ptr<mf::EventSink>());
-    auto session1 = session_manager.open_session("Bla", std::shared_ptr<mf::EventSink>());
+    auto session = session_manager.open_session(__LINE__, "XPlane", std::shared_ptr<mf::EventSink>());
+    auto session1 = session_manager.open_session(__LINE__, "Bla", std::shared_ptr<mf::EventSink>());
 
     Mock::VerifyAndClearExpectations(&session_event_sink);