remove lock in event management (#19285)

project-chip · Jun 8, 2022 · b8e9ab1 · b8e9ab1
1 parent b2fe30f
commit b8e9ab1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 50 deletions.
diff --git a/src/app/EventManagement.cpp b/src/app/EventManagement.cpp
@@ -123,14 +123,6 @@ void EventManagement::Init(Messaging::ExchangeManager * apExchangeManager, uint3
  mpEventBuffer = apCircularEventBuffer;
  mState = EventManagementStates::Idle;
  mBytesWritten = 0;
-
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- CHIP_ERROR err = chip::System::Mutex::Init(mAccessLock);
- if (err != CHIP_NO_ERROR)
- {
- ChipLogError(EventLogging, "mutex init fails with error %s", ErrorStr(err));
- }
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
 }
 
 CHIP_ERROR EventManagement::CopyToNextBuffer(CircularEventBuffer * apEventBuffer)
@@ -347,9 +339,6 @@ void EventManagement::CreateEventManagement(Messaging::ExchangeManager * apExcha
  */
 void EventManagement::DestroyEventManagement()
 {
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
  sInstance.mState = EventManagementStates::Shutdown;
  sInstance.mpEventBuffer = nullptr;
  sInstance.mpExchangeMgr = nullptr;
@@ -408,17 +397,8 @@ void EventManagement::VendEventNumber()
 CHIP_ERROR EventManagement::LogEvent(EventLoggingDelegate * apDelegate, const EventOptions & aEventOptions,
  EventNumber & aEventNumber)
 {
- CHIP_ERROR err = CHIP_NO_ERROR;
- {
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
- VerifyOrExit(mState != EventManagementStates::Shutdown, err = CHIP_ERROR_INCORRECT_STATE);
- err = LogEventPrivate(apDelegate, aEventOptions, aEventNumber);
- }
-exit:
- return err;
+ VerifyOrReturnError(mState != EventManagementStates::Shutdown, CHIP_ERROR_INCORRECT_STATE);
+ return LogEventPrivate(apDelegate, aEventOptions, aEventNumber);
 }
 
 CHIP_ERROR EventManagement::LogEventPrivate(EventLoggingDelegate * apDelegate, const EventOptions & aEventOptions,
@@ -721,10 +701,6 @@ CHIP_ERROR EventManagement::FetchEventsSince(TLVWriter & aWriter, const ObjectLi
  CircularEventBufferWrapper bufWrapper;
  EventLoadOutContext context(aWriter, PriorityLevel::Invalid, aEventMin);
 
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
  context.mSubjectDescriptor = aSubjectDescriptor;
  context.mpInterestedEventPaths = apEventPathList;
  err = GetEventReader(reader, PriorityLevel::Critical, &bufWrapper);
@@ -801,10 +777,6 @@ CHIP_ERROR EventManagement::FabricRemoved(FabricIndex aFabricIndex)
  TLVReader reader;
  CircularEventBufferWrapper bufWrapper;
 
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
  ReturnErrorOnFailure(GetEventReader(reader, PriorityLevel::Critical, &bufWrapper));
  CHIP_ERROR err = TLV::Utilities::Iterate(reader, FabricRemovedCB, &aFabricIndex, recurse);
  if (err == CHIP_END_OF_TLV)
@@ -925,10 +897,6 @@ CHIP_ERROR EventManagement::EvictEvent(CHIPCircularTLVBuffer & apBuffer, void *
 
 void EventManagement::SetScheduledEventInfo(EventNumber & aEventNumber, uint32_t & aInitialWrittenEventBytes) const
 {
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- ScopedLock lock(sInstance);
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
  aEventNumber = mLastEventNumber;
  aInitialWrittenEventBytes = mBytesWritten;
 }

diff --git a/src/app/EventManagement.h b/src/app/EventManagement.h
@@ -36,7 +36,6 @@
 #include <lib/core/CHIPCircularTLVBuffer.h>
 #include <lib/support/CHIPCounter.h>
 #include <messaging/ExchangeMgr.h>
-#include <system/SystemMutex.h>
 
 #define CHIP_CONFIG_EVENT_GLOBAL_PRIORITY PriorityLevel::Debug
 
@@ -229,18 +228,6 @@ class EventManagement
 
  static void DestroyEventManagement();
 
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- class ScopedLock
- {
- public:
- ScopedLock(EventManagement & aEventManagement) : mEventManagement(aEventManagement) { mEventManagement.mAccessLock.Lock(); }
- ~ScopedLock() { mEventManagement.mAccessLock.Unlock(); }
-
- private:
- EventManagement & mEventManagement;
- };
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
-
  /**
  * @brief
  * Log an event via a EventLoggingDelegate, with options.
@@ -523,9 +510,6 @@ class EventManagement
  Messaging::ExchangeManager * mpExchangeMgr = nullptr;
  EventManagementStates mState = EventManagementStates::Shutdown;
  uint32_t mBytesWritten = 0;
-#if !CHIP_SYSTEM_CONFIG_NO_LOCKING
- System::Mutex mAccessLock;
-#endif // !CHIP_SYSTEM_CONFIG_NO_LOCKING
 
  // The counter we're going to use for event numbers.
  MonotonicallyIncreasingCounter<EventNumber> * mpEventNumberCounter = nullptr;