Cleaned up signal handling

Author: alexanderoster

Implementation/Core/amc_statesignal.cpp

@@ -713,20 +713,6 @@ namespace AMC {
 	}
 
 
-	std::string CStateSignalSlot::peekMessageFromQueueInternal(bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp)
-	{
-		std::lock_guard<std::mutex> lockGuard(m_Mutex);
-
-		if (bCheckForReactionTimeout) {
-			checkForReactionTimeoutsNoMutex(nGlobalTimestamp);
-		}
-
-		if (m_Queue.empty())
-			return "";
-
-		return m_Queue.front()->getUUID();
-	}
-
 	PStateSignalMessage CStateSignalSlot::claimMessageFromQueueInternal(bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp, uint64_t nTimeStamp)
 	{
 		(void)nTimeStamp;

Implementation/Core/amc_statesignal.hpp

@@ -223,7 +223,6 @@ namespace AMC {
 
 		void writeMessagesToArchive (CStateSignalArchiveWriter * pArchiveWriter);
 
-		std::string peekMessageFromQueueInternal(bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp);
 		PStateSignalMessage claimMessageFromQueueInternal(bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp, uint64_t nTimeStamp);
 
 		std::string getResultDataJSONInternal(const std::string& sMessageUUID);

Implementation/Core/amc_statesignalhandler.cpp

@@ -167,14 +167,6 @@ namespace AMC {
 	}
 
 
-	std::string CStateSignalInstance::peekSignalMessageFromQueue(const std::string& sSignalName, bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp)
-	{
-		AMC::PStateSignalSlot pSlot = getSignalSlot (sSignalName);
-
-		return pSlot->peekMessageFromQueueInternal(bCheckForReactionTimeout, nGlobalTimestamp);
-
-	}
-
 	bool CStateSignalInstance::claimSignalMessage(const std::string& sSignalName, bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp, uint64_t nTimeStamp, std::string& sSignalUUID, std::string& sParameterDataJSON)
 	{
 		AMC::PStateSignalSlot pSlot = getSignalSlot(sSignalName);

Implementation/Core/amc_statesignalhandler.hpp

@@ -91,8 +91,6 @@ namespace AMC {
 
 		bool hasSignalDefinition(const std::string& sSignalName);
 
-		std::string peekSignalMessageFromQueue(const std::string& sSignalName, bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp);
-
 		bool claimSignalMessage(const std::string& sSignalName, bool bCheckForReactionTimeout, uint64_t nGlobalTimestamp, uint64_t nTimeStamp, std::string& sSignalUUID, std::string& sParameterDataJSON);
 
 		bool addNewInQueueSignal(const std::string& sSignalName, const std::string& sSignalUUID, const std::string& sParameterData, uint32_t nResponseTimeOutInMS, uint64_t nTimestamp);

Implementation/UnitTest/amc_unittests_signalslot.hpp

@@ -162,7 +162,6 @@ class CUnitTestGroup_SignalSlot : public CUnitTestGroup {
         registerTest("SignalPhaseTransition", "Tests InQueue → InProcess → Handled", eUnitTestCategory::utMandatoryPass, std::bind(&CUnitTestGroup_SignalSlot::test_SignalPhaseTransition, this));
         registerTest("SignalFailureTransition", "Tests InQueue → Failed", eUnitTestCategory::utMandatoryPass, std::bind(&CUnitTestGroup_SignalSlot::test_SignalFailureTransition, this));
         registerTest("QueueOverflow", "Tests rejection of signal if queue is full", eUnitTestCategory::utMandatoryPass, std::bind(&CUnitTestGroup_SignalSlot::test_QueueOverflow, this));
-        registerTest("PeekQueue", "Tests peeking the front UUID in the queue", eUnitTestCategory::utMandatoryPass, std::bind(&CUnitTestGroup_SignalSlot::test_PeekQueue, this));
         registerTest("ParameterResultAccess", "Tests getting parameter and result JSON", eUnitTestCategory::utMandatoryPass, std::bind(&CUnitTestGroup_SignalSlot::test_ParameterResultAccess, this));
         registerTest("ClearQueueWorks", "Clears the queue and marks signals as cleared", eUnitTestCategory::utMandatoryPass, std::bind(&CUnitTestGroup_SignalSlot::test_ClearQueueWorks, this));
         registerTest("TimeoutAndOverflowTest", "Simulates queue overflow and timeout scenarios", eUnitTestCategory::utOptionalPass, std::bind(&CUnitTestGroup_SignalSlot::test_TimeoutAndOverflowTest, this));
@@ -265,24 +264,6 @@ class CUnitTestGroup_SignalSlot : public CUnitTestGroup {
         assertFalse(pMessage2 != nullptr); // queue full
     }
 
-    void test_PeekQueue() {
-
-        CDummyRegistry registry;
-
-        AMCCommon::CChrono chrono;
-        chrono.sleepMicroseconds(500);
-
-        AMC::CStateSignalSlot slot("instance", "signal", {}, {}, 1000, 5000, 3, nullptr, &registry);
-
-        chrono.sleepMicroseconds(500);
-        slot.addNewInQueueSignalInternal("aaaaaaaa-0000-0000-0000-000000000001", "{\"a\":1}", 400, chrono.getElapsedMicroseconds());
-
-        chrono.sleepMicroseconds(500);
-        slot.addNewInQueueSignalInternal("bbbbbbbb-0000-0000-0000-000000000002", "{\"b\":2}", 400, chrono.getElapsedMicroseconds());
-
-        chrono.sleepMicroseconds(500);
-        assertTrue(slot.peekMessageFromQueueInternal(true, chrono.getElapsedMicroseconds ()) == AMCCommon::CUtils::normalizeUUIDString("aaaaaaaa-0000-0000-0000-000000000001"));
-    }
 
     void test_ParameterResultAccess() {