1
=== modified file 'src/UbuntuMetrics/UbuntuMetrics.pro'
2
--- src/UbuntuMetrics/UbuntuMetrics.pro	2016-09-12 08:18:53 +0000
3
+++ src/UbuntuMetrics/UbuntuMetrics.pro	2016-09-22 14:21:44 +0000
4
@@ -30,6 +30,7 @@
5
30
    $$PWD/events.cpp \
30
    $$PWD/events.cpp \
6
31
    $$PWD/gputimer.cpp \
31
    $$PWD/gputimer.cpp \
7
32
    $$PWD/logger.cpp \
32
    $$PWD/logger.cpp \
9
33
    $$PWD/overlay.cpp
33
    $$PWD/overlay.cpp \
10
34
    $$PWD/ubuntumetricsglobal.cpp
11
34
35
12
35
load(ubuntu_qt_module)
36
load(ubuntu_qt_module)
13
36
37
14
=== modified file 'src/UbuntuMetrics/applicationmonitor.cpp'
15
--- src/UbuntuMetrics/applicationmonitor.cpp	2016-09-12 09:03:50 +0000
16
+++ src/UbuntuMetrics/applicationmonitor.cpp	2016-09-22 14:21:44 +0000
17
@@ -36,7 +36,7 @@
18
36
    , m_flags(0)
36
    , m_flags(0)
19
37
{
37
{
20
38
    m_queue = static_cast<UMEvent*>(
38
    m_queue = static_cast<UMEvent*>(
22
39
        aligned_alloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
39
        alignedAlloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
23
40
40
24
41
#if !defined(QT_NO_DEBUG)
41
#if !defined(QT_NO_DEBUG)
25
42
    setObjectName(QStringLiteral("UbuntuMetrics logging"));  // Thread name.
42
    setObjectName(QStringLiteral("UbuntuMetrics logging"));  // Thread name.
26
43
43
27
=== modified file 'src/UbuntuMetrics/events.cpp'
28
--- src/UbuntuMetrics/events.cpp	2016-09-22 10:49:07 +0000
29
+++ src/UbuntuMetrics/events.cpp	2016-09-22 14:21:44 +0000
30
@@ -37,9 +37,9 @@
31
37
EventUtilsPrivate::EventUtilsPrivate()
37
EventUtilsPrivate::EventUtilsPrivate()
32
38
{
38
{
33
39
#if !defined(QT_NO_DEBUG)
39
#if !defined(QT_NO_DEBUG)
35
40
    ASSERT(m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize)));
40
    ASSERT(m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize)));
36
41
#else
41
#else
38
42
    m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize));
42
    m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize));
39
43
#endif
43
#endif
40
44
    m_cpuTimer.start();
44
    m_cpuTimer.start();
41
45
    m_cpuTicks = times(&m_cpuTimes);
45
    m_cpuTicks = times(&m_cpuTimes);
42
46
46
43
=== modified file 'src/UbuntuMetrics/overlay.cpp'
44
--- src/UbuntuMetrics/overlay.cpp	2016-09-09 17:49:07 +0000
45
+++ src/UbuntuMetrics/overlay.cpp	2016-09-22 14:21:44 +0000
46
@@ -96,7 +96,7 @@
47
96
{
96
{
48
97
    DASSERT(text);
97
    DASSERT(text);
49
98
98
51
99
    m_buffer = aligned_alloc(bufferAlignment, bufferSize);
99
    m_buffer = alignedAlloc(bufferAlignment, bufferSize);
52
100
    memset(&m_processEvent, 0, sizeof(m_processEvent));
100
    memset(&m_processEvent, 0, sizeof(m_processEvent));
53
101
    m_processEvent.type = UMEvent::Process;
101
    m_processEvent.type = UMEvent::Process;
54
102
}
102
}
55
103
103
56
=== added file 'src/UbuntuMetrics/ubuntumetricsglobal.cpp'
57
--- src/UbuntuMetrics/ubuntumetricsglobal.cpp	1970-01-01 00:00:00 +0000
58
+++ src/UbuntuMetrics/ubuntumetricsglobal.cpp	2016-09-22 14:21:44 +0000
59
@@ -0,0 +1,34 @@
60
1
// Copyright © 2016 Canonical Ltd.
61
2
// Author: Loïc Molinari <loic.molinari@canonical.com>
62
3
//
63
4
// This file is part of Ubuntu UI Toolkit.
64
5
//
65
6
// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
66
7
// under the terms of the GNU Lesser General Public License as published by the
67
8
// Free Software Foundation; version 3.
68
9
//
69
10
// Ubuntu UI Toolkit is distributed in the hope that it will be useful, but
70
11
// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
71
12
// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
72
13
// for more details.
73
14
//
74
15
// You should have received a copy of the GNU Lesser General Public License
75
16
// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
76
17
77
18
#include "ubuntumetricsglobal_p.h"
78
19
79
20
void* alignedAlloc(size_t alignment, size_t size)
80
21
{
81
22
    DASSERT(IS_POWER_OF_TWO(alignment));
82
23
    // DASSERT(((size % alignment) == 0));  // FIXME(loicm) ASSERT doesn't support '%'...
83
24
84
25
#if defined(__APPLE__)
85
26
    void* pointer;
86
27
    posix_memalign(&pointer, alignment, size);
87
28
    return pointer;
88
29
#elif defined(_WIN32)
89
30
    return _aligned_malloc(size, alignment);
90
31
#else
91
32
    return aligned_alloc(alignment, size);
92
33
#endif
93
34
}
94
0
35
95
=== modified file 'src/UbuntuMetrics/ubuntumetricsglobal_p.h'
96
--- src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-09 17:49:07 +0000
97
+++ src/UbuntuMetrics/ubuntumetricsglobal_p.h	2016-09-22 14:21:44 +0000
98
@@ -51,4 +51,8 @@
99
51
51
100
52
#define UBUNTU_METRICS_PRIVATE_EXPORT UBUNTU_METRICS_EXPORT
52
#define UBUNTU_METRICS_PRIVATE_EXPORT UBUNTU_METRICS_EXPORT
101
53
53
102
54
// Allocates size bytes and returns an pointer to the aligned memory. alignment
103
55
// must be a power-of-two and size a multiple of alignment.
104
56
void* alignedAlloc(size_t alignment, size_t size);
105
57
106
54
#endif  // UBUNTUMETRICSGLOBAL_P_H
58
#endif  // UBUNTUMETRICSGLOBAL_P_H
Status:	Needs review
Proposed branch:	lp:~loic.molinari/ubuntu-ui-toolkit/uitk-aligned-alloc-for-apple-and-win32
Merge into:	lp:ubuntu-ui-toolkit/staging
Prerequisite:	lp:~loic.molinari/ubuntu-ui-toolkit/uitk-linux-clang
Diff against target:	106 lines (+44/-5) 6 files modified src/UbuntuMetrics/UbuntuMetrics.pro (+2/-1) src/UbuntuMetrics/applicationmonitor.cpp (+1/-1) src/UbuntuMetrics/events.cpp (+2/-2) src/UbuntuMetrics/overlay.cpp (+1/-1) src/UbuntuMetrics/ubuntumetricsglobal.cpp (+34/-0) src/UbuntuMetrics/ubuntumetricsglobal_p.h (+4/-0)
To merge this branch:	bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-aligned-alloc-for-apple-and-win32
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration	2016-09-22	Needs Fixing on 2016-09-22
Zsombor Egri		2016-09-22	Approve on 2016-09-22
Review via email: mp+306472@code.launchpad.net
1	=== modified file 'src/UbuntuMetrics/UbuntuMetrics.pro'
2	--- src/UbuntuMetrics/UbuntuMetrics.pro 2016-09-12 08:18:53 +0000
3	+++ src/UbuntuMetrics/UbuntuMetrics.pro 2016-09-22 14:21:44 +0000
4	@@ -30,6 +30,7 @@
5	30	$$PWD/events.cpp \	30	$$PWD/events.cpp \
6	31	$$PWD/gputimer.cpp \	31	$$PWD/gputimer.cpp \
7	32	$$PWD/logger.cpp \	32	$$PWD/logger.cpp \
9	33	$$PWD/overlay.cpp	33	$$PWD/overlay.cpp \
10			34	$$PWD/ubuntumetricsglobal.cpp
11	34		35
12	35	load(ubuntu_qt_module)	36	load(ubuntu_qt_module)
13	36		37
14	=== modified file 'src/UbuntuMetrics/applicationmonitor.cpp'
15	--- src/UbuntuMetrics/applicationmonitor.cpp 2016-09-12 09:03:50 +0000
16	+++ src/UbuntuMetrics/applicationmonitor.cpp 2016-09-22 14:21:44 +0000
17	@@ -36,7 +36,7 @@
18	36	, m_flags(0)	36	, m_flags(0)
19	37	{	37	{
20	38	m_queue = static_cast<UMEvent*>(	38	m_queue = static_cast<UMEvent*>(
22	39	aligned_alloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));	39	alignedAlloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
23	40		40
24	41	#if !defined(QT_NO_DEBUG)	41	#if !defined(QT_NO_DEBUG)
25	42	setObjectName(QStringLiteral("UbuntuMetrics logging")); // Thread name.	42	setObjectName(QStringLiteral("UbuntuMetrics logging")); // Thread name.
26	43		43
27	=== modified file 'src/UbuntuMetrics/events.cpp'
28	--- src/UbuntuMetrics/events.cpp 2016-09-22 10:49:07 +0000
29	+++ src/UbuntuMetrics/events.cpp 2016-09-22 14:21:44 +0000
30	@@ -37,9 +37,9 @@
31	37	EventUtilsPrivate::EventUtilsPrivate()	37	EventUtilsPrivate::EventUtilsPrivate()
32	38	{	38	{
33	39	#if !defined(QT_NO_DEBUG)	39	#if !defined(QT_NO_DEBUG)
35	40	ASSERT(m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize)));	40	ASSERT(m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize)));
36	41	#else	41	#else
38	42	m_buffer = static_cast<char*>(aligned_alloc(bufferAlignment, bufferSize));	42	m_buffer = static_cast<char*>(alignedAlloc(bufferAlignment, bufferSize));
39	43	#endif	43	#endif
40	44	m_cpuTimer.start();	44	m_cpuTimer.start();
41	45	m_cpuTicks = times(&m_cpuTimes);	45	m_cpuTicks = times(&m_cpuTimes);
42	46		46
43	=== modified file 'src/UbuntuMetrics/overlay.cpp'
44	--- src/UbuntuMetrics/overlay.cpp 2016-09-09 17:49:07 +0000
45	+++ src/UbuntuMetrics/overlay.cpp 2016-09-22 14:21:44 +0000
46	@@ -96,7 +96,7 @@
47	96	{	96	{
48	97	DASSERT(text);	97	DASSERT(text);
49	98		98
51	99	m_buffer = aligned_alloc(bufferAlignment, bufferSize);	99	m_buffer = alignedAlloc(bufferAlignment, bufferSize);
52	100	memset(&m_processEvent, 0, sizeof(m_processEvent));	100	memset(&m_processEvent, 0, sizeof(m_processEvent));
53	101	m_processEvent.type = UMEvent::Process;	101	m_processEvent.type = UMEvent::Process;
54	102	}	102	}
55	103		103
56	=== added file 'src/UbuntuMetrics/ubuntumetricsglobal.cpp'
57	--- src/UbuntuMetrics/ubuntumetricsglobal.cpp 1970-01-01 00:00:00 +0000
58	+++ src/UbuntuMetrics/ubuntumetricsglobal.cpp 2016-09-22 14:21:44 +0000
59	@@ -0,0 +1,34 @@
60			1	// Copyright © 2016 Canonical Ltd.
61			2	// Author: Loïc Molinari <loic.molinari@canonical.com>
62			3	//
63			4	// This file is part of Ubuntu UI Toolkit.
64			5	//
65			6	// Ubuntu UI Toolkit is free software: you can redistribute it and/or modify it
66			7	// under the terms of the GNU Lesser General Public License as published by the
67			8	// Free Software Foundation; version 3.
68			9	//
69			10	// Ubuntu UI Toolkit is distributed in the hope that it will be useful, but
70			11	// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
71			12	// FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
72			13	// for more details.
73			14	//
74			15	// You should have received a copy of the GNU Lesser General Public License
75			16	// along with Ubuntu UI Toolkit. If not, see <http://www.gnu.org/licenses/>.
76			17
77			18	#include "ubuntumetricsglobal_p.h"
78			19
79			20	void* alignedAlloc(size_t alignment, size_t size)
80			21	{
81			22	DASSERT(IS_POWER_OF_TWO(alignment));
82			23	// DASSERT(((size % alignment) == 0)); // FIXME(loicm) ASSERT doesn't support '%'...
83			24
84			25	#if defined(__APPLE__)
85			26	void* pointer;
86			27	posix_memalign(&pointer, alignment, size);
87			28	return pointer;
88			29	#elif defined(_WIN32)
89			30	return _aligned_malloc(size, alignment);
90			31	#else
91			32	return aligned_alloc(alignment, size);
92			33	#endif
93			34	}
94	0		35
95	=== modified file 'src/UbuntuMetrics/ubuntumetricsglobal_p.h'
96	--- src/UbuntuMetrics/ubuntumetricsglobal_p.h 2016-09-09 17:49:07 +0000
97	+++ src/UbuntuMetrics/ubuntumetricsglobal_p.h 2016-09-22 14:21:44 +0000
98	@@ -51,4 +51,8 @@
99	51		51
100	52	#define UBUNTU_METRICS_PRIVATE_EXPORT UBUNTU_METRICS_EXPORT	52	#define UBUNTU_METRICS_PRIVATE_EXPORT UBUNTU_METRICS_EXPORT
101	53		53
102			54	// Allocates size bytes and returns an pointer to the aligned memory. alignment
103			55	// must be a power-of-two and size a multiple of alignment.
104			56	void* alignedAlloc(size_t alignment, size_t size);
105			57
106	54	#endif // UBUNTUMETRICSGLOBAL_P_H	58	#endif // UBUNTUMETRICSGLOBAL_P_H