1
=== modified file 'components.api'
2
--- components.api	2016-06-27 10:03:01 +0000
3
+++ components.api	2016-06-30 12:40:45 +0000
4
@@ -489,6 +489,8 @@
5
489
    property var model
489
    property var model
6
490
    property bool multiSelection
490
    property bool multiSelection
7
491
    property int selectedIndex
491
    property int selectedIndex
8
492
Ubuntu.Components.LTTNG 1.3: QtObject singleton
9
493
    function userInterfaceReady()
10
492
Ubuntu.Components.Label 1.0 0.1: Text
494
Ubuntu.Components.Label 1.0 0.1: Text
11
493
    property string fontSize
495
    property string fontSize
12
494
Ubuntu.Components.Label 1.3 UbuntuToolkit::UCLabel: Text
496
Ubuntu.Components.Label 1.3 UbuntuToolkit::UCLabel: Text
13
495
497
14
=== modified file 'debian/control'
15
--- debian/control	2016-06-24 13:10:20 +0000
16
+++ debian/control	2016-06-30 12:40:45 +0000
17
@@ -83,6 +83,7 @@
18
83
         ubuntu-ui-toolkit-theme (= ${binary:Version}),
83
         ubuntu-ui-toolkit-theme (= ${binary:Version}),
19
84
         ${misc:Depends},
84
         ${misc:Depends},
20
85
         ${shlibs:Depends},
85
         ${shlibs:Depends},
21
86
Recommends: liblttng-ust0,
22
86
Conflicts: qt-components-ubuntu,
87
Conflicts: qt-components-ubuntu,
23
87
Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
88
Breaks: qtdeclarative5-ubuntu-ui-toolkit-plugin (<< ${source:Version}),
24
88
Replaces: qt-components-ubuntu,
89
Replaces: qt-components-ubuntu,
25
89
90
26
=== modified file 'debian/qml-module-ubuntu-components.install'
27
--- debian/qml-module-ubuntu-components.install	2016-06-23 09:13:51 +0000
28
+++ debian/qml-module-ubuntu-components.install	2016-06-30 12:40:45 +0000
29
@@ -22,6 +22,7 @@
30
22
usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
22
usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
31
23
usr/lib/*/qt5/qml/Ubuntu/Components/artwork
23
usr/lib/*/qt5/qml/Ubuntu/Components/artwork
32
24
usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
24
usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
33
25
usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponentsLTTNG.so
34
25
usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
26
usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
35
26
usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
27
usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
36
27
usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo
28
usr/share/locale/*/LC_MESSAGES/ubuntu-ui-toolkit.mo
37
28
29
38
=== modified file 'src/Ubuntu/Components/Components.pro'
39
--- src/Ubuntu/Components/Components.pro	2016-06-23 13:37:24 +0000
40
+++ src/Ubuntu/Components/Components.pro	2016-06-30 12:40:45 +0000
41
@@ -6,4 +6,5 @@
42
6
           Popups    \
6
           Popups    \
43
7
           Styles    \
7
           Styles    \
44
8
           Themes    \
8
           Themes    \
46
9
           Labs
9
           Labs      \
47
10
           lttng
48
10
11
49
=== added directory 'src/Ubuntu/Components/lttng'
50
=== added file 'src/Ubuntu/Components/lttng/lttng.pro'
51
--- src/Ubuntu/Components/lttng/lttng.pro	1970-01-01 00:00:00 +0000
52
+++ src/Ubuntu/Components/lttng/lttng.pro	2016-06-30 12:40:45 +0000
53
@@ -0,0 +1,9 @@
54
1
TEMPLATE = lib
55
2
TARGET  = UbuntuComponentsLTTNG
56
3
SOURCES = tracepoints.c
57
4
LIBS += -llttng-ust
58
5
CONFIG -= create_prl
59
6
CONFIG += unversioned_libname
60
7
61
8
target.path = $$[QT_INSTALL_QML]/Ubuntu/Components
62
9
INSTALLS += target
63
0
10
64
=== added file 'src/Ubuntu/Components/lttng/tracepoints.c'
65
--- src/Ubuntu/Components/lttng/tracepoints.c	1970-01-01 00:00:00 +0000
66
+++ src/Ubuntu/Components/lttng/tracepoints.c	2016-06-30 12:40:45 +0000
67
@@ -0,0 +1,21 @@
68
1
/*
69
2
 * Copyright 2016 Canonical Ltd.
70
3
 *
71
4
 * This program is free software; you can redistribute it and/or modify
72
5
 * it under the terms of the GNU Lesser General Public License as published by
73
6
 * the Free Software Foundation; version 3.
74
7
 *
75
8
 * This program is distributed in the hope that it will be useful,
76
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
77
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
78
11
 * GNU Lesser General Public License for more details.
79
12
 *
80
13
 * You should have received a copy of the GNU Lesser General Public License
81
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
82
15
 *
83
16
 */
84
17
85
18
/* The probes need to be compiled in a C file (not C++) */
86
19
#define TRACEPOINT_CREATE_PROBES
87
20
88
21
#include "uclttng_tp.h"
89
0
22
90
=== added file 'src/Ubuntu/Components/lttng/uclttng_tp.h'
91
--- src/Ubuntu/Components/lttng/uclttng_tp.h	1970-01-01 00:00:00 +0000
92
+++ src/Ubuntu/Components/lttng/uclttng_tp.h	2016-06-30 12:40:45 +0000
93
@@ -0,0 +1,37 @@
94
1
/*
95
2
 * Copyright 2016 Canonical Ltd.
96
3
 *
97
4
 * This program is free software; you can redistribute it and/or modify
98
5
 * it under the terms of the GNU Lesser General Public License as published by
99
6
 * the Free Software Foundation; version 3.
100
7
 *
101
8
 * This program is distributed in the hope that it will be useful,
102
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
103
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
104
11
 * GNU Lesser General Public License for more details.
105
12
 *
106
13
 * You should have received a copy of the GNU Lesser General Public License
107
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
108
15
 *
109
16
 */
110
17
111
18
#undef TRACEPOINT_PROVIDER
112
19
#define TRACEPOINT_PROVIDER uc_lttng
113
20
114
21
#if !defined(UC_LTTNG_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
115
22
#define UC_LTTNG_TP_H_
116
23
117
24
#include <lttng/tracepoint.h>
118
25
119
26
TRACEPOINT_EVENT(uc_lttng, user_interface_ready,
120
27
	TP_ARGS(),
121
28
	TP_FIELDS()
122
29
)
123
30
124
31
#endif
125
32
126
33
#undef TRACEPOINT_INCLUDE
127
34
#define TRACEPOINT_INCLUDE "./uclttng_tp.h"
128
35
129
36
/* This part must be outside ifdef protection */
130
37
#include <lttng/tracepoint-event.h>
131
0
38
132
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
133
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-06-21 14:21:46 +0000
134
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-06-30 12:40:45 +0000
135
@@ -17,10 +17,19 @@
136
17
17
137
18
#include <QtQml/QQmlEngine>
18
#include <QtQml/QQmlEngine>
138
19
#include "plugin.h"
19
#include "plugin.h"
139
20
#include "uclttng.h"
140
20
#include "ucnamespace.h"
21
#include "ucnamespace.h"
141
21
#include <ubuntutoolkitmodule.h>
22
#include <ubuntutoolkitmodule.h>
142
22
#include <ubuntugesturesmodule.h>
23
#include <ubuntugesturesmodule.h>
143
23
24
144
25
static QObject *lttng_singleton_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
145
26
{
146
27
    Q_UNUSED(engine)
147
28
    Q_UNUSED(scriptEngine)
148
29
149
30
    return new UbuntuComponentsLTTNG();
150
31
}
151
32
152
24
UbuntuComponentsPlugin::~UbuntuComponentsPlugin()
33
UbuntuComponentsPlugin::~UbuntuComponentsPlugin()
153
25
{
34
{
154
26
    UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::undefineModule();
35
    UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::undefineModule();
155
@@ -34,6 +43,8 @@
156
34
43
157
35
    qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespace>(uri, 1, 2, "Ubuntu");
44
    qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespace>(uri, 1, 2, "Ubuntu");
158
36
    qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespaceV13>(uri, 1, 3, "Ubuntu");
45
    qmlRegisterSimpleSingletonType<UbuntuToolkit::UCNamespaceV13>(uri, 1, 3, "Ubuntu");
159
46
    qmlRegisterSingletonType<UbuntuComponentsLTTNG>(uri, 1, 3, "LTTNG", lttng_singleton_provider);
160
47
161
37
48
162
38
    UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::defineModule(uri);
49
    UG_PREPEND_NAMESPACE(UbuntuGesturesModule)::defineModule(uri);
163
39
    UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::defineModule();
50
    UT_PREPEND_NAMESPACE(UbuntuToolkitModule)::defineModule();
164
40
51
165
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
166
--- src/Ubuntu/Components/plugin/plugin.pri	2016-06-17 15:55:58 +0000
167
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-06-30 12:40:45 +0000
168
@@ -5,12 +5,19 @@
169
5
    QT += v8-private
5
    QT += v8-private
170
6
}
6
}
171
7
7
172
8
DEFINES += LTTNG_INSTALL_LIB_PATH=\\\"$$[QT_INSTALL_QML]/$$TARGETPATH/libUbuntuComponentsLTTNG.so\\\"
173
9
DEFINES += LTTNG_BUILD_LIB_PATH=\\\"$$OUT_PWD/lttng/libUbuntuComponentsLTTNG.so\\\"
174
10
175
8
CONFIG += no_keywords c++11
11
CONFIG += no_keywords c++11
176
9
12
177
10
INCLUDEPATH+=$$PWD
13
INCLUDEPATH+=$$PWD
178
11
14
179
12
HEADERS += $$PWD/plugin.h \
15
HEADERS += $$PWD/plugin.h \
181
13
    $$PWD/ucnamespace.h
16
    $$PWD/ucnamespace.h \
182
17
    $$PWD/uclttng.h
183
14
18
184
15
SOURCES += $$PWD/plugin.cpp \
19
SOURCES += $$PWD/plugin.cpp \
186
16
    $$PWD/ucnamespace.cpp
20
    $$PWD/ucnamespace.cpp \
187
21
    $$PWD/uclttng.cpp
188
22
189
23
LIBS += -ldl
190
17
\ No newline at end of file
24
\ No newline at end of file
191
18
25
192
=== added file 'src/Ubuntu/Components/plugin/uclttng.cpp'
193
--- src/Ubuntu/Components/plugin/uclttng.cpp	1970-01-01 00:00:00 +0000
194
+++ src/Ubuntu/Components/plugin/uclttng.cpp	2016-06-30 12:40:45 +0000
195
@@ -0,0 +1,104 @@
196
1
/*
197
2
 * Copyright 2016 Canonical Ltd.
198
3
 *
199
4
 * This program is free software; you can redistribute it and/or modify
200
5
 * it under the terms of the GNU Lesser General Public License as published by
201
6
 * the Free Software Foundation; version 3.
202
7
 *
203
8
 * This program is distributed in the hope that it will be useful,
204
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
205
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
206
11
 * GNU Lesser General Public License for more details.
207
12
 *
208
13
 * You should have received a copy of the GNU Lesser General Public License
209
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
210
15
 *
211
16
 */
212
17
213
18
#include "uclttng.h"
214
19
215
20
#include <QDebug>
216
21
#include <QtCore/qmath.h>
217
22
218
23
#include <dlfcn.h>
219
24
220
25
#define TRACEPOINT_DEFINE
221
26
#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
222
27
#include "../lttng/uclttng_tp.h"
223
28
224
29
/*!
225
30
 * \qmltype LTTNG
226
31
 * \instantiates UbuntuComponentsLTTNG
227
32
 * \inqmlmodule Ubuntu.Components
228
33
 * \ingroup ubuntu
229
34
 * \brief Singleton to emit LTTNG tracepoints.
230
35
 *
231
36
 * Logging to LTTNG can be useful for posterior analysis. This class
232
37
 * provides a singleton that can be used to emit LTTNG tracepoints (at
233
38
 * this point only the userInterfaceReady one).
234
39
 *
235
40
 * Example:
236
41
 * \qml
237
42
 * import QtQuick 2.4
238
43
 * import Ubuntu.Components 1.3
239
44
 *
240
45
 * MainView {
241
46
 *     width: units.gu(48)
242
47
 *     height: units.gu(60)
243
48
 *     Page {
244
49
 *         header: PageHeader {
245
50
 *             id: pageHeader
246
51
 *             title: "Simple page"
247
52
 *         }
248
53
 *         Button {
249
54
 *             anchors {
250
55
 *                 horizontalCenter: parent.horizontalCenter
251
56
 *                 top: pageHeader.bottom
252
57
 *                 topMargin: units.gu(5)
253
58
 *             }
254
59
 *             width: units.gu(15)
255
60
 *             text: "Push me"
256
61
 *         }
257
62
 *     }
258
63
 *     Component.onCompleted: LTTNG.userInterfaceReady();
259
64
 * }
260
65
 * \endqml
261
66
 */
262
67
UbuntuComponentsLTTNG::UbuntuComponentsLTTNG(QObject* parent) :
263
68
    QObject(parent),
264
69
    m_lttngLib(nullptr),
265
70
    m_lttngLibLoadTried(false)
266
71
{
267
72
}
268
73
269
74
UbuntuComponentsLTTNG::~UbuntuComponentsLTTNG()
270
75
{
271
76
    dlclose(m_lttngLib);
272
77
}
273
78
274
79
/*!
275
80
 * \qmlmethod void LTTNG::userInterfaceReady()
276
81
 * Logs an LTTNG tracepoint about the user interface being ready. That is
277
82
 * the program has loaded enough buttons, labels, etc. so that
278
83
 * the user can now start using it.
279
84
 */
280
85
void UbuntuComponentsLTTNG::userInterfaceReady()
281
86
{
282
87
    if (!m_lttngLib && !m_lttngLibLoadTried) {
283
88
        m_lttngLibLoadTried = true;
284
89
285
90
        m_lttngLib = dlopen(LTTNG_INSTALL_LIB_PATH, RTLD_NOW);
286
91
        if (!m_lttngLib) {
287
92
            qWarning() << "Failed to load installed tracepoint provider: " << dlerror();
288
93
            qWarning() << "Trying with build time one";
289
94
290
95
            m_lttngLib = dlopen(LTTNG_BUILD_LIB_PATH, RTLD_NOW);
291
96
            if (!m_lttngLib) {
292
97
                qWarning() << "Failed to load build time tracepoint provider: " << dlerror();
293
98
            }
294
99
        }
295
100
    }
296
101
    if (m_lttngLib) {
297
102
        tracepoint(uc_lttng, user_interface_ready);
298
103
    }
299
104
}
300
0
105
301
=== added file 'src/Ubuntu/Components/plugin/uclttng.h'
302
--- src/Ubuntu/Components/plugin/uclttng.h	1970-01-01 00:00:00 +0000
303
+++ src/Ubuntu/Components/plugin/uclttng.h	2016-06-30 12:40:45 +0000
304
@@ -0,0 +1,38 @@
305
1
/*
306
2
 * Copyright 2016 Canonical Ltd.
307
3
 *
308
4
 * This program is free software; you can redistribute it and/or modify
309
5
 * it under the terms of the GNU Lesser General Public License as published by
310
6
 * the Free Software Foundation; version 3.
311
7
 *
312
8
 * This program is distributed in the hope that it will be useful,
313
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
314
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
315
11
 * GNU Lesser General Public License for more details.
316
12
 *
317
13
 * You should have received a copy of the GNU Lesser General Public License
318
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
319
15
 *
320
16
 */
321
17
322
18
#ifndef UCLTTNG_H
323
19
#define UCLTTNG_H
324
20
325
21
#include <QObject>
326
22
327
23
class UbuntuComponentsLTTNG : public QObject
328
24
{
329
25
    Q_OBJECT
330
26
331
27
public:
332
28
    explicit UbuntuComponentsLTTNG(QObject* parent = 0);
333
29
    ~UbuntuComponentsLTTNG();
334
30
335
31
    Q_INVOKABLE void userInterfaceReady();
336
32
337
33
private:
338
34
    void* m_lttngLib;
339
35
    bool m_lttngLibLoadTried;
340
36
};
341
37
342
38
#endif
Status:	Rejected
Rejected by:	Albert Astals Cid on 2016-08-09
Proposed branch:	lp:~aacid/ubuntu-ui-toolkit/lttng_ui_ready_tracepoint
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	342 lines (+235/-3) 11 files modified components.api (+2/-0) debian/control (+1/-0) debian/qml-module-ubuntu-components.install (+1/-0) src/Ubuntu/Components/Components.pro (+2/-1) src/Ubuntu/Components/lttng/lttng.pro (+9/-0) src/Ubuntu/Components/lttng/tracepoints.c (+21/-0) src/Ubuntu/Components/lttng/uclttng_tp.h (+37/-0) src/Ubuntu/Components/plugin/plugin.cpp (+11/-0) src/Ubuntu/Components/plugin/plugin.pri (+9/-2) src/Ubuntu/Components/plugin/uclttng.cpp (+104/-0) src/Ubuntu/Components/plugin/uclttng.h (+38/-0)
To merge this branch:	bzr merge lp:~aacid/ubuntu-ui-toolkit/lttng_ui_ready_tracepoint
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-06-30
Cris Dywan		2016-06-29	Needs Fixing on 2016-06-30
Loïc Molinari		2016-07-01	Pending
Review via email: mp+298618@code.launchpad.net