SMPHandler: Also use service_runner; Remove HCIHandler::pidSelf

1 files changed, 4 insertions, 7 deletions

diff --git a/api/direct_bt/SMPHandler.hpp b/api/direct_bt/SMPHandler.hpp
index c29ae250..984c9168 100644
--- a/api/direct_bt/SMPHandler.hpp
+++ b/api/direct_bt/SMPHandler.hpp
@@ -40,6 +40,7 @@
 #include <jau/darray.hpp>
 #include <jau/cow_darray.hpp>
 #include <jau/uuid.hpp>
+#include <jau/service_runner.hpp>
 
 #include "BTTypes0.hpp"
 #include "L2CAPComm.hpp"
@@ -188,13 +189,8 @@ namespace direct_bt {
             jau::sc_atomic_bool is_connected; // reflects state
             jau::relaxed_atomic_bool has_ioerror;  // reflects state
 
+            jau::service_runner smp_reader_service;
             jau::ringbuffer<std::unique_ptr<const SMPPDUMsg>, jau::nsize_t> smpPDURing;
-            jau::sc_atomic_bool l2capReaderShallStop;
-
-            std::mutex mtx_l2capReaderLifecycle;
-            std::condition_variable cv_l2capReaderInit;
-            pthread_t l2capReaderThreadId;
-            jau::sc_atomic_bool l2capReaderRunning;
 
             SMPSecurityReqCallbackList smpSecurityReqCallbackList;
 
@@ -202,7 +198,8 @@ namespace direct_bt {
 
             bool validateConnected() noexcept;
 
-            void l2capReaderThreadImpl();
+            void smpReaderWork(jau::service_runner& sr) noexcept;
+            void smpReaderEndLocked(jau::service_runner& sr) noexcept;
 
             void send(const SMPPDUMsg & msg);
             std::unique_ptr<const SMPPDUMsg> sendWithReply(const SMPPDUMsg & msg, const int timeout);