14547173229

Committed 19 Apr 2025 07:57AM UTC coverage: 31.866% (-0.004%) from 31.87%

Build # 14547173229

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #1726 from shaforostoff/foreach_optimize

Speed up many foreach-based iterations over QMap

Run Details

26 of 55 new or added lines in 23 files covered. (47.27%)

1 existing line in 1 file now uncovered.

14684 of 46080 relevant lines covered (31.87%)

26448.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/engine/src/genericdmxsource.cpp

/*
  Q Light Controller
  genericdmxsource.cpp

  Copyright (C) Heikki Junnila

  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

      http://www.apache.org/licenses/LICENSE-2.0.txt

  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
  limitations under the License.
*/

#include "genericdmxsource.h"
#include "genericfader.h"
#include "mastertimer.h"
#include "fadechannel.h"
#include "universe.h"
#include "doc.h"

#include <cmath>

GenericDMXSource::GenericDMXSource(Doc* doc)
    : m_doc(doc)
    , m_outputEnabled(false)
    , m_clearRequest(false)
    , m_changed(false)
{
    Q_ASSERT(m_doc != NULL);
    m_doc->masterTimer()->registerDMXSource(this);
}

GenericDMXSource::~GenericDMXSource()
{
    foreach (QSharedPointer<GenericFader> fader, m_fadersMap)
    {
        if (!fader.isNull())
            fader->requestDelete();
    }
    m_fadersMap.clear();

    m_doc->masterTimer()->unregisterDMXSource(this);
}

void GenericDMXSource::set(quint32 fxi, quint32 ch, uchar value)
{
    QMutexLocker locker(&m_mutex);
    m_values[QPair<quint32,quint32>(fxi, ch)] = value;
    m_changed = true;
}

void GenericDMXSource::unset(quint32 fxi, quint32 ch)
{
    QMutexLocker locker(&m_mutex);
    m_values.remove(QPair<quint32,quint32>(fxi, ch));
    m_changed = true;
}

void GenericDMXSource::unsetAll()
{
    QMutexLocker locker(&m_mutex);
    // will be processed at the next writeDMX
    m_clearRequest = true;
    m_changed = true;
}

void GenericDMXSource::setOutputEnabled(bool enable)
{
    m_outputEnabled = enable;
}

bool GenericDMXSource::isOutputEnabled() const
{
    return m_outputEnabled;
}

quint32 GenericDMXSource::channelsCount() const
{
    return m_values.count();
}

QList<SceneValue> GenericDMXSource::channels()
{
    QList<SceneValue> chList;
    QMutableMapIterator <QPair<quint32,quint32>,uchar> it(m_values);
    while (it.hasNext() == true)
    {
        it.next();
        SceneValue sv;
        sv.fxi = it.key().first;
        sv.channel = it.key().second;
        sv.value = it.value();
        chList.append(sv);
    }
    return chList;
}

void GenericDMXSource::writeDMX(MasterTimer* timer, QList<Universe *> ua)
{
    Q_UNUSED(timer);

    QMutexLocker locker(&m_mutex);

    if (m_outputEnabled && m_changed)
    {

        QMutableMapIterator <QPair<quint32,quint32>,uchar> it(m_values);
        while (it.hasNext())
        {
            it.next();
            Fixture *fixture = m_doc->fixture(it.key().first);
            if (fixture == NULL)
                continue;

            quint32 channelIndex = it.key().second;
            int universeIndex = floor((fixture->universeAddress() + channelIndex) / 512);

            if (universeIndex >= ua.count())
                continue;

            Universe *universe = ua[universeIndex];

            QSharedPointer<GenericFader> fader = m_fadersMap.value(universe->id(), QSharedPointer<GenericFader>());
            if (fader.isNull())
            {
                fader = universe->requestFader();
                m_fadersMap[universe->id()] = fader;
            }

            FadeChannel *fc = fader->getChannelFader(m_doc, universe, fixture->id(), channelIndex);
            fc->setCurrent(it.value());
            fc->setTarget(it.value());
        }
    }
    if (m_clearRequest)
    {
        m_clearRequest = false;
        m_values.clear();

        QMapIterator <quint32, QSharedPointer<GenericFader> > it(m_fadersMap);
        while (it.hasNext() == true)
        {
            it.next();
            quint32 universe = it.key();
            QSharedPointer<GenericFader> fader = it.value();
            ua[universe]->dismissFader(fader);
        }
        m_fadersMap.clear();
    }
}

1	/*
2	Q Light Controller
3	genericdmxsource.cpp
4
5	Copyright (C) Heikki Junnila
6
7	Licensed under the Apache License, Version 2.0 (the "License");
8	you may not use this file except in compliance with the License.
9	You may obtain a copy of the License at
10
11	http://www.apache.org/licenses/LICENSE-2.0.txt
12
13	Unless required by applicable law or agreed to in writing, software
14	distributed under the License is distributed on an "AS IS" BASIS,
15	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16	See the License for the specific language governing permissions and
17	limitations under the License.
18	*/
19
20	#include "genericdmxsource.h"
21	#include "genericfader.h"
22	#include "mastertimer.h"
23	#include "fadechannel.h"
24	#include "universe.h"
25	#include "doc.h"
26
27	#include <cmath>
28
29	GenericDMXSource::GenericDMXSource(Doc* doc)	×
30	: m_doc(doc)	×
31	, m_outputEnabled(false)	×
32	, m_clearRequest(false)	×
33	, m_changed(false)	×
34	{
35	Q_ASSERT(m_doc != NULL);
36	m_doc->masterTimer()->registerDMXSource(this);	×
37	}	×
38
39	GenericDMXSource::~GenericDMXSource()	×
40	{
NEW 41	foreach (QSharedPointer<GenericFader> fader, m_fadersMap)	×
42	{
43	if (!fader.isNull())	×
44	fader->requestDelete();	×
45	}
46	m_fadersMap.clear();	×
47
48	m_doc->masterTimer()->unregisterDMXSource(this);	×
49	}	×
50
51	void GenericDMXSource::set(quint32 fxi, quint32 ch, uchar value)	×
52	{
53	QMutexLocker locker(&m_mutex);	×
54	m_values[QPair<quint32,quint32>(fxi, ch)] = value;	×
55	m_changed = true;	×
56	}	×
57
58	void GenericDMXSource::unset(quint32 fxi, quint32 ch)	×
59	{
60	QMutexLocker locker(&m_mutex);	×
61	m_values.remove(QPair<quint32,quint32>(fxi, ch));	×
62	m_changed = true;	×
63	}	×
64
65	void GenericDMXSource::unsetAll()	×
66	{
67	QMutexLocker locker(&m_mutex);	×
68	// will be processed at the next writeDMX
69	m_clearRequest = true;	×
70	m_changed = true;	×
71	}	×
72
73	void GenericDMXSource::setOutputEnabled(bool enable)	×
74	{
75	m_outputEnabled = enable;	×
76	}	×
77
78	bool GenericDMXSource::isOutputEnabled() const	×
79	{
80	return m_outputEnabled;	×
81	}
82
83	quint32 GenericDMXSource::channelsCount() const	×
84	{
85	return m_values.count();	×
86	}
87
88	QList<SceneValue> GenericDMXSource::channels()	×
89	{
90	QList<SceneValue> chList;
91	QMutableMapIterator <QPair<quint32,quint32>,uchar> it(m_values);	×
92	while (it.hasNext() == true)	×
93	{
94	it.next();	×
95	SceneValue sv;	×
96	sv.fxi = it.key().first;	×
97	sv.channel = it.key().second;	×
98	sv.value = it.value();	×
99	chList.append(sv);	×
100	}	×
101	return chList;	×
102	}	×
103
104	void GenericDMXSource::writeDMX(MasterTimer* timer, QList<Universe *> ua)	×
105	{
106	Q_UNUSED(timer);
107
108	QMutexLocker locker(&m_mutex);	×
109
110	if (m_outputEnabled && m_changed)	×
111	{
112
113	QMutableMapIterator <QPair<quint32,quint32>,uchar> it(m_values);	×
114	while (it.hasNext())	×
115	{
116	it.next();	×
117	Fixture *fixture = m_doc->fixture(it.key().first);	×
118	if (fixture == NULL)	×
119	continue;	×
120
121	quint32 channelIndex = it.key().second;	×
122	int universeIndex = floor((fixture->universeAddress() + channelIndex) / 512);	×
123
124	if (universeIndex >= ua.count())	×
125	continue;	×
126
127	Universe *universe = ua[universeIndex];	×
128
129	QSharedPointer<GenericFader> fader = m_fadersMap.value(universe->id(), QSharedPointer<GenericFader>());	×
130	if (fader.isNull())	×
131	{
132	fader = universe->requestFader();	×
133	m_fadersMap[universe->id()] = fader;	×
134	}
135
136	FadeChannel *fc = fader->getChannelFader(m_doc, universe, fixture->id(), channelIndex);	×
137	fc->setCurrent(it.value());	×
138	fc->setTarget(it.value());	×
139	}
140	}
141	if (m_clearRequest)	×
142	{
143	m_clearRequest = false;	×
144	m_values.clear();	×
145
146	QMapIterator <quint32, QSharedPointer<GenericFader> > it(m_fadersMap);	×
147	while (it.hasNext() == true)	×
148	{
149	it.next();	×
150	quint32 universe = it.key();	×
151	QSharedPointer<GenericFader> fader = it.value();
152	ua[universe]->dismissFader(fader);	×
153	}
154	m_fadersMap.clear();	×
155	}
156	}	×

mcallegari / qlcplus / 14547173229

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous