From 272ce03fdcd25bf5fbca2d224badaa121ee4ac5d Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Thu, 3 Oct 2024 18:22:03 +0300 Subject: [PATCH] [all] Use uniform initialization for LockGuard Signed-off-by: Mykola Kobets --- include/aos/common/tools/allocator.hpp | 16 ++++++++-------- include/aos/common/tools/thread.hpp | 4 ++-- include/aos/common/tools/timer.hpp | 4 ++-- src/common/monitoring/resourcemonitor.cpp | 2 +- src/common/pkcs11/pkcs11.cpp | 8 ++++---- src/iam/certhandler/certhandler.cpp | 22 +++++++++++----------- src/iam/nodemanager/nodemanager.cpp | 12 ++++++------ src/iam/permhandler/permhandler.cpp | 6 +++--- src/sm/resourcemanager/resourcemanager.cpp | 18 +++++++++--------- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/aos/common/tools/allocator.hpp b/include/aos/common/tools/allocator.hpp index f7eb8fcf0..b48ade3f3 100644 --- a/include/aos/common/tools/allocator.hpp +++ b/include/aos/common/tools/allocator.hpp @@ -92,7 +92,7 @@ class Allocator : private NonCopyable { */ void Clear() { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; mAllocations->Clear(); } @@ -105,7 +105,7 @@ class Allocator : private NonCopyable { */ void* Allocate(size_t size) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; if (mAllocations->IsFull() || GetAllocatedSize() + size > mMaxSize) { assert(false); @@ -130,7 +130,7 @@ class Allocator : private NonCopyable { */ void Free(void* data) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; [[maybe_unused]] auto curEnd = mAllocations->end(); [[maybe_unused]] auto newEnd @@ -147,7 +147,7 @@ class Allocator : private NonCopyable { */ RetWithError FindAllocation(const void* data) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; return mAllocations->Find([data](const Allocation& allocation) { return allocation.Data() == data; }); } @@ -185,7 +185,7 @@ class Allocator : private NonCopyable { */ size_t FreeSize() const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; return mMaxSize - GetAllocatedSize(); } @@ -197,7 +197,7 @@ class Allocator : private NonCopyable { */ size_t MaxSize() const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; return mMaxSize; } @@ -209,7 +209,7 @@ class Allocator : private NonCopyable { */ size_t MaxAllocatedSize() const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; return mMaxAllocatedSize; } @@ -219,7 +219,7 @@ class Allocator : private NonCopyable { */ void ResetMaxAllocatedSize() { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; mMaxAllocatedSize = 0; } diff --git a/include/aos/common/tools/thread.hpp b/include/aos/common/tools/thread.hpp index 114386c9a..cde1e896e 100644 --- a/include/aos/common/tools/thread.hpp +++ b/include/aos/common/tools/thread.hpp @@ -479,7 +479,7 @@ class ThreadPool : private NonCopyable { template Error AddTask(T functor, void* arg = nullptr) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; auto err = mQueue.Push(Function()); if (!err.IsNone()) { @@ -508,7 +508,7 @@ class ThreadPool : private NonCopyable { */ Error Run() { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; mShutdown = false; diff --git a/include/aos/common/tools/timer.hpp b/include/aos/common/tools/timer.hpp index 5f2029f7b..75f1adde4 100644 --- a/include/aos/common/tools/timer.hpp +++ b/include/aos/common/tools/timer.hpp @@ -44,7 +44,7 @@ class Timer { template Error Create(unsigned int intervalMs, F functor, bool oneShot = true, void* arg = nullptr) { - aos::LockGuard lock(mMutex); + aos::LockGuard lock {mMutex}; if (mTimerID != 0) { auto err = Stop(); @@ -98,7 +98,7 @@ class Timer { */ Error Stop() { - aos::LockGuard lock(mMutex); + aos::LockGuard lock {mMutex}; mStop = true; diff --git a/src/common/monitoring/resourcemonitor.cpp b/src/common/monitoring/resourcemonitor.cpp index 41d7062af..d39567795 100644 --- a/src/common/monitoring/resourcemonitor.cpp +++ b/src/common/monitoring/resourcemonitor.cpp @@ -145,7 +145,7 @@ Error ResourceMonitor::StopInstanceMonitoring(const String& instanceID) Error ResourceMonitor::GetAverageMonitoringData(NodeMonitoringData& monitoringData) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; auto err = mAverage.GetData(monitoringData); if (!err.IsNone()) { diff --git a/src/common/pkcs11/pkcs11.cpp b/src/common/pkcs11/pkcs11.cpp index 10305a2cb..673f650ce 100644 --- a/src/common/pkcs11/pkcs11.cpp +++ b/src/common/pkcs11/pkcs11.cpp @@ -335,7 +335,7 @@ RetWithError DynamicLibraryContext::Init() Error LibraryContext::Init() { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; Error err = ErrorEnum::eNone; @@ -467,7 +467,7 @@ Error LibraryContext::GetLibInfo(LibInfo& libInfo) const RetWithError> LibraryContext::OpenSession(SlotID slotID, Flags flags) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; SessionParams params = {slotID, flags}; @@ -503,7 +503,7 @@ RetWithError> LibraryContext::OpenSession(SlotID slotI void LibraryContext::ClearSessions() { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; mSessions.Clear(); } @@ -928,7 +928,7 @@ Error SessionContext::FindObjectsFinal() const SharedPtr PKCS11Manager::OpenLibrary(const String& library) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; for (auto& lib : mLibraries) { if (lib.mFirst == library) { diff --git a/src/iam/certhandler/certhandler.cpp b/src/iam/certhandler/certhandler.cpp index b1578ad9f..4e5259f2a 100644 --- a/src/iam/certhandler/certhandler.cpp +++ b/src/iam/certhandler/certhandler.cpp @@ -21,7 +21,7 @@ CertHandler::CertHandler() Error CertHandler::RegisterModule(CertModule& module) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_INF() << "Register module: type = " << module.GetCertType(); @@ -30,7 +30,7 @@ Error CertHandler::RegisterModule(CertModule& module) Error CertHandler::GetCertTypes(Array>& certTypes) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Get all registered IAM certificate types"; @@ -46,7 +46,7 @@ Error CertHandler::GetCertTypes(Array>& certTypes) Error CertHandler::SetOwner(const String& certType, const String& password) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Set owner: type = " << certType; @@ -65,7 +65,7 @@ Error CertHandler::SetOwner(const String& certType, const String& password) Error CertHandler::Clear(const String& certType) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Clear all certificates: type = " << certType; @@ -85,7 +85,7 @@ Error CertHandler::Clear(const String& certType) Error CertHandler::CreateKey( const String& certType, const String& subjectCommonName, const String& password, String& pemCSR) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Create key: type = " << certType << ", subject = " << subjectCommonName; @@ -109,7 +109,7 @@ Error CertHandler::CreateKey( Error CertHandler::ApplyCertificate(const String& certType, const String& pemCert, CertInfo& info) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Apply cert: type = " << certType; @@ -129,7 +129,7 @@ Error CertHandler::ApplyCertificate(const String& certType, const String& pemCer Error CertHandler::GetCertificate( const String& certType, const Array& issuer, const Array& serial, CertInfo& resCert) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; StaticString serialInHex; @@ -155,7 +155,7 @@ Error CertHandler::GetCertificate( Error CertHandler::SubscribeCertReceiver(const String& certType, CertReceiverItf& certReceiver) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Subscribe certificate receiver: type = " << certType; @@ -181,7 +181,7 @@ Error CertHandler::SubscribeCertReceiver(const String& certType, CertReceiverItf Error CertHandler::UnsubscribeCertReceiver(CertReceiverItf& certReceiver) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; Error err = ErrorEnum::eNone; CertReceiverSubscription* subscription = nullptr; @@ -196,7 +196,7 @@ Error CertHandler::UnsubscribeCertReceiver(CertReceiverItf& certReceiver) Error CertHandler::CreateSelfSignedCert(const String& certType, const String& password) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Create self signed cert: type = " << certType; @@ -215,7 +215,7 @@ Error CertHandler::CreateSelfSignedCert(const String& certType, const String& pa RetWithError CertHandler::GetModuleConfig(const String& certType) const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; auto* module = FindModule(certType); if (module == nullptr) { diff --git a/src/iam/nodemanager/nodemanager.cpp b/src/iam/nodemanager/nodemanager.cpp index 83f5336ae..e40cc433c 100644 --- a/src/iam/nodemanager/nodemanager.cpp +++ b/src/iam/nodemanager/nodemanager.cpp @@ -16,7 +16,7 @@ namespace aos::iam::nodemanager { Error NodeManager::Init(NodeInfoStorageItf& storage) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; mStorage = &storage; @@ -46,7 +46,7 @@ Error NodeManager::Init(NodeInfoStorageItf& storage) Error NodeManager::SetNodeInfo(const NodeInfo& info) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; Error err = ErrorEnum::eNone; @@ -80,7 +80,7 @@ Error NodeManager::SetNodeStatus(const String& nodeId, NodeStatus status) Error NodeManager::GetNodeInfo(const String& nodeId, NodeInfo& nodeInfo) const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; auto cachedInfo = GetNodeFromCache(nodeId); @@ -95,7 +95,7 @@ Error NodeManager::GetNodeInfo(const String& nodeId, NodeInfo& nodeInfo) const Error NodeManager::GetAllNodeIds(Array>& ids) const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; for (const auto& nodeInfo : mNodeInfoCache) { auto err = ids.PushBack(nodeInfo.mNodeID); @@ -109,7 +109,7 @@ Error NodeManager::GetAllNodeIds(Array>& ids) const Error NodeManager::RemoveNodeInfo(const String& nodeId) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; auto cachedInfo = GetNodeFromCache(nodeId); if (cachedInfo == nullptr) { @@ -136,7 +136,7 @@ Error NodeManager::RemoveNodeInfo(const String& nodeId) Error NodeManager::SubscribeNodeInfoChange(NodeInfoListenerItf& listener) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; mNodeInfoListener = &listener; diff --git a/src/iam/permhandler/permhandler.cpp b/src/iam/permhandler/permhandler.cpp index ac6c40f8d..cc466dd9f 100644 --- a/src/iam/permhandler/permhandler.cpp +++ b/src/iam/permhandler/permhandler.cpp @@ -20,7 +20,7 @@ namespace permhandler { RetWithError> PermHandler::RegisterInstance( const InstanceIdent& instanceIdent, const Array& instancePermissions) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Register instance: instance = " << instanceIdent; @@ -44,7 +44,7 @@ RetWithError> PermHandler::RegisterInstance( Error PermHandler::UnregisterInstance(const InstanceIdent& instanceIdent) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Unregister instance: instance = " << instanceIdent; @@ -61,7 +61,7 @@ Error PermHandler::UnregisterInstance(const InstanceIdent& instanceIdent) Error PermHandler::GetPermissions(const String& secret, const String& funcServerID, InstanceIdent& instanceIdent, Array& servicePermissions) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Get permission: secret = " << secret << ", funcServerID = " << funcServerID; diff --git a/src/sm/resourcemanager/resourcemanager.cpp b/src/sm/resourcemanager/resourcemanager.cpp index 455f632b3..df5c7c519 100644 --- a/src/sm/resourcemanager/resourcemanager.cpp +++ b/src/sm/resourcemanager/resourcemanager.cpp @@ -42,7 +42,7 @@ Error ResourceManager::Init(JSONProviderItf& jsonProvider, HostDeviceManagerItf& RetWithError> ResourceManager::GetNodeConfigVersion() const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Get node config version: version=" << mConfig.mVersion; @@ -51,7 +51,7 @@ RetWithError> ResourceManager::GetNodeConfigVersion() Error ResourceManager::GetDeviceInfo(const String& deviceName, DeviceInfo& deviceInfo) const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Get device info: device=" << deviceName; @@ -67,7 +67,7 @@ Error ResourceManager::GetDeviceInfo(const String& deviceName, DeviceInfo& devic Error ResourceManager::GetResourceInfo(const String& resourceName, ResourceInfo& resourceInfo) const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Get resource info: resourceName=" << resourceName; @@ -84,7 +84,7 @@ Error ResourceManager::GetResourceInfo(const String& resourceName, ResourceInfo& Error ResourceManager::AllocateDevice(const String& deviceName, const String& instanceID) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Allocate device: device=" << deviceName << ", instance=" << instanceID; @@ -106,7 +106,7 @@ Error ResourceManager::AllocateDevice(const String& deviceName, const String& in Error ResourceManager::ReleaseDevice(const String& deviceName, const String& instanceID) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Release device: device=" << deviceName << ", instance=" << instanceID; @@ -115,7 +115,7 @@ Error ResourceManager::ReleaseDevice(const String& deviceName, const String& ins Error ResourceManager::ReleaseDevices(const String& instanceID) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Release devices: instanceID=" << instanceID; @@ -125,7 +125,7 @@ Error ResourceManager::ReleaseDevices(const String& instanceID) Error ResourceManager::GetDeviceInstances( const String& deviceName, Array>& instanceIDs) const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Get device instances: device=" << deviceName; @@ -134,7 +134,7 @@ Error ResourceManager::GetDeviceInstances( Error ResourceManager::CheckNodeConfig(const String& version, const String& config) const { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Check unit config: version=" << version; @@ -161,7 +161,7 @@ Error ResourceManager::CheckNodeConfig(const String& version, const String& conf Error ResourceManager::UpdateNodeConfig(const String& version, const String& config) { - LockGuard lock(mMutex); + LockGuard lock {mMutex}; LOG_DBG() << "Update config: version=" << version;