ai safe: HdlrDom WDom Log SafePtr MsgSelf Sem ThPoolBack

Author: fchn289

src/domino/HdlrDomino.hpp

@@ -205,6 +205,11 @@ bool HdlrDomino<aDominoType>::setMsgSelfOK(const S_PTR<MsgSelf>& aMsgSelf) noexc
 template<class aDominoType>
 void HdlrDomino<aDominoType>::triggerHdlr_(const SharedMsgCB& aValidHdlr, Domino::Event aValidEv) noexcept
 {
+    if (! msgSelf_)
+    {
+        ERR("(HdlrDom) Failed!!! since MsgSelf is invalid in triggerHdlr_().");
+        return;
+    }
     HID("(HdlrDom) trigger a new msg.");
     msgSelf_->newMsgOK(
         [weakMsgCB = WeakMsgCB(aValidHdlr)]() mutable noexcept  // WeakMsgCB is to support rm hdlr

src/domino/WbasicDatDom.hpp

@@ -57,7 +57,7 @@ S_PTR<void> WbasicDatDom<aDominoType>::getData(const Domino::EvName& aEvName) co
     if (not isWrCtrl_(ev))
         return aDominoType::getData_(ev);
 
-    WRN("(WbasicDatDom) Failed!!! EvName=" << aEvName << " is not write-protect so unavailable via this func!!!");
+    WRN("(WbasicDatDom) Failed!!! EvName=" << aEvName << " is write-protect so unavailable via this func!!!");
     return nullptr;
 }
 
@@ -74,7 +74,7 @@ bool WbasicDatDom<aDominoType>::replaceDataOK(const Domino::EvName& aEvName, S_P
 {
     const auto ev = this->getEventBy(aEvName);
     if (isWrCtrl_(ev)) {
-        WRN("(WbasicDatDom) Failed!!! EvName=" << aEvName << " is not write-protect so unavailable via this func!!!")
+        WRN("(WbasicDatDom) Failed!!! EvName=" << aEvName << " is write-protect so unavailable via this func!!!")
         return false;
     }
     else return aDominoType::replaceDataOK(aEvName, std::move(aData));

src/log/StrCoutFSL.hpp

@@ -46,6 +46,7 @@ class StringStreamBuf : public std::streambuf
 
     std::streamsize xsputn(const char* s, std::streamsize n) override
     {
+        if (!s || n <= 0) return 0;
         buf_.append(s, static_cast<size_t>(n));
         return n;
     }

src/log/UniCoutLog.cpp

@@ -21,7 +21,7 @@ ostream& UniCoutLog::oneLog() noexcept
 }
 
 // ***********************************************************************************************
-UniCoutLog UniCoutLog::defaultUniLog_;
-size_t     UniCoutLog::nLogLine_ = 0;
+UniCoutLog           UniCoutLog::defaultUniLog_;
+std::atomic<size_t>  UniCoutLog::nLogLine_ = 0;
 
 }  // namespaces

src/log/UniCoutLog.hpp

@@ -19,6 +19,7 @@
 // ***********************************************************************************************
 #pragma once
 
+#include <atomic>
 #include <iostream>
 
 #include "UniBaseLog.hpp"
@@ -41,8 +42,8 @@ class UniCoutLog
 
     // -------------------------------------------------------------------------------------------
 public:
-    static UniCoutLog defaultUniLog_;
-    static size_t     nLogLine_;  // ut only, simpler here
+    static UniCoutLog           defaultUniLog_;
+    static std::atomic<size_t>  nLogLine_;  // ut only, simpler here
 
 #ifdef IN_GTEST
     // -------------------------------------------------------------------------------------------

src/msg_self/MsgSelf.hpp

@@ -75,6 +75,11 @@ class MsgSelf : public UniLog
     explicit MsgSelf(const LogName& aUniLogName = ULN_DEFAULT) noexcept : UniLog(aUniLogName) {}
     ~MsgSelf() noexcept { if (nMsg_) WRN("discard nMsg=" << nMsg_); }
 
+    MsgSelf(const MsgSelf&)            = delete;
+    MsgSelf& operator=(const MsgSelf&) = delete;
+    MsgSelf(MsgSelf&&)                 = delete;
+    MsgSelf& operator=(MsgSelf&&)      = delete;
+
     bool   newMsgOK(MsgCB, const EMsgPriority = EMsgPri_NORM) noexcept;
     size_t nMsg() const noexcept { return nMsg_; }
     size_t nMsg(const EMsgPriority aPri) const noexcept { return aPri < EMsgPri_MAX ?  msgQueues_[aPri].size() : 0; }

src/safe_mem/SafePtr.hpp

@@ -266,9 +266,9 @@ SafeWeak<T>::SafeWeak(const SafePtr<T>& aSafeFrom) noexcept
 template<typename T>
 SafePtr<T> SafeWeak<T>::lock() const noexcept
 {
-    return (pT_.expired())
-        ? nullptr
-        : SafePtr<T>(pT_.lock(), realType_, lastType_);  // constructor is faster
+    auto sp = pT_.lock();
+    if (!sp) return SafePtr<T>();
+    return SafePtr<T>(std::move(sp), realType_, lastType_);  // constructor is faster
 }
 }  // namespace
 

src/thread/MT_Semaphore.cpp

@@ -39,6 +39,8 @@ void MT_Semaphore::timedwait(const size_t aSec, const size_t aRestNsec) noexcept
             mt_notified_.clear(std::memory_order_release);  // release: publish flag clear to other threads
             return;
         }
+        else if (errno != EINTR)  // EINVAL or other unexpected error
+            break;
 
         // impossible since MT_Semaphore's constructor
         // else if (errno == EINVAL)  // avoid dead loop

src/thread/ThPoolBack.hpp

@@ -39,6 +39,11 @@ class ThPoolBack : public ThreadBack
     explicit ThPoolBack(size_t aMaxThread = 10) noexcept(false);
     ~ThPoolBack() noexcept;
 
+    ThPoolBack(const ThPoolBack&) = delete;
+    ThPoolBack& operator=(const ThPoolBack&) = delete;
+    ThPoolBack(ThPoolBack&&) = delete;
+    ThPoolBack& operator=(ThPoolBack&&) = delete;
+
     bool newTaskOK(MT_TaskEntryFN, TaskBackFN, UniLog& = UniLog::defaultUniLog_) noexcept override;
 
 private: