cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-18 07:55:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

imagewriter: Remove unnecessary mutexes

Browse source 
Per suggestion from @maxnet, remove unnecessary guards. Qt signals/slots
will guard against concurrency issues.
This commit is contained in:
Tom Dewey 2023-11-13 15:51:00 +00:00 • committed by Tom Dewey
parent d2251291ce
commit eb2d54a423
2 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/imagewriter.cpp
View file

@ -476,7 +476,6 @@ namespace {
void ImageWriter::setHWFilterList(const QByteArray &json, const bool &inclusive) { void ImageWriter::setHWFilterList(const QByteArray &json, const bool &inclusive) {
std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
QJsonDocument json_document = QJsonDocument::fromJson(json); QJsonDocument json_document = QJsonDocument::fromJson(json);
_deviceFilter = json_document.array(); _deviceFilter = json_document.array();
_deviceFilterIsInclusive = inclusive; _deviceFilterIsInclusive = inclusive;
@ -497,10 +496,8 @@ void ImageWriter::handleNetworkRequestFinished(QNetworkReply *data) {
// It doesn't matter that these may still contain subitems_url items // It doesn't matter that these may still contain subitems_url items
// As these will be fixed up as the subitems_url instances are blinked in // As these will be fixed up as the subitems_url instances are blinked in
if (_completeOsList.isEmpty()) { if (_completeOsList.isEmpty()) {
std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
_completeOsList = QJsonDocument(response_object); _completeOsList = QJsonDocument(response_object);
} else { } else {
std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
auto new_list = findAndInsertJsonResult(_completeOsList["os_list"].toArray(), response_object["os_list"].toArray(), data->request().url()); auto new_list = findAndInsertJsonResult(_completeOsList["os_list"].toArray(), response_object["os_list"].toArray(), data->request().url());
auto imager_meta = _completeOsList["imager"].toObject(); auto imager_meta = _completeOsList["imager"].toObject();
_completeOsList = QJsonDocument(QJsonObject({ _completeOsList = QJsonDocument(QJsonObject({
@ -579,8 +576,6 @@ namespace {
} }
} }
} }
//returnArray += ositemObject;
} }
return returnArray; return returnArray;
@ -591,7 +586,6 @@ QByteArray ImageWriter::getFilteredOSlist() {
QJsonArray reference_os_list_array = {}; QJsonArray reference_os_list_array = {};
QJsonObject reference_imager_metadata = {}; QJsonObject reference_imager_metadata = {};
{ {
std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
if (!_completeOsList.isEmpty()) { if (!_completeOsList.isEmpty()) {
reference_os_list_array = filterOsListWithHWTags(_completeOsList.object()["os_list"].toArray(), _deviceFilter, _deviceFilterIsInclusive); reference_os_list_array = filterOsListWithHWTags(_completeOsList.object()["os_list"].toArray(), _deviceFilter, _deviceFilterIsInclusive);
reference_imager_metadata = _completeOsList.object()["imager"].toObject(); reference_imager_metadata = _completeOsList.object()["imager"].toObject();

1
src/imagewriter.h
View file

@ -185,7 +185,6 @@ private:
QJsonDocument _completeOsList; QJsonDocument _completeOsList;
QJsonArray _deviceFilter; QJsonArray _deviceFilter;
bool _deviceFilterIsInclusive; bool _deviceFilterIsInclusive;
std::mutex _deviceListMutationMutex;
protected: protected:
QUrl _src, _repo; QUrl _src, _repo;