Merge lp:~albaguirre/ubuntu-performance-tests/use-lttng-tracepoints-mir-app into lp:ubuntu-performance-tests

[Alberto Aguirre]

Add lttng tracepoints and make surface orange.

[lp:~albaguirre/ubuntu-performance-tests/use-lttng-tracepoints-mir-app]

44. By Alberto Aguirre on 2016-07-01

Add desktop file

=== modified file 'utils/apps/src/simple-mir-app/CMakeLists.txt'
--- utils/apps/src/simple-mir-app/CMakeLists.txt	2016-06-02 18:02:55 +0000
+++ utils/apps/src/simple-mir-app/CMakeLists.txt	2016-07-01 18:08:13 +0000
@@ -18,11 +18,16 @@
 cmake_minimum_required(VERSION 3.0)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread -g -Werror -Wall -pedantic -Wextra -fPIC")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -std=c++14 -Werror -Wall -fno-strict-aliasing -pedantic -Wnon-virtual-dtor -Wextra -fPIC")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Werror -Wall -Wextra -std=c11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -g -std=c++14 -Werror -Wall -pedantic -Wnon-virtual-dtor -Wextra")
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+#Needed for generated files from lttng-gen-tp
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 include(FindPkgConfig)
 #find_package(EGL REQUIRED)
 pkg_check_modules(MIRCLIENT mirclient REQUIRED)
 pkg_check_modules(PLATFORM_API ubuntu-platform-api REQUIRED)
+pkg_check_modules(LTTNG lttng-ust)
 add_subdirectory(src/)

=== added directory 'utils/apps/src/simple-mir-app/cmake'
=== added file 'utils/apps/src/simple-mir-app/cmake/UseLttngGenTp.cmake'
--- utils/apps/src/simple-mir-app/cmake/UseLttngGenTp.cmake	1970-01-01 00:00:00 +0000
+++ utils/apps/src/simple-mir-app/cmake/UseLttngGenTp.cmake	2016-07-01 18:08:13 +0000
@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 2.6)
+if(POLICY CMP0011)
+ cmake_policy(SET CMP0011 NEW)
+endif(POLICY CMP0011)
+
+find_program(LTTNG_GEN_TP NAMES lttng-gen-tp DOC "lttng-gen-tp executable")
+if(NOT LTTNG_GEN_TP)
+ message(FATAL_ERROR "Excutable lttng-gen-top not found")
+endif()
+
+function(add_lttng_gen_tp)
+ set(_one_value NAME)
+ cmake_parse_arguments (arg "" "${_one_value}" "" ${ARGN})
+
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c"
+ COMMAND "${LTTNG_GEN_TP}"
+ -o "${arg_NAME}.h"
+ -o "${arg_NAME}.c"
+ "${CMAKE_CURRENT_SOURCE_DIR}/${arg_NAME}.tp"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS "${arg_NAME}.tp"
+ )
+endfunction(add_lttng_gen_tp)
\ No newline at end of file

=== modified file 'utils/apps/src/simple-mir-app/debian/control'
--- utils/apps/src/simple-mir-app/debian/control	2016-06-02 18:02:55 +0000
+++ utils/apps/src/simple-mir-app/debian/control	2016-07-01 18:08:13 +0000
@@ -7,6 +7,7 @@
                pkg-config,
                libmirclient-dev,
                libubuntu-application-api-dev,
+               liblttng-ust-dev,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-performance-tests
 Vcs-Bzr: lp:ubuntu-performance-tests

=== added file 'utils/apps/src/simple-mir-app/simple-mir-app.desktop'
--- utils/apps/src/simple-mir-app/simple-mir-app.desktop	1970-01-01 00:00:00 +0000
+++ utils/apps/src/simple-mir-app/simple-mir-app.desktop	2016-07-01 18:08:13 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Simple Mir App
+Exec=/home/phablet/simple-mir-app
+Icon=
+Categories=Utility
+X-Ubuntu-Touch=true

=== modified file 'utils/apps/src/simple-mir-app/src/CMakeLists.txt'
--- utils/apps/src/simple-mir-app/src/CMakeLists.txt	2016-06-02 18:02:55 +0000
+++ utils/apps/src/simple-mir-app/src/CMakeLists.txt	2016-07-01 18:08:13 +0000
@@ -1,18 +1,27 @@
 include_directories(
     ${MIRCLIENT_INCLUDE_DIRS}
     ${PLATFORM_API_INCLUDE_DIRS}
+    ${LTTNG_INCLUDE_DIRS}
 )
 
-add_executable(simple-mir-app simple.cpp)
+add_executable(simple-mir-app
+    simple.cpp
+    application.cpp
+    tracepoints.c
+)
 
 target_link_libraries(
     simple-mir-app
 
     ${MIRCLIENT_LDFLAGS}
     ${PLATFORM_API_LDFLAGS}
+    ${LTTNG_LIBRARIES}
 )
 
 install(TARGETS
     simple-mir-app
     DESTINATION bin
 )
+
+include(UseLttngGenTp)
+add_lttng_gen_tp(NAME tracepoints)

=== added file 'utils/apps/src/simple-mir-app/src/application.cpp'
--- utils/apps/src/simple-mir-app/src/application.cpp	1970-01-01 00:00:00 +0000
+++ utils/apps/src/simple-mir-app/src/application.cpp	2016-07-01 18:08:13 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2016 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/>.
+ *
+ */
+
+#include "application.h"
+
+#include <ubuntu/application/id.h>
+
+#include <iostream>
+#include <stdexcept>
+#include <string>
+
+ubuntu::perftest::Application::Application(int argc, char *argv[]) :
+    delegate{u_application_lifecycle_delegate_new()}
+{
+    u_application_lifecycle_delegate_set_application_resumed_cb(delegate, &Application::resume);
+    u_application_lifecycle_delegate_set_application_about_to_stop_cb(delegate, &Application::stop);
+    u_application_lifecycle_delegate_set_context(delegate, this);
+
+    std::string name{"Simple Native App"};
+    auto id = u_application_id_new_from_stringn(name.c_str(), name.length());
+    auto description = u_application_description_new();
+    u_application_description_set_application_id(description, id);
+    u_application_description_set_application_lifecycle_delegate(description, delegate);
+
+    auto options = u_application_options_new_from_cmd_line(argc, argv);
+    instance = u_application_instance_new_from_description_with_options(description, options);
+
+    u_application_options_destroy(options);
+    u_application_description_destroy(description);
+
+    if (instance == nullptr)
+        throw std::runtime_error("Could not create ubuntu app instance!");
+}
+
+ubuntu::perftest::Application::~Application()
+{
+    //FIXME: The symbol below is not exposed in papi library
+    //u_application_instance_unref(instance);
+    u_application_lifecycle_delegate_unref(delegate);
+}
+
+MirConnection* ubuntu::perftest::Application::mir_connection()
+{
+    return u_application_instance_get_mir_connection(instance);
+}
+
+void ubuntu::perftest::Application::resume(UApplicationOptions const*, void*)
+{
+    std::cout << "Resuming" << std::endl;
+}
+
+void ubuntu::perftest::Application::stop(UApplicationArchive*, void*)
+{
+    std::cout << "Stopping" << std::endl;
+}

=== added file 'utils/apps/src/simple-mir-app/src/application.h'
--- utils/apps/src/simple-mir-app/src/application.h	1970-01-01 00:00:00 +0000
+++ utils/apps/src/simple-mir-app/src/application.h	2016-07-01 18:08:13 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2016 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/>.
+ *
+ */
+
+#include <ubuntu/application/description.h>
+#include <ubuntu/application/options.h>
+#include <ubuntu/application/lifecycle_delegate.h>
+#include <ubuntu/application/instance.h>
+
+namespace ubuntu
+{
+namespace perftest
+{
+class Application
+{
+public:
+    Application(int argc, char *argv[]);
+    ~Application();
+
+    MirConnection* mir_connection();
+
+private:
+    UApplicationLifecycleDelegate* delegate;
+    UApplicationInstance* instance;
+    
+    static void resume(UApplicationOptions const*, void*);
+    static void stop(UApplicationArchive*, void*);
+};
+}
+}

=== modified file 'utils/apps/src/simple-mir-app/src/simple.cpp'
--- utils/apps/src/simple-mir-app/src/simple.cpp	2016-06-02 18:02:55 +0000
+++ utils/apps/src/simple-mir-app/src/simple.cpp	2016-07-01 18:08:13 +0000
@@ -15,6 +15,9 @@
  *
  */
 
+#include "application.h"
+#include "tracepoints.h"
+
 #include <ubuntu/application/id.h>
 #include <ubuntu/application/description.h>
 #include <ubuntu/application/options.h>
@@ -23,12 +26,17 @@
 
 #include <memory>
 #include <iostream>
-
 #include <stdexcept>
 
+#include <signal.h>
+
 namespace
 {
 
+using MirSurfaceSpecUp = std::unique_ptr<MirSurfaceSpec, void(*)(MirSurfaceSpec *)>;
+using MirDisplayConfigUp = std::unique_ptr<MirDisplayConfiguration, void(*)(MirDisplayConfiguration *)>;
+using MirSurfaceUp = std::unique_ptr<MirSurface, void(*)(MirSurface*)>;
+
 MirPixelFormat find_default_pixel_format(MirConnection* connection)
 {
     MirPixelFormat pixel_format = mir_pixel_format_invalid;
@@ -41,6 +49,20 @@
     return pixel_format;
 }
 
+auto find_active_mode(MirConnection* connection)
+{
+    MirDisplayConfigUp display_config{mir_connection_create_display_config(connection), mir_display_config_destroy};
+    auto conf = display_config.get();
+    for (decltype(conf->num_outputs) d = 0; d < conf->num_outputs; d++)
+    {
+        auto out = conf->outputs + d;
+        if (out->used && out->connected && out->num_modes && out->current_mode < out->num_modes)
+            return out->modes[out->current_mode];
+    }
+
+    throw std::runtime_error("No active outputs found");
+}
+
 class NormalSpec
 {
 public:
@@ -52,13 +74,14 @@
     operator MirSurfaceSpec*() { return spec.get(); }
 
 private:
-    std::unique_ptr<MirSurfaceSpec, void(*)(MirSurfaceSpec *)> spec;
+    MirSurfaceSpecUp spec;
 };
 
 MirSurface* make_surface(MirConnection* connection)
 {
     auto pixel_format = find_default_pixel_format(connection);
-    NormalSpec spec(connection, 640, 480, pixel_format);
+    auto mode = find_active_mode(connection);
+    NormalSpec spec(connection, mode.horizontal_resolution, mode.vertical_resolution, pixel_format);
     return mir_surface_create_sync(spec);
 }
 
@@ -74,93 +97,81 @@
         }
     }
 
+    void draw()
+    {
+        auto stream = get_stream();
+
+        MirGraphicsRegion region;
+        mir_buffer_stream_get_graphics_region(stream, &region);
+
+        uint32_t const color = 0xFF2448DD; //orange
+        uint8_t* line_addr = reinterpret_cast<uint8_t*>(region.vaddr);
+        for (int y = 0; y < region.height; y++)
+        {
+            uint32_t* pixel_addr = reinterpret_cast<uint32_t*>(line_addr);
+            line_addr += region.stride;
+            for (int x = 0; x < region.width; x++)
+            {
+                *pixel_addr = color;
+                pixel_addr++;
+            }
+        }
+    }
+
     void swap_buffers()
     {
+        auto stream = get_stream();
+        mir_buffer_stream_swap_buffers_sync(stream);
+    }
+
+private:
+    MirBufferStream* get_stream()
+    {
         auto stream = mir_surface_get_buffer_stream(surface.get());
         if (!mir_buffer_stream_is_valid(stream))
         {
             throw std::runtime_error(mir_buffer_stream_get_error_message(stream));
         }
-        mir_buffer_stream_swap_buffers_sync(stream);
-    }
-
-private:
-    std::unique_ptr<MirSurface, void(*)(MirSurface*)> surface;
-};
-
-class Application
-{
-public:
-    Application(int argc, char *argv[]) :
-        delegate{u_application_lifecycle_delegate_new()}
-    {
-        u_application_lifecycle_delegate_set_application_resumed_cb(delegate, &Application::resume);
-        u_application_lifecycle_delegate_set_application_about_to_stop_cb(delegate, &Application::stop);
-        u_application_lifecycle_delegate_set_context(delegate, this);
-
-        std::string name{"Simple Native App"};
-        auto id = u_application_id_new_from_stringn(name.c_str(), name.length());
-        auto description = u_application_description_new();
-        u_application_description_set_application_id(description, id);
-        u_application_description_set_application_lifecycle_delegate(description, delegate);
-
-        auto options = u_application_options_new_from_cmd_line(argc, argv);
-        instance = u_application_instance_new_from_description_with_options(description, options);
-
-        u_application_options_destroy(options);
-        u_application_description_destroy(description);
-
-        if (instance == nullptr)
-            throw std::runtime_error("Could not create ubuntu app instance!");
-    }
-
-    ~Application()
-    {
-        //FIXME: The symbol below is not exposed in papi library
-        //u_application_instance_unref(instance);
-        u_application_lifecycle_delegate_unref(delegate);
-    }
-
-    auto make_surface()
-    {
-        auto connection = u_application_instance_get_mir_connection(instance);
-        return std::make_unique<Surface>(connection);
-    }
-
-    static void resume(UApplicationOptions const*, void*)
-    {
-        std::cout << "Resuming" << std::endl;
-    }
-
-    static void stop(UApplicationArchive*, void*)
-    {
-        std::cout << "Stopping" << std::endl;
-    }
-
-private:
-    UApplicationLifecycleDelegate* delegate;
-    UApplicationInstance* instance;
-};
-
-void print_current_time(void)
-{
-    struct timespec spec;
-    clock_gettime(CLOCK_REALTIME, &spec);
-    std::cout << "time after swap(sec:nanosec) - " << spec.tv_sec;
-    std::cout << ":" << spec.tv_nsec << std::endl;
+        return stream;
+    }
+    MirSurfaceUp surface;
+};
+
+void wait_for_signal()
+{
+    sigset_t sigs;
+    sigemptyset(&sigs);
+
+    sigaddset(&sigs, SIGINT);
+    sigaddset(&sigs, SIGTERM);
+    sigaddset(&sigs, SIGHUP);
+
+    sigprocmask(SIG_BLOCK, &sigs, nullptr);
+
+    int signum;
+    sigwait(&sigs, &signum);
+    std::cout << "Signal " << signum << " received. Exiting." << std::endl;
 }
 }
 
 int main(int argc, char *argv[])
 try
 {
-    Application app(argc, argv);
-
-    auto surface = app.make_surface();
-    surface->swap_buffers();
-
-    print_current_time();
-    std::cout << "Done." << std::endl;
+    tracepoint(mirApp, start);
+    ubuntu::perftest::Application app(argc, argv);
+    tracepoint(mirApp, papiInitialized);
+
+    Surface surface{app.mir_connection()};
+    tracepoint(mirApp, surfaceCreated);
+
+    surface.draw();
+    tracepoint(mirApp, surfaceDrawn);
+
+    surface.swap_buffers();
+    tracepoint(mirApp, surfaceSwapped);
+
+    wait_for_signal();
+;
 }
 catch(std::exception const& e)
 {

=== added file 'utils/apps/src/simple-mir-app/src/tracepoints.tp'
--- utils/apps/src/simple-mir-app/src/tracepoints.tp	1970-01-01 00:00:00 +0000
+++ utils/apps/src/simple-mir-app/src/tracepoints.tp	2016-07-01 18:08:13 +0000
@@ -0,0 +1,5 @@
+TRACEPOINT_EVENT(mirApp, start, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(mirApp, papiInitialized, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(mirApp, surfaceCreated, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(mirApp, surfaceDrawn, TP_ARGS(0), TP_FIELDS())
+TRACEPOINT_EVENT(mirApp, surfaceSwapped, TP_ARGS(0), TP_FIELDS())