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.

[Zsombor Egri (zsombi)]

Looks good, thanks!

review: Approve

[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/52/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6741/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/52/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/1488/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6742/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1488/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-devel/1272/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6743/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1272/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/1481/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6745/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1481/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/1238/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6746/console

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

review: Approve (continuous-integration)

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

review: Approve (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/549/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1485/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1492/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1276/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1242/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/56/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/840/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6769/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6753
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6754
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6755
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6758

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== 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:21:44 +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:21:44 +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:21:44 +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/overlay.cpp'
--- src/UbuntuMetrics/overlay.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuMetrics/overlay.cpp	2016-09-22 14:21:44 +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:21:44 +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:21:44 +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