Merge lp:~phablet-team/trust-store/test-tp-take-2 into lp:trust-store

[Cemil Azizoglu]

DO NOT LAND. Test for debugging lp:1551811.

DO NOT LAND. Test for debugging lp:1551811.

[Cemil Azizoglu (cemil-azizoglu)]

Test for debugging lp:1551811. Not meant for landing.

review: Disapprove

[lp:~phablet-team/trust-store/test-tp-take-2]

151. By Cemil Azizoglu on 2016-03-24

Make socket_file NULL.

152. By Cemil Azizoglu on 2016-03-24

Use /run/user/32011/mir_socket_trusted

153. By Cemil Azizoglu on 2016-03-24

Add some debug info

154. By Cemil Azizoglu on 2016-03-24

Pass NULL

155. By Cemil Azizoglu on 2016-03-29

GL app for TPP

156. By Cemil Azizoglu on 2016-03-29

- Fix package name
- No args needed

157. By Cemil Azizoglu on 2016-03-29

correct package name

158. By Cemil Azizoglu on 2016-03-29

C-style headers

159. By Cemil Azizoglu on 2016-03-29

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99)

160. By Cemil Azizoglu on 2016-03-30

remove sleep()s

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/trust-store-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-amd64-ci/34
    FAILURE: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-armhf-ci/34/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-vivid-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/113/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

160. By Cemil Azizoglu on 2016-03-30

remove sleep()s

159. By Cemil Azizoglu on 2016-03-29

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99)

158. By Cemil Azizoglu on 2016-03-29

C-style headers

157. By Cemil Azizoglu on 2016-03-29

correct package name

156. By Cemil Azizoglu on 2016-03-29

- Fix package name
- No args needed

155. By Cemil Azizoglu on 2016-03-29

GL app for TPP

154. By Cemil Azizoglu on 2016-03-24

Pass NULL

153. By Cemil Azizoglu on 2016-03-24

Add some debug info

152. By Cemil Azizoglu on 2016-03-24

Use /run/user/32011/mir_socket_trusted

151. By Cemil Azizoglu on 2016-03-24

Make socket_file NULL.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-11 20:35:30 +0000
+++ CMakeLists.txt	2016-03-30 00:50:42 +0000
@@ -70,6 +70,8 @@
 
 if (TRUST_STORE_MIR_AGENT_ENABLED)
   pkg_check_modules(MIR_CLIENT mirclient REQUIRED)
+  pkg_check_modules(EGL egl REQUIRED)
+  pkg_check_modules(GLESv2 glesv2 REQUIRED)
 
   include_directories(
     ${MIR_CLIENT_INCLUDE_DIRS}

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-01-11 09:51:51 +0000
+++ src/CMakeLists.txt	2016-03-30 00:50:42 +0000
@@ -25,6 +25,8 @@
 pkg_check_modules(LIBAPPARMOR libapparmor REQUIRED)
 pkg_check_modules(SQLITE3 sqlite3 REQUIRED)
 
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include_directories(
@@ -103,6 +105,7 @@
     core/trust/i18n.cpp
 
     core/trust/mir/prompt_main.cpp
+    core/trust/mir/eglapp.c
   )
 
   qt5_use_modules(trust-prompt Core Gui Qml Quick)
@@ -111,7 +114,10 @@
     trust-prompt
 
     ${Boost_LIBRARIES}
+    ${MIR_CLIENT_LDFLAGS}
     ${PROCESS_CPP_LDFLAGS}
+    ${EGL_LDFLAGS}
+    ${GLESv2_LDFLAGS}
   )
 
   install(

=== added file 'src/core/trust/mir/eglapp.c'
--- src/core/trust/mir/eglapp.c	1970-01-01 00:00:00 +0000
+++ src/core/trust/mir/eglapp.c	2016-03-30 00:50:42 +0000
@@ -0,0 +1,488 @@
+/*
+ * Copyright © 2013 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
+ * published by the Free Software Foundation.
+ *
+ * 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
+ * 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/>.
+ *
+ * Author: Daniel van Vugt <[e-mail]>
+ */
+
+#include "eglapp.h"
+#include "mir_toolkit/mir_client_library.h"
+#include "mir_toolkit/mir_prompt_session.h"
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <time.h>
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+
+#include <xkbcommon/xkbcommon-keysyms.h>
+
+float mir_eglapp_background_opacity = 1.0f;
+
+static const char* appname = "egldemo";
+
+static MirConnection *connection;
+static MirSurface *surface;
+static EGLDisplay egldisplay;
+static EGLSurface eglsurface;
+static volatile sig_atomic_t running = 0;
+
+#define CHECK(_cond, _err) \
+    if (!(_cond)) \
+    { \
+        printf("%s\n", (_err)); \
+        return 0; \
+    }
+
+void mir_eglapp_shutdown(void)
+{
+    eglMakeCurrent(egldisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    eglTerminate(egldisplay);
+    mir_surface_release_sync(surface);
+    surface = NULL;
+    mir_connection_release(connection);
+    connection = NULL;
+}
+
+static void shutdown(int signum)
+{
+    if (running)
+    {
+        running = 0;
+        printf("Signal %d received. Good night.\n", signum);
+    }
+}
+
+mir_eglapp_bool mir_eglapp_running(void)
+{
+    return running;
+}
+
+void mir_eglapp_swap_buffers(void)
+{
+    EGLint width, height;
+
+    if (!running)
+        return;
+
+    eglSwapBuffers(egldisplay, eglsurface);
+
+    /*
+     * Querying the surface (actually the current buffer) dimensions here is
+     * the only truly safe way to be sure that the dimensions we think we
+     * have are those of the buffer being rendered to. But this should be
+     * improved in future; https://bugs.launchpad.net/mir/+bug/1194384
+     */
+    if (eglQuerySurface(egldisplay, eglsurface, EGL_WIDTH, &width) &&
+        eglQuerySurface(egldisplay, eglsurface, EGL_HEIGHT, &height))
+    {
+        glViewport(0, 0, width, height);
+    }
+}
+
+static void mir_eglapp_handle_input_event(MirInputEvent const* event)
+{
+    if (mir_input_event_get_type(event) != mir_input_event_type_key)
+        return;
+    MirKeyboardEvent const* kev = mir_input_event_get_keyboard_event(event);
+    if (mir_keyboard_event_action(kev) != mir_keyboard_action_up)
+        return;
+    if (mir_keyboard_event_key_code(kev) != XKB_KEY_q)
+        return;
+    
+    running = 0;
+}
+
+static void mir_eglapp_handle_surface_event(MirSurfaceEvent const* sev)
+{
+    MirSurfaceAttrib attrib = mir_surface_event_get_attribute(sev);
+    if (attrib != mir_surface_attrib_visibility)
+        return;
+    switch (mir_surface_event_get_attribute_value(sev))
+    {
+    case mir_surface_visibility_exposed:
+        printf("Surface exposed\n");
+        break;
+    case mir_surface_visibility_occluded:
+        printf("Surface occluded\n");
+        break;
+    default:
+        break;
+    }
+}
+
+static void mir_eglapp_handle_event(MirSurface* surface, MirEvent const* ev, void* context)
+{
+    (void) surface;
+    (void) context;
+    
+    switch (mir_event_get_type(ev))
+    {
+    case mir_event_type_input:
+        mir_eglapp_handle_input_event(mir_event_get_input_event(ev));
+        break;
+    case mir_event_type_surface:
+        mir_eglapp_handle_surface_event(mir_event_get_surface_event(ev));
+        break;
+    case mir_event_type_resize:
+        /*
+         * FIXME: https://bugs.launchpad.net/mir/+bug/1194384
+         * It is unsafe to set the width and height here because we're in a
+         * different thread to that doing the rendering. So we either need
+         * support for event queuing (directing them to another thread) or
+         * full single-threaded callbacks. (LP: #1194384).
+         */
+        {
+            MirResizeEvent const* resize = mir_event_get_resize_event(ev);
+            printf("Resized to %dx%d\n",
+                   mir_resize_event_get_width(resize),
+                   mir_resize_event_get_height(resize));
+        }
+        break;
+    case mir_event_type_close_surface:
+        printf("Received close event from server.\n");
+        running = 0;
+        break;
+    default:
+        break;
+    }
+}
+
+static const MirDisplayOutput *find_active_output(
+    const MirDisplayConfiguration *conf)
+{
+    const MirDisplayOutput *output = NULL;
+    int d;
+
+    for (d = 0; d < (int)conf->num_outputs; d++)
+    {
+        const MirDisplayOutput *out = conf->outputs + d;
+
+        if (out->used &&
+            out->connected &&
+            out->num_modes &&
+            out->current_mode < out->num_modes)
+        {
+            output = out;
+            break;
+        }
+    }
+
+    return output;
+}
+
+mir_eglapp_bool mir_eglapp_init(unsigned int *width, unsigned int *height)
+{
+    EGLint ctxattribs[] =
+    {
+        EGL_CONTEXT_CLIENT_VERSION, 2,
+        EGL_NONE
+    };
+    EGLConfig eglconfig;
+    EGLint neglconfigs;
+    EGLContext eglctx;
+    EGLBoolean ok;
+    EGLint swapinterval = 1;
+    unsigned int output_id = mir_display_output_id_invalid;
+    char *mir_socket = NULL;
+    char const* cursor_name = mir_default_cursor_name;
+    unsigned int rgb_bits = 8;
+#if 0
+    if (argc > 1)
+    {
+        int i;
+        for (i = 1; i < argc; i++)
+        {
+            mir_eglapp_bool help = 0;
+            const char *arg = argv[i];
+
+            if (arg[0] == '-')
+            {
+                if (arg[1] == '-' && arg[2] == '\0')
+                    break;
+
+                switch (arg[1])
+                {
+                case 'a':
+                    appname = argv[++i];
+                    break;
+                case 'b':
+                    {
+                        float alpha = 1.0f;
+                        arg += 2;
+                        if (!arg[0] && i < argc-1)
+                        {
+                            i++;
+                            arg = argv[i];
+                        }
+                        if (sscanf(arg, "%f", &alpha) == 1)
+                        {
+                            mir_eglapp_background_opacity = alpha;
+                        }
+                        else
+                        {
+                            printf("Invalid opacity value: %s\n", arg);
+                            help = 1;
+                        }
+                    }
+                    break;
+                case 'e':
+                    {
+                        arg += 2;
+                        if (!arg[0] && i < argc-1)
+                        {
+                            ++i;
+                            arg = argv[i];
+                        }
+                        if (sscanf(arg, "%u", &rgb_bits) != 1)
+                        {
+                            printf("Invalid colour channel depth: %s\n", arg);
+                            help = 1;
+                        }
+                    }
+                    break;
+                case 'n':
+                    swapinterval = 0;
+                    break;
+                case 'o':
+                    {
+                        unsigned int the_id = 0;
+                        arg += 2;
+                        if (!arg[0] && i < argc-1)
+                        {
+                            i++;
+                            arg = argv[i];
+                        }
+                        if (sscanf(arg, "%u", &the_id) == 1)
+                        {
+                            output_id = the_id;
+                        }
+                        else
+                        {
+                            printf("Invalid output ID: %s\n", arg);
+                            help = 1;
+                        }
+                    }
+                    break;
+                case 'f':
+                    *width = 0;
+                    *height = 0;
+                    break;
+                case 's':
+                    {
+                        unsigned int w, h;
+                        arg += 2;
+                        if (!arg[0] && i < argc-1)
+                        {
+                            i++;
+                            arg = argv[i];
+                        }
+                        if (sscanf(arg, "%ux%u", &w, &h) == 2)
+                        {
+                            *width = w;
+                            *height = h;
+                        }
+                        else
+                        {
+                            printf("Invalid size: %s\n", arg);
+                            help = 1;
+                        }
+                    }
+                    break;
+                case 'm':
+                    mir_socket = argv[++i];
+                    printf("Mir socket = '%s'\n", mir_socket);
+                    break;
+                case 'c':
+                    cursor_name = argv[++i];
+                    break;
+                case 'q':
+                    {
+                        FILE *unused = freopen("/dev/null", "a", stdout);
+                        (void)unused;
+                        break;
+                    }
+                case 'h':
+                default:
+                    help = 1;
+                    break;
+                }
+            }
+            else
+            {
+                help = 1;
+            }
+
+            if (help)
+            {
+                printf("Usage: %s [<options>]\n"
+                       "  -a name          Set application name\n"
+                       "  -b               Background opacity (0.0 - 1.0)\n"
+                       "  -e               EGL colour channel size in bits\n"
+                       "  -h               Show this help text\n"
+                       "  -f               Force full screen\n"
+                       "  -o ID            Force placement on output monitor ID\n"
+                       "  -n               Don't sync to vblank\n"
+                       "  -m socket        Mir server socket\n"
+                       "  -s WIDTHxHEIGHT  Force surface size\n"
+                       "  -c name          Request cursor image by name\n"
+                       "  -q               Quiet mode (no messages output)\n"
+                       "  --               Ignore all arguments that follow\n"
+                       , argv[0]);
+                return 0;
+            }
+        }
+    }
+#endif
+
+    connection = mir_connect_sync(mir_socket, appname);
+    CHECK(mir_connection_is_valid(connection), "Can't get connection");
+
+    egldisplay = eglGetDisplay(
+                    mir_connection_get_egl_native_display(connection));
+    CHECK(egldisplay != EGL_NO_DISPLAY, "Can't eglGetDisplay");
+
+    ok = eglInitialize(egldisplay, NULL, NULL);
+    CHECK(ok, "Can't eglInitialize");
+
+    EGLint alpha_bits = mir_eglapp_background_opacity == 1.0f ? 0 : rgb_bits;
+    const EGLint attribs[] =
+    {
+        EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+        EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_RED_SIZE, rgb_bits,
+        EGL_GREEN_SIZE, rgb_bits,
+        EGL_BLUE_SIZE, rgb_bits,
+        EGL_ALPHA_SIZE, alpha_bits,
+        EGL_NONE
+    };
+
+    ok = eglChooseConfig(egldisplay, attribs, &eglconfig, 1, &neglconfigs);
+    CHECK(ok, "Could not eglChooseConfig");
+    CHECK(neglconfigs > 0, "No EGL config available");
+
+    MirPixelFormat pixel_format =
+        mir_connection_get_egl_pixel_format(connection, egldisplay, eglconfig);
+
+    printf("Mir chose pixel format %d.\n", pixel_format);
+    if (alpha_bits == 0)
+    {
+        /*
+         * If we are opaque then it's OK to switch pixel format slightly,
+         * to enable bypass/overlays to work. Otherwise the presence of an
+         * alpha channel would prevent them from being used.
+         * It would be really nice if Mesa just gave us the right answer in
+         * the first place though. (LP: #1480755)
+         */
+        if (pixel_format == mir_pixel_format_abgr_8888)
+            pixel_format = mir_pixel_format_xbgr_8888;
+        else if (pixel_format == mir_pixel_format_argb_8888)
+            pixel_format = mir_pixel_format_xrgb_8888;
+    }
+    printf("Using pixel format %d.\n", pixel_format);
+
+    /* eglapps are interested in the screen size, so
+       use mir_connection_create_display_config */
+    MirDisplayConfiguration* display_config =
+        mir_connection_create_display_config(connection);
+
+    const MirDisplayOutput *output = find_active_output(display_config);
+
+    if (output == NULL)
+    {
+        printf("No active outputs found.\n");
+        return 0;
+    }
+
+    const MirDisplayMode *mode = &output->modes[output->current_mode];
+
+    printf("Current active output is %dx%d %+d%+d\n",
+           mode->horizontal_resolution, mode->vertical_resolution,
+           output->position_x, output->position_y);
+
+    if (*width == 0)
+        *width = mode->horizontal_resolution;
+    if (*height == 0)
+        *height = mode->vertical_resolution;
+
+    mir_display_config_destroy(display_config);
+
+    MirSurfaceSpec *spec =
+        mir_connection_create_spec_for_normal_surface(connection, *width, *height, pixel_format);
+
+    CHECK(spec != NULL, "Can't create a surface spec");
+#if 0
+    char const* name = argv[0];
+    for (char const* p = name; *p; p++)
+    {
+        if (*p == '/')
+            name = p + 1;
+    }
+#endif
+    mir_surface_spec_set_name(spec, "JustAtest");
+
+    if (output_id != mir_display_output_id_invalid)
+        mir_surface_spec_set_fullscreen_on_output(spec, output_id);
+
+    surface = mir_surface_create_sync(spec);
+    mir_surface_spec_release(spec);
+
+    CHECK(mir_surface_is_valid(surface), "Can't create a surface");
+
+    mir_surface_set_event_handler(surface, mir_eglapp_handle_event, NULL);
+    
+    MirCursorConfiguration *conf = mir_cursor_configuration_from_name(cursor_name);
+    mir_surface_configure_cursor(surface, conf);
+    mir_cursor_configuration_destroy(conf);
+
+    eglsurface = eglCreateWindowSurface(egldisplay, eglconfig,
+        (EGLNativeWindowType)mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)), NULL);
+    
+    CHECK(eglsurface != EGL_NO_SURFACE, "eglCreateWindowSurface failed");
+
+    eglctx = eglCreateContext(egldisplay, eglconfig, EGL_NO_CONTEXT,
+                              ctxattribs);
+    CHECK(eglctx != EGL_NO_CONTEXT, "eglCreateContext failed");
+
+    ok = eglMakeCurrent(egldisplay, eglsurface, eglsurface, eglctx);
+    CHECK(ok, "Can't eglMakeCurrent");
+
+    signal(SIGINT, shutdown);
+    signal(SIGTERM, shutdown);
+    signal(SIGHUP, shutdown);
+
+    printf("Surface %d DPI\n", mir_surface_get_dpi(surface));
+    eglSwapInterval(egldisplay, swapinterval);
+
+    running = 1;
+
+    return 1;
+}
+
+struct MirConnection* mir_eglapp_native_connection()
+{
+    return connection;
+}
+
+struct MirSurface* mir_eglapp_native_surface()
+{
+    return surface;
+}

=== added file 'src/core/trust/mir/eglapp.h'
--- src/core/trust/mir/eglapp.h	1970-01-01 00:00:00 +0000
+++ src/core/trust/mir/eglapp.h	2016-03-30 00:50:42 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2013 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
+ * published by the Free Software Foundation.
+ *
+ * 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
+ * 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/>.
+ *
+ * Author: Daniel van Vugt <[e-mail]>
+ */
+
+#ifndef __EGLAPP_H__
+#define __EGLAPP_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef int mir_eglapp_bool;
+struct MirConnection;
+struct MirSurface;
+
+extern float mir_eglapp_background_opacity;
+
+mir_eglapp_bool mir_eglapp_init(unsigned int *width, unsigned int *height);
+void            mir_eglapp_swap_buffers(void);
+mir_eglapp_bool mir_eglapp_running(void);
+void            mir_eglapp_shutdown(void);
+
+struct MirConnection* mir_eglapp_native_connection();
+struct MirSurface*    mir_eglapp_native_surface();
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== modified file 'src/core/trust/mir/prompt_main.cpp'
--- src/core/trust/mir/prompt_main.cpp	2015-11-26 15:25:34 +0000
+++ src/core/trust/mir/prompt_main.cpp	2016-03-30 00:50:42 +0000
@@ -36,10 +36,16 @@
 
 #include <core/posix/this_process.h>
 
+#include <mirclient/mir_toolkit/mir_client_library.h>
+
 #include "prompt_config.h"
 #include "prompt_main.h"
 
 #include <iostream>
+extern "C"
+{
+#include "eglapp.h"
+}
 
 namespace cli = core::trust::mir::cli;
 namespace env = core::trust::mir::env;
@@ -176,7 +182,60 @@
         }
     });
 
-    // We already parsed the command line arguments and do not parse them
+#if 0
+    auto connection = mir_connect_sync(/* "/run/user/32011/mir_socket" */ NULL, "ThisIsJustATest");
+
+    if (not mir_connection_is_valid(connection))
+    {
+        std::cerr << "Connection not valid" << std::endl;
+        return EXIT_FAILURE;
+    }
+    std::cout << "Succesful connection" << std::endl;
+
+    mir_connection_release(connection);
+    std::cout << "Releasing connection" << std::endl;
+    return EXIT_SUCCESS;
+#else
+    unsigned int width = 0, height = 0;
+
+    if (!mir_eglapp_init(&width, &height))
+    {
+        std::cerr << "Cannot init egl app" << std::endl;
+        return EXIT_FAILURE;
+    }
+    std::cout << "Succesfully inited egl app" << std::endl;
+
+    typedef struct Color
+    {
+        GLfloat r, g, b, a;
+    } Color;
+
+
+    float const opacity = mir_eglapp_background_opacity;
+    Color red = {opacity, 0.0f, 0.0f, opacity};
+    Color green = {0.0f, opacity, 0.0f, opacity};
+    Color blue = {0.0f, 0.0f, opacity, opacity};
+
+    for (unsigned i=0; i<20; i++)
+    {
+        glClearColor(red.r, red.g, red.b, red.a);
+        glClear(GL_COLOR_BUFFER_BIT);
+        mir_eglapp_swap_buffers();
+
+        glClearColor(green.r, green.g, green.b, green.a);
+        glClear(GL_COLOR_BUFFER_BIT);
+        mir_eglapp_swap_buffers();
+
+        glClearColor(blue.r, blue.g, blue.b, blue.a);
+        glClear(GL_COLOR_BUFFER_BIT);
+        mir_eglapp_swap_buffers();
+    }
+
+    mir_eglapp_shutdown();
+    return EXIT_SUCCESS;
+#endif
+
+    /*// We already parsed the command line arguments and do not parse them
     // to the application.
     QGuiApplication app{argc, argv};
 
@@ -227,7 +286,7 @@
                 &signal_trap,
                 SLOT(quit(int)));
 
-    return app.exec();
+    return app.exec();*/
 }
 
 #include "prompt_main.moc"