ai perf: more

Author: fchn289

src/domino/FreeHdlrDomino.hpp

@@ -100,9 +100,9 @@ void FreeHdlrDomino<aDominoType>::triggerHdlr_(const SharedMsgCB& aValidHdlr, co
     HID("(FreeHdlrDom) trigger a call-then-rm msg for en=" << this->evName_(aValidEv));
     this->msgSelf_->newMsgOK(
         [this, aValidEv, weakHdlr = WeakMsgCB(aValidHdlr)]() noexcept {
-            if (weakHdlr.expired())  // validate
+            auto hdlr = weakHdlr.lock();  // get & validate
+            if (! hdlr)
                 return;  // otherwise crash
-            auto hdlr = weakHdlr.lock();  // get
             this->rmOneHdlrOK_(aValidEv, hdlr);  // safer to rm first to avoid hdlr does sth strange
             try { (*(hdlr.get()))(); }  // call; setHdlr() forbid cb==null
             catch(...) { ERR("(FreeHdlrDom) except when exe callback!!! ev=" << aValidEv); }

src/domino/HdlrDomino.hpp

@@ -157,15 +157,15 @@ Domino::Event HdlrDomino<aDominoType>::setHdlr(const Domino::EvName& aEvName, co
         return Domino::D_EVENT_FAILED_RET;
     }
     auto&& newEv = this->newEvent(aEvName);
-    if (ev_hdlr_S_.find(newEv) != ev_hdlr_S_.end())
+
+    // set
+    auto newHdlr = MAKE_PTR<MsgCB>(aHdlr);
+    auto&& ev_hdlr = ev_hdlr_S_.emplace(newEv, newHdlr);
+    if (! ev_hdlr.second)
     {
         ERR("(HdlrDom) Failed!!! Can't overwrite hdlr for " << aEvName << ". Rm old or Use MultiHdlrDomino instead.");
         return Domino::D_EVENT_FAILED_RET;
     }
-
-    // set
-    auto newHdlr = MAKE_PTR<MsgCB>(aHdlr);
-    ev_hdlr_S_.emplace(newEv, newHdlr);
     HID("(HdlrDom) Succeed for EvName=" << aEvName);
 
     // call
@@ -207,8 +207,8 @@ void HdlrDomino<aDominoType>::triggerHdlr_(const SharedMsgCB& aValidHdlr, const
     msgSelf_->newMsgOK(
         [weakMsgCB = WeakMsgCB(aValidHdlr)]() mutable noexcept  // WeakMsgCB is to support rm hdlr
         {
-            if (! weakMsgCB.expired()) {
-                try { (*(weakMsgCB.lock().get()))(); }  // setHdlr() forbid cb==null
+            if (auto cb = weakMsgCB.lock()) {
+                try { (*(cb.get()))(); }  // setHdlr() forbid cb==null
                 catch(...) {}
             }
         },

src/domino/MultiHdlrDomino.hpp

@@ -34,7 +34,7 @@ class MultiHdlrDomino : public aDominoType
 {
 public:
     using HdlrName  = std::string;
-    using HName_Hdlr_S = std::map<HdlrName, SharedMsgCB>;
+    using HName_Hdlr_S = std::unordered_map<HdlrName, SharedMsgCB>;
 
     explicit MultiHdlrDomino(const LogName& aUniLogName = ULN_DEFAULT) noexcept : aDominoType(aUniLogName) {}
 
@@ -98,22 +98,14 @@ Domino::Event MultiHdlrDomino<aDominoType>::multiHdlrOnSameEv(const Domino::EvNa
 
     // set hdlr
     auto&& newHdlr = MAKE_PTR<MsgCB>(aHdlr);
-    auto&& ev = this->getEventBy(aEvName);
-    auto&& ev_hdlrs = ev_hdlrs_S_.find(ev);
-    if (ev_hdlrs == ev_hdlrs_S_.end())
-    {
-        ev = this->newEvent(aEvName);
-        ev_hdlrs_S_[ev].emplace(aHdlrName, newHdlr);
-    }
-    else
+    auto&& ev = this->newEvent(aEvName);
+
+    auto [ev_hdlrs, _] = ev_hdlrs_S_.try_emplace(ev);
+    auto [name_hdlr, insertNew] = ev_hdlrs->second.try_emplace(aHdlrName, newHdlr);
+    if (!insertNew)
     {
-        auto&& name_hdlr = ev_hdlrs->second.find(aHdlrName);
-        if (name_hdlr != ev_hdlrs->second.end())
-        {
-            WRN("(MultiHdlrDom)!!! Failed since dup EvName=" << aEvName << " + HdlrName=" << aHdlrName);
-            return Domino::D_EVENT_FAILED_RET;
-        }
-        ev_hdlrs->second.emplace(aHdlrName, newHdlr);
+        WRN("(MultiHdlrDom)!!! Failed since dup EvName=" << aEvName << " + HdlrName=" << aHdlrName);
+        return Domino::D_EVENT_FAILED_RET;
     }
     HID("(MultiHdlrDom) Succeed for EvName=" << aEvName << ", HdlrName=" << aHdlrName);
 

src/domino/WbasicDatDom.hpp

@@ -75,7 +75,7 @@ bool WbasicDatDom<aDominoType>::replaceDataOK(const Domino::EvName& aEvName, S_P
         WRN("(WbasicDatDom) Failed!!! EvName=" << aEvName << " is not write-protect so unavailable via this func!!!")
         return false;
     }
-    else return aDominoType::replaceDataOK(aEvName, aData);
+    else return aDominoType::replaceDataOK(aEvName, std::move(aData));
 }
 
 // ***********************************************************************************************
@@ -104,7 +104,7 @@ template<typename aDominoType>
 bool WbasicDatDom<aDominoType>::wbasic_replaceDataOK(const Domino::EvName& aEvName, S_PTR<void> aData) noexcept
 {
     if (isWrCtrl(aEvName))
-        return aDominoType::replaceDataOK(aEvName, aData);
+        return aDominoType::replaceDataOK(aEvName, std::move(aData));
     else {
         WRN("(WbasicDatDom) Failed!!! EvName=" << aEvName << " is not write-protect so unavailable via this func!!!")
         return false;

src/msg_self/MsgSelf.cpp

@@ -18,12 +18,13 @@ bool MsgSelf::handleOneMsg_() noexcept
         if (oneQueue.empty())
             continue;
 
-        try { oneQueue.front()(); } // run 1st MsgCB; newMsgOK() prevent nullptr into msgQueues_
-        catch(...) { ERR("(MsgSelf) except->failed!!!"); }
-
+        auto msg = std::move(oneQueue.front());
         oneQueue.pop_front();  // except can't recover->terminate
         --nMsg_;
 
+        try { msg(); } // run 1st MsgCB; newMsgOK() prevent nullptr into msgQueues_
+        catch(...) { ERR("(MsgSelf) except->failed!!!"); }
+
         if (not nMsg())
             return false;    // no more to continue
         if (isLowPri(EMsgPriority(msgPri)))