Merge lp:~alan-griffiths/unity-system-compositor/private-mir-connection into lp:unity-system-compositor

[Alan Griffiths]

Fix conflicts in lp:~robert-ancell/lightdm/private-mir-connection

Fix conflicts in lp:~robert-ancell/lightdm/private-mir-connection

Unmerged revisions

112. By Alan Griffiths on 2014-01-24

merge lp:~robert-ancell/unity-system-compositor/private-mir-connection

=== modified file 'debian/control'
--- debian/control	2014-01-02 21:28:20 +0000
+++ debian/control	2014-01-24 15:20:41 +0000
@@ -32,6 +32,8 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         xserver-xorg-xmir,
+Breaks: lightdm (<< 1.8.2)
 Description: System compositor for Ubuntu
  System compositor used by the Mir display server in Ubuntu. If the Unity
  System Compositor can't start, LightDM will fallback to plain Xorg display

=== modified file 'src/dm_connection.cpp'
--- src/dm_connection.cpp	2013-07-09 19:18:59 +0000
+++ src/dm_connection.cpp	2014-01-24 15:20:41 +0000
@@ -37,7 +37,7 @@
 
 void DMConnection::read_header()
 {
-    ba::async_read(from_dm_pipe,
+    ba::async_read(dm_socket,
                    ba::buffer(message_header_bytes),
                    boost::bind(&DMConnection::on_read_header,
                                this,
@@ -49,7 +49,7 @@
     if (!ec)
     {
         size_t const payload_length = message_header_bytes[2] << 8 | message_header_bytes[3];
-        ba::async_read(from_dm_pipe,
+        ba::async_read(dm_socket,
                        message_payload_buffer,
                        ba::transfer_exactly(payload_length),
                        boost::bind(&DMConnection::on_read_payload,
@@ -100,6 +100,17 @@
                 handler->set_next_session(client_name);
             break;
         }
+        case USCMessageID::add_session:
+        {
+            std::cerr << "add_session" << std::endl;
+            if (handler)
+            {
+                auto fd = handler->add_session();
+                send(USCMessageID::session_added, "");
+                send_fd(fd);
+            }
+            break;
+        }
         default:
             std::cerr << "Ignoring unknown message " << (uint16_t) message_id << " with " << payload_length << " octets" << std::endl;
             break;
@@ -128,5 +139,39 @@
     std::copy(body.begin(), body.end(), write_buffer.begin() + sizeof header_bytes);
 
     // FIXME: Make asynchronous
-    ba::write(to_dm_pipe, ba::buffer(write_buffer));
+    ba::write(dm_socket, ba::buffer(write_buffer));
+}
+
+void DMConnection::send_fd(int fd)
+{
+    char dummy_iov_data = '\0';
+    struct iovec iov;
+    struct msghdr header;
+    struct cmsghdr *control_header;
+    int *control_data;
+    void *message;
+
+    /* Send dummy data */
+    iov.iov_base = &dummy_iov_data;
+    iov.iov_len = 1;
+
+    /* Send control message with file descriptor */
+    memset (&header, 0, sizeof (header));
+    header.msg_iov = &iov;
+    header.msg_iovlen = 1;
+    header.msg_controllen = sizeof (struct cmsghdr) + sizeof (int);
+    message = malloc (header.msg_controllen);
+    header.msg_control = message;
+    control_header = CMSG_FIRSTHDR (&header);
+    control_header->cmsg_len = header.msg_controllen;
+    control_header->cmsg_level = SOL_SOCKET;
+    control_header->cmsg_type = SCM_RIGHTS;
+
+    control_data = (int*) CMSG_DATA (control_header);
+    *control_data = fd;
+
+    if (sendmsg (dm_socket.native_handle(), &header, 0) < 0)
+        std::cerr << "Failed to send file descriptor: " << strerror (errno) << std::endl;
+  
+    free (message);
 }

=== modified file 'src/dm_connection.h'
--- src/dm_connection.h	2013-11-13 13:53:51 +0000
+++ src/dm_connection.h	2014-01-24 15:20:41 +0000
@@ -26,6 +26,7 @@
 public:
     virtual void set_active_session(std::string client_name) = 0;
     virtual void set_next_session(std::string client_name) = 0;
+    virtual int add_session() = 0;
 };
 
 enum class USCMessageID
@@ -36,14 +37,15 @@
     session_connected = 3,
     set_active_session = 4,
     set_next_session = 5,
+    add_session = 6,
+    session_added = 7,
 };
 
 class DMConnection
 {
 public:
-    DMConnection(boost::asio::io_service& io_service, int from_dm_fd, int to_dm_fd) :
-        from_dm_pipe(io_service, from_dm_fd),
-        to_dm_pipe(io_service, to_dm_fd) {};
+    DMConnection(boost::asio::io_service& io_service, int dm_socket_fd) :
+        dm_socket(io_service, dm_socket_fd) {};
 
     void set_handler(DMMessageHandler *handler)
     {
@@ -56,8 +58,7 @@
 
 private:
     DMMessageHandler *handler;
-    boost::asio::posix::stream_descriptor from_dm_pipe;
-    boost::asio::posix::stream_descriptor to_dm_pipe;
+    boost::asio::posix::stream_descriptor dm_socket;
     static size_t const size_of_header = 4;
     unsigned char message_header_bytes[size_of_header];
     boost::asio::streambuf message_payload_buffer;
@@ -67,6 +68,7 @@
     void on_read_header(const boost::system::error_code& ec);
     void on_read_payload(const boost::system::error_code& ec);
     void send(USCMessageID id, std::string const& body);
+    void send_fd(int fd);
 };
 
 #endif /* DM_CONNECTION_H_ */

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-11-22 16:53:52 +0000
+++ src/system_compositor.cpp	2014-01-24 15:20:41 +0000
@@ -27,6 +27,7 @@
 #include <mir/shell/session.h>
 #include <mir/shell/focus_controller.h>
 #include <mir/input/cursor_listener.h>
+#include <mir/frontend/connector.h>
 
 #include <cerrno>
 #include <iostream>
@@ -91,21 +92,15 @@
         : mir::DefaultServerConfiguration(argc, (char const **)argv), compositor{compositor}
     {
         add_options()
-            ("from-dm-fd", po::value<int>(),  "File descriptor of read end of pipe from display manager [int]")
-            ("to-dm-fd", po::value<int>(),  "File descriptor of write end of pipe to display manager [int]")
+            ("dm-socket-fd", po::value<int>(),  "File descriptor of socket to display manager [int]")
             ("blacklist", po::value<std::string>(), "Video blacklist regex to use")
             ("version", "Show version of Unity System Compositor")
             ("public-socket", po::value<bool>(), "Make the socket file publicly writable");
     }
 
-    int from_dm_fd()
-    {
-        return the_options()->get("from-dm-fd", -1);
-    }
-
-    int to_dm_fd()
-    {
-        return the_options()->get("to-dm-fd", -1);
+    int dm_socket_fd()
+    {
+        return the_options()->get("dm-socket-fd", -1);
     }
 
     bool show_version()
@@ -237,7 +232,7 @@
         return;
     }
 
-    dm_connection = std::make_shared<DMConnection>(io_service, config->from_dm_fd(), config->to_dm_fd());
+    dm_connection = std::make_shared<DMConnection>(io_service, config->dm_socket_fd());
 
     struct ScopeGuard
     {
@@ -312,6 +307,11 @@
         std::cerr << "Unable to set next session, unknown client name " << client_name << std::endl;
 }
 
+int SystemCompositor::add_session()
+{
+    return config->the_connector()->client_socket_fd();
+}
+
 void SystemCompositor::main()
 {
     // Make socket world-writable, since users need to talk to us.  No worries

=== modified file 'src/system_compositor.h'
--- src/system_compositor.h	2013-11-22 16:53:52 +0000
+++ src/system_compositor.h	2014-01-24 15:20:41 +0000
@@ -42,6 +42,7 @@
 
     void set_active_session(std::string client_name);
     void set_next_session(std::string client_name);
+    int add_session();
     void main();
     void qt_main(int argc, char **argv);
 };