1
=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.cpp'
2
--- src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-03-15 13:46:27 +0000
3
+++ src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-06-09 19:32:20 +0000
4
@@ -21,10 +21,23 @@
5
21
21
6
22
Q_LOGGING_CATEGORY(ucPerformance, "[PERFORMANCE]")
22
Q_LOGGING_CATEGORY(ucPerformance, "[PERFORMANCE]")
7
23
23
12
24
const int singleFrameThreshold = 32;
24
static int singleFrameThreshold = 32;
13
25
const int multipleFrameThreshold = 17;
25
static int multipleFrameThreshold = 17;
14
26
const int framesCountThreshold = 10;
26
static int framesCountThreshold = 10;
15
27
const int warningCountThreshold = 30;
27
static int warningCountThreshold = 30;
16
28
17
29
// TODO Qt 5.5. switch to qEnvironmentVariableIntValue
18
30
static int getenvInt(const char* name, int defaultValue)
19
31
{
20
32
    if (qEnvironmentVariableIsSet(name)) {
21
33
        QByteArray stringValue = qgetenv(name);
22
34
        bool ok;
23
35
        int value = stringValue.toFloat(&ok);
24
36
        return ok ? value : defaultValue;
25
37
    } else {
26
38
        return defaultValue;
27
39
    }
28
40
}
29
28
41
30
29
UCPerformanceMonitor::UCPerformanceMonitor(QObject* parent) :
42
UCPerformanceMonitor::UCPerformanceMonitor(QObject* parent) :
31
30
    QObject(parent),
43
    QObject(parent),
32
@@ -34,6 +47,11 @@
33
34
{
47
{
34
35
    QObject::connect((QGuiApplication*)QGuiApplication::instance(), &QGuiApplication::applicationStateChanged,
48
    QObject::connect((QGuiApplication*)QGuiApplication::instance(), &QGuiApplication::applicationStateChanged,
35
36
                     this, &UCPerformanceMonitor::onApplicationStateChanged);
49
                     this, &UCPerformanceMonitor::onApplicationStateChanged);
36
50
37
51
    singleFrameThreshold = getenvInt("PERFORMANCE_MONITOR_SINGLE_FRAME_THRESHOLD", singleFrameThreshold);
38
52
    multipleFrameThreshold = getenvInt("PERFORMANCE_MONITOR_MULTIPLE_FRAME_THRESHOLD", multipleFrameThreshold);
39
53
    framesCountThreshold = getenvInt("PERFORMANCE_MONITOR_FRAMES_COUNT_THRESHOLD", framesCountThreshold);
40
54
    warningCountThreshold = getenvInt("PERFORMANCE_MONITOR_WARNING_COUNT_THRESHOLD", warningCountThreshold);
41
37
}
55
}
42
38
56
43
39
UCPerformanceMonitor::~UCPerformanceMonitor()
57
UCPerformanceMonitor::~UCPerformanceMonitor()
Status:	Merged
Approved by:	Zsombor Egri on 2016-06-10
Approved revision:	no longer in the source branch.
Merged at revision:	1999
Proposed branch:	lp:~aacid/ubuntu-ui-toolkit/performance_monitor_env_vars
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	43 lines (+22/-4) 1 file modified src/Ubuntu/Components/plugin/ucperformancemonitor.cpp (+22/-4)
To merge this branch:	bzr merge lp:~aacid/ubuntu-ui-toolkit/performance_monitor_env_vars
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-06-10
Gerry Boland (community)		2016-06-09	Approve on 2016-06-09
Review via email: mp+296990@code.launchpad.net
1	=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.cpp'
2	--- src/Ubuntu/Components/plugin/ucperformancemonitor.cpp 2016-03-15 13:46:27 +0000
3	+++ src/Ubuntu/Components/plugin/ucperformancemonitor.cpp 2016-06-09 19:32:20 +0000
4	@@ -21,10 +21,23 @@
5	21		21
6	22	Q_LOGGING_CATEGORY(ucPerformance, "[PERFORMANCE]")	22	Q_LOGGING_CATEGORY(ucPerformance, "[PERFORMANCE]")
7	23		23
12	24	const int singleFrameThreshold = 32;	24	static int singleFrameThreshold = 32;
13	25	const int multipleFrameThreshold = 17;	25	static int multipleFrameThreshold = 17;
14	26	const int framesCountThreshold = 10;	26	static int framesCountThreshold = 10;
15	27	const int warningCountThreshold = 30;	27	static int warningCountThreshold = 30;
16			28
17			29	// TODO Qt 5.5. switch to qEnvironmentVariableIntValue
18			30	static int getenvInt(const char* name, int defaultValue)
19			31	{
20			32	if (qEnvironmentVariableIsSet(name)) {
21			33	QByteArray stringValue = qgetenv(name);
22			34	bool ok;
23			35	int value = stringValue.toFloat(&ok);
24			36	return ok ? value : defaultValue;
25			37	} else {
26			38	return defaultValue;
27			39	}
28			40	}
29	28		41
30	29	UCPerformanceMonitor::UCPerformanceMonitor(QObject* parent) :	42	UCPerformanceMonitor::UCPerformanceMonitor(QObject* parent) :
31	30	QObject(parent),	43	QObject(parent),
32	@@ -34,6 +47,11 @@
33	34	{	47	{
34	35	QObject::connect((QGuiApplication*)QGuiApplication::instance(), &QGuiApplication::applicationStateChanged,	48	QObject::connect((QGuiApplication*)QGuiApplication::instance(), &QGuiApplication::applicationStateChanged,
35	36	this, &UCPerformanceMonitor::onApplicationStateChanged);	49	this, &UCPerformanceMonitor::onApplicationStateChanged);
36			50
37			51	singleFrameThreshold = getenvInt("PERFORMANCE_MONITOR_SINGLE_FRAME_THRESHOLD", singleFrameThreshold);
38			52	multipleFrameThreshold = getenvInt("PERFORMANCE_MONITOR_MULTIPLE_FRAME_THRESHOLD", multipleFrameThreshold);
39			53	framesCountThreshold = getenvInt("PERFORMANCE_MONITOR_FRAMES_COUNT_THRESHOLD", framesCountThreshold);
40			54	warningCountThreshold = getenvInt("PERFORMANCE_MONITOR_WARNING_COUNT_THRESHOLD", warningCountThreshold);
41	37	}	55	}
42	38		56
43	39	UCPerformanceMonitor::~UCPerformanceMonitor()	57	UCPerformanceMonitor::~UCPerformanceMonitor()