BLE: cleanup PalEvent queue and implementation

Author: pan-

connectivity/FEATURE_BLE/source/cordio/include/ble/internal/BLEInstanceBaseImpl.h

@@ -40,6 +40,7 @@
 #include "source/generic/GattClientImpl.h"
 #include "source/GattServerImpl.h"
 #include "source/generic/SecurityManagerImpl.h"
+#include "internal/PalEventQueueImpl.h"
 
 namespace ble {
 
@@ -176,7 +177,7 @@ class BLEInstanceBase : public interface::BLEInstanceBase {
         INITIALIZED
     } initialization_status;
 
-    mutable ble::PalEventQueue _event_queue;
+    mutable ble::impl::PalEventQueue _event_queue;
     mbed::LowPowerTimer _timer;
     uint64_t _last_update_us;
 };

connectivity/FEATURE_BLE/source/cordio/include/ble/internal/PalEventQueueImpl.h

@@ -28,10 +28,12 @@ namespace ble {
 
 class BLEInstanceBase;
 
+namespace impl {
+
 /**
  * Simple implementation of the EventQueue.
  */
-class PalEventQueue : interface::PalEventQueue {
+class PalEventQueue final : public ble::PalEventQueue {
 public:
     typedef mbed::Callback<void()> event_t;
 
@@ -41,15 +43,17 @@ class PalEventQueue : interface::PalEventQueue {
      * @attention a call to initialize is mandatory before any other call.
      */
     PalEventQueue() :
-        _ble_base(NULL), _events(NULL) { }
+        _ble_base(nullptr), _events(nullptr)
+    {
+    }
 
     /**
      * Initialize the event queue with a BLEInstanceBase and a ble id.
      *
      * @param ble_base the instance which will be used to signal the presence
      * of new events.
      */
-    void initialize(BLEInstanceBase* ble_base)
+    void initialize(ble::BLEInstanceBase *ble_base)
     {
         _ble_base = ble_base;
     }
@@ -65,25 +69,22 @@ class PalEventQueue : interface::PalEventQueue {
     /**
      * @see ble::post
      */
-    virtual bool post(const mbed::Callback<void()>& event)
+    bool post(const mbed::Callback<void()> &event) final
     {
-        if (_ble_base == NULL) {
+        if (_ble_base == nullptr) {
             return false;
         }
-        void* event_buf = WsfBufAlloc(sizeof(EventNode));
-        MBED_ASSERT(event_buf != NULL);
-        if (event_buf == NULL) {
-            return false;
-        }
-        EventNode* next = new(event_buf) EventNode(event);
-        if (next == NULL) {
+        void *event_buf = WsfBufAlloc(sizeof(EventNode));
+        MBED_ASSERT(event_buf != nullptr);
+        if (event_buf == nullptr) {
             return false;
         }
+        auto *next = new(event_buf) EventNode(event);
 
-        if (_events == NULL) {
+        if (_events == nullptr) {
             _events = next;
         } else {
-            EventNode* previous = _events;
+            EventNode *previous = _events;
             while (previous->next) {
                 previous = previous->next;
             }
@@ -102,7 +103,7 @@ class PalEventQueue : interface::PalEventQueue {
     void clear()
     {
         while (_events) {
-            EventNode* next = _events->next;
+            EventNode *next = _events->next;
             _events->~EventNode();
             WsfBufFree(_events);
             _events = next;
@@ -115,7 +116,7 @@ class PalEventQueue : interface::PalEventQueue {
     void process()
     {
         while (_events) {
-            EventNode* next = _events->next;
+            EventNode *next = _events->next;
             _events->event();
             _events->~EventNode();
             WsfBufFree(_events);
@@ -125,17 +126,21 @@ class PalEventQueue : interface::PalEventQueue {
 
 private:
     struct EventNode {
-        EventNode(const event_t event) : event(event), next(NULL) { }
+        EventNode(const event_t event) : event(event), next(nullptr)
+        {
+        }
+
         event_t event;
-        EventNode* next;
+        EventNode *next;
     };
 
     void signal_event();
 
-    BLEInstanceBase* _ble_base;
-    EventNode* _events;
+    ble::BLEInstanceBase *_ble_base;
+    EventNode *_events;
 };
 
+} // namespace impl
 } // namespace ble
 
 #endif /* BLE_PAL_SIMPLE_EVENT_QUEUE_H_ */

connectivity/FEATURE_BLE/source/cordio/source/PalEventQueueImpl.cpp

@@ -16,14 +16,16 @@
  * limitations under the License.
  */
 
-#include "source/pal/PalEventQueue.h"
+#include "internal/PalEventQueueImpl.h"
 #include "source/BLEInstanceBase.h"
 
 namespace ble {
+namespace impl {
 
 void PalEventQueue::signal_event()
 {
     _ble_base->signalEventsToProcess();
 }
 
+} // namespace impl
 } // namespace ble

connectivity/FEATURE_BLE/source/generic/GapImpl.cpp

@@ -318,7 +318,7 @@ const central_privacy_configuration_t Gap::default_central_privacy_configuration
 };
 
 Gap::Gap(
-    PalEventQueue &event_queue,
+    ble::PalEventQueue &event_queue,
     PalGap &pal_gap,
     PalGenericAccessService &generic_access_service,
     PalSecurityManager &pal_sm

connectivity/FEATURE_BLE/source/generic/GapImpl.h

@@ -357,7 +357,7 @@ class Gap :
     Gap &operator=(const Gap &);
 
     Gap(
-        PalEventQueue &event_queue,
+        ble::PalEventQueue &event_queue,
         PalGap &pal_gap,
         PalGenericAccessService &generic_access_service,
         PalSecurityManager &pal_sm

connectivity/FEATURE_BLE/source/pal/PalEventQueue.h

@@ -22,7 +22,6 @@
 #include "platform/Callback.h"
 
 namespace ble {
-namespace interface {
 
 /**
  * Simple interface which allow upper layer to post an event into the event
@@ -55,11 +54,6 @@ class PalEventQueue {
     virtual bool post(const mbed::Callback<void()>& event) = 0;
 };
 
-} // namespace interface
 } // namespace ble
 
-/* This includes the concrete class implementation, to provide a an alternative BLE PAL implementation
- * disable Cordio and place your header in a path with the same structure */
-#include "ble/internal/PalEventQueueImpl.h"
-
 #endif /* BLE_PAL_EVENT_QUEUE_H_ */