From eb2d54a423dcdcec089fc0618dd8daccb32328e0 Mon Sep 17 00:00:00 2001
From: Tom Dewey <tom.dewey@raspberrypi.com>
Date: Mon, 13 Nov 2023 15:51:00 +0000
Subject: [PATCH] imagewriter: Remove unnecessary mutexes

Per suggestion from @maxnet, remove unnecessary guards. Qt signals/slots
will guard against concurrency issues.
---
 src/imagewriter.cpp | 6 ------
 src/imagewriter.h   | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/imagewriter.cpp b/src/imagewriter.cpp
index 5b6fe3e..1ef0c1b 100644
--- a/src/imagewriter.cpp
+++ b/src/imagewriter.cpp
@@ -476,7 +476,6 @@ namespace {
 
 
 void ImageWriter::setHWFilterList(const QByteArray &json, const bool &inclusive) {
-    std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
     QJsonDocument json_document = QJsonDocument::fromJson(json);
     _deviceFilter = json_document.array();
     _deviceFilterIsInclusive = inclusive;
@@ -497,10 +496,8 @@ void ImageWriter::handleNetworkRequestFinished(QNetworkReply *data) {
                 //         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
                 if (_completeOsList.isEmpty()) {
-                    std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
                     _completeOsList = QJsonDocument(response_object);
                 } 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 imager_meta = _completeOsList["imager"].toObject();
                     _completeOsList = QJsonDocument(QJsonObject({
@@ -579,8 +576,6 @@ namespace {
                     }
                 }
             }
-
-            //returnArray += ositemObject;
         }
 
         return returnArray;
@@ -591,7 +586,6 @@ QByteArray ImageWriter::getFilteredOSlist() {
     QJsonArray reference_os_list_array = {};
     QJsonObject reference_imager_metadata = {};
     {
-        std::lock_guard<std::mutex> lock(_deviceListMutationMutex);
         if (!_completeOsList.isEmpty()) {
             reference_os_list_array = filterOsListWithHWTags(_completeOsList.object()["os_list"].toArray(), _deviceFilter, _deviceFilterIsInclusive);
             reference_imager_metadata = _completeOsList.object()["imager"].toObject();
diff --git a/src/imagewriter.h b/src/imagewriter.h
index 54874d8..670d996 100644
--- a/src/imagewriter.h
+++ b/src/imagewriter.h
@@ -185,7 +185,6 @@ private:
     QJsonDocument _completeOsList;
     QJsonArray _deviceFilter;
     bool _deviceFilterIsInclusive;
-    std::mutex _deviceListMutationMutex;
 
 protected:
     QUrl _src, _repo;