Merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-aligned-alloc-for-apple-and-win32 into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Added aligned alloc support for Apple and Windows.

Added aligned alloc support for Apple and Windows.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2125
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1271/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6738/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1271/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2125
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1487/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6739/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1487/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2125
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1237/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6740/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1237/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2125
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1480/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6744/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1480/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2125
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/51/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6749/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/51/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2125
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/796/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1480
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1480/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1487
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1271
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1237
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/51
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6750/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6744
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6739
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6738
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6740
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6749

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/796/rebuild

review: Approve (continuous-integration)

Unmerged revisions

=== modified file '.qmake.conf'
--- .qmake.conf	2016-09-15 15:25:54 +0000
+++ .qmake.conf	2016-09-22 14:19:53 +0000
@@ -15,6 +15,15 @@
 
 exists($$PWD/../qt.pro): CONFIG += qt_submodule_build
 
+# Set QT_CLANG_*_VERSION if not defined to make internal qmake features
+# (warnings_are_errors and others) work since these variables are defined only
+# when clang is chosen as compiler at configure time. The regexp is based on the
+# Qt one used in the qtbase configure script.
+clang:!defined(QT_CLANG_MAJOR_VERSION, var) {
+    QT_CLANG_MAJOR_VERSION = $$system("clang -v 2>&1 | sed -n -E '/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/\1/;p;q;}'")
+    QT_CLANG_MINOR_VERSION = $$system("clang -v 2>&1 | sed -n -E '/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/\2/;p;q;}'")
+}
+
 # FIXME: Fix bug 1606247 and enable the UbuntuToolkit namespace.
 # build UbuntuToolkit without namespace
 DEFINES += UBUNTUTOOLKIT_NO_NAMESPACE

=== modified file 'features/ubuntu_common.prf'
--- features/ubuntu_common.prf	2016-09-15 15:37:57 +0000
+++ features/ubuntu_common.prf	2016-09-22 14:19:53 +0000
@@ -13,27 +13,39 @@
 # order to workaround these issues, we unset these variables and set the
 # different flags apart from -g and -O2 in the right qmake variables. This
 # allows to keep compiling with the Debian flags but in a more flexible way.
-gcc:!qt_submodule_build:!debian_build {
-    QMAKE_CFLAGS = -fstack-protector
-    QMAKE_CXXFLAGS = -fstack-protector
+!qt_submodule_build:!debian_build {
+    gcc:!clang {
+        QMAKE_CFLAGS = -fstack-protector
+        QMAKE_CXXFLAGS = -fstack-protector
+        QMAKE_CXXFLAGS_WARN_ON += -Wdate-time -Wformat -Werror=format-security
+        QMAKE_LFLAGS_SHLIB += -Wl,-z,relro
+        DEFINES += _FORTIFY_SOURCE=2
+        unix:!contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
+    } else {
+        QMAKE_CFLAGS =
+        QMAKE_CXXFLAGS =
+    }
     QMAKE_LFLAGS =
-    QMAKE_CXXFLAGS_WARN_ON += -Wdate-time -Wformat -Werror=format-security
-    QMAKE_LFLAGS_SHLIB += -Wl,-z,relro
-    DEFINES += _FORTIFY_SOURCE=2
-    unix:!contains(QT_CONFIG, reduce_relocations): CONFIG += bsymbolic_functions
 }
 
-# Add suggest-override to warn about overriding virtual functions not marked
-# with the override keyword. Breaks the build when built as a Qt submodule.
-# Should be fixed in Qt 5.6, see https://codereview.qt-project.org/#/c/169969/
-gcc:!qt_submodule_build:greaterThan(QT_GCC_MAJOR_VERSION, 4) {
-    QMAKE_CXXFLAGS_WARN_ON += -Wsuggest-override
+# Warn about overriding virtual functions not marked with the override keyword.
+gcc:!clang {
+    # Breaks the build when built as a Qt submodule. Should be fixed in Qt 5.6,
+    # see https://codereview.qt-project.org/#/c/169969/
+    !qt_submodule_build:!lessThan(QT_GCC_MAJOR_VERSION, 5): \
+        QMAKE_CXXFLAGS_WARN_ON += -Wsuggest-override
+} else {
+    greaterThan(QT_CLANG_MAJOR_VERSION, 3)| \
+        if(equals(QT_CLANG_MAJOR_VERSION, 3):!lessThan(QT_CLANG_MINOR_VERSION, 6)): \
+            QMAKE_CXXFLAGS_WARN_ON += -Winconsistent-missing-override
 }
 
 # Use the 2011 ISO C++ standard plus amendments. Since Qt 5.6, GNU extensions
 # are enabled by default with Clang, GCC and ICC, strict_c++ disables them.
 CONFIG += c++11
-equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 5): CONFIG += strict_c++
+greaterThan(QT_MAJOR_VERSION, 5)| \
+    if(equals(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 6)): \
+        CONFIG += strict_c++
 
 CONFIG += no_keywords
 

=== modified file 'features/ubuntu_qml_plugin.prf'
--- features/ubuntu_qml_plugin.prf	2016-09-15 15:25:54 +0000
+++ features/ubuntu_qml_plugin.prf	2016-09-22 14:19:53 +0000
@@ -72,3 +72,7 @@
     INSTALLS+=autobld_install_qmltypes
     QMAKE_EXTRA_TARGETS += autobld_qmltypes
 }
+
+# warnings_are_errors depending on the compiler version, sometimes it doesn't
+# add the required flags (for instance for recent clang version on old Qt).
+!contains(QMAKE_CXXFLAGS_WARN_ON, -Werror): QMAKE_CXXFLAGS_WARN_ON += -Werror

=== modified file 'features/ubuntu_qt_module.prf'
--- features/ubuntu_qt_module.prf	2016-09-15 15:25:54 +0000
+++ features/ubuntu_qt_module.prf	2016-09-22 14:19:53 +0000
@@ -11,3 +11,7 @@
 CONFIG -= create_cmake
 
 CONFIG += dll
+
+# warnings_are_errors depending on the compiler version, sometimes it doesn't
+# add the required flags (for instance for recent clang version on old Qt).
+!contains(QMAKE_CXXFLAGS_WARN_ON, -Werror): QMAKE_CXXFLAGS_WARN_ON += -Werror

=== modified file 'src/UbuntuMetrics/UbuntuMetrics.pro'
--- src/UbuntuMetrics/UbuntuMetrics.pro	2016-09-12 08:18:53 +0000
+++ src/UbuntuMetrics/UbuntuMetrics.pro	2016-09-22 14:19:53 +0000
@@ -30,6 +30,7 @@
     $$PWD/events.cpp \
     $$PWD/gputimer.cpp \
     $$PWD/logger.cpp \
-    $$PWD/overlay.cpp
+    $$PWD/overlay.cpp \
+    $$PWD/ubuntumetricsglobal.cpp
 
 load(ubuntu_qt_module)

=== modified file 'src/UbuntuMetrics/applicationmonitor.cpp'
--- src/UbuntuMetrics/applicationmonitor.cpp	2016-09-12 09:03:50 +0000
+++ src/UbuntuMetrics/applicationmonitor.cpp	2016-09-22 14:19:53 +0000
@@ -36,7 +36,7 @@
     , m_flags(0)
 {
     m_queue = static_cast<UMEvent*>(
-        aligned_alloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
+        alignedAlloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
 
 #if !defined(QT_NO_DEBUG)
     setObjectName(QStringLiteral("UbuntuMetrics logging"));  // Thread name.

=== modified file 'src/UbuntuMetrics/events.cpp'
--- src/UbuntuMetrics/events.cpp	2016-09-22 10:49:07 +0000
+++ src/UbuntuMetrics/events.cpp	2016-09-22 14:19:53 +0000
@@ -37,9 +37,9 @@
 EventUtilsPrivate::EventUtilsPrivate()
 {
 #if !defined(QT_NO_DEBUG)
-    ASSERT(m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize)));
+    ASSERT(m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize)));
 #else
-    m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize));
+    m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize));
 #endif
     m_cpuTimer.start();
     m_cpuTicks = times(&m_cpuTimes);

=== modified file 'src/UbuntuMetrics/logger.h'
--- src/UbuntuMetrics/logger.h	2016-09-09 17:49:07 +0000
+++ src/UbuntuMetrics/logger.h	2016-09-22 14:19:53 +0000
@@ -22,9 +22,9 @@
 
 #include <UbuntuMetrics/ubuntumetricsglobal.h>
 
-class UMEvent;
 class UMFileLoggerPrivate;
 struct UMLTTNGPlugin;
+struct UMEvent;
 
 // Log events to a specific device.
 class UBUNTU_METRICS_EXPORT UMLogger
@@ -70,7 +70,7 @@
     static UMLTTNGPlugin* m_plugin;
     static bool m_error;
 
-    void* __reserved;
+    Q_DECL_UNUSED_MEMBER void* __reserved;
 };
 
 #endif  // LOGGER_H

=== modified file 'src/UbuntuMetrics/overlay.cpp'
--- src/UbuntuMetrics/overlay.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuMetrics/overlay.cpp	2016-09-22 14:19:53 +0000
@@ -96,7 +96,7 @@
 {
     DASSERT(text);
 
-    m_buffer = aligned_alloc(bufferAlignment, bufferSize);
+    m_buffer = alignedAlloc(bufferAlignment, bufferSize);
     memset(&m_processEvent, 0, sizeof(m_processEvent));
     m_processEvent.type = UMEvent::Process;
 }

=== added file 'src/UbuntuMetrics/ubuntumetricsglobal.cpp'
--- src/UbuntuMetrics/ubuntumetricsglobal.cpp	1970-01-01 00:00:00 +0000
+++ src/UbuntuMetrics/ubuntumetricsglobal.cpp	2016-09-22 14:19:53 +0000
@@ -0,0 +1,34 @@
+// Copyright © 2016 Canonical Ltd.
+// Author: Loïc Molinari <[e-mail]>
+//
+// This file is part of Ubuntu UI Toolkit.
+//
+// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published by the
+// Free Software Foundation; version 3.
+//
+// Ubuntu UI Toolkit 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 Lesser General Public License
+// for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
+
+#include "ubuntumetricsglobal_p.h"
+
+void* alignedAlloc(size_t alignment, size_t size)
+{
+    DASSERT(IS_POWER_OF_TWO(alignment));
+    // DASSERT(((size % alignment) == 0));  // FIXME(loicm) ASSERT doesn't support '%'...
+
+#if defined(__APPLE__)
+    void* pointer;
+    posix_memalign(&pointer, alignment, size);
+    return pointer;
+#elif defined(_WIN32)
+    return _aligned_malloc(size, alignment);
+#else
+    return aligned_alloc(alignment, size);
+#endif
+}

=== modified file 'src/UbuntuMetrics/ubuntumetricsglobal_p.h'
--- src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-09 17:49:07 +0000
+++ src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-22 14:19:53 +0000
@@ -51,4 +51,8 @@
 
 #define UBUNTU_METRICS_PRIVATE_EXPORT UBUNTU_METRICS_EXPORT
 
+// Allocates size bytes and returns an pointer to the aligned memory. alignment
+// must be a power-of-two and size a multiple of alignment.
+void* alignedAlloc(size_t alignment, size_t size);
+
 #endif  // UBUNTUMETRICSGLOBAL_P_H

=== modified file 'src/UbuntuToolkit/unitythemeiconprovider.cpp'
--- src/UbuntuToolkit/unitythemeiconprovider.cpp	2016-09-12 09:03:50 +0000
+++ src/UbuntuToolkit/unitythemeiconprovider.cpp	2016-09-22 14:19:53 +0000
@@ -138,15 +138,13 @@
 
     static QImage loadIcon(const QString &filename, QSize *impsize, const QSize &requestSize)
     {
-        QImage image;
         QImageReader imgio(filename);
 
-        const bool force_scale = imgio.format() == QStringLiteral("svg")
-            || imgio.format() == QStringLiteral("svgz");
-
         if (requestSize.width() > 0 || requestSize.height() > 0) {
+            const bool force_scale = (imgio.format() == "svg") || (imgio.format() == "svgz");
             QSize s = imgio.size();
             qreal ratio = 0.0;
+
             if (requestSize.width() > 0 && (force_scale || requestSize.width() < s.width())) {
                 ratio = qreal(requestSize.width())/s.width();
             }
@@ -165,6 +163,7 @@
         if (impsize)
             *impsize = imgio.scaledSize();
 
+        QImage image;
         if (imgio.read(&image)) {
             if (impsize)
                 *impsize = image.size();