summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2021-01-06 11:00:03 +0100
committerSven Gothel <[email protected]>2021-01-06 11:00:03 +0100
commitea6e9928c27ea59cb1368819b635c6f38a518557 (patch)
treea1d6c6a0e7703fcac809863901cd666697d21985 /api
parentc0c55bdeb99bb6b840cd5859f45050d61e736f45 (diff)
Replace jau::cow_vector with jau::cow_darray (simple type replacement, compatible API)
Diffstat (limited to 'api')
-rw-r--r--api/direct_bt/DBTAdapter.hpp4
-rw-r--r--api/direct_bt/DBTManager.hpp6
-rw-r--r--api/direct_bt/GATTHandler.hpp4
-rw-r--r--api/direct_bt/HCIHandler.hpp2
-rw-r--r--api/direct_bt/MgmtTypes.hpp6
-rw-r--r--api/direct_bt/SMPHandler.hpp4
6 files changed, 13 insertions, 13 deletions
diff --git a/api/direct_bt/DBTAdapter.hpp b/api/direct_bt/DBTAdapter.hpp
index 32d381e4..7aee541c 100644
--- a/api/direct_bt/DBTAdapter.hpp
+++ b/api/direct_bt/DBTAdapter.hpp
@@ -35,7 +35,7 @@
#include <mutex>
#include <atomic>
-#include <jau/cow_vector.hpp>
+#include <jau/cow_darray.hpp>
#include "DBTTypes.hpp"
@@ -223,7 +223,7 @@ namespace direct_bt {
std::vector<std::shared_ptr<DBTDevice>> connectedDevices;
std::vector<std::shared_ptr<DBTDevice>> discoveredDevices; // all discovered devices
std::vector<std::shared_ptr<DBTDevice>> sharedDevices; // All active shared devices. Final holder of DBTDevice lifecycle!
- jau::cow_vector<std::shared_ptr<AdapterStatusListener>> statusListenerList;
+ jau::cow_darray<std::shared_ptr<AdapterStatusListener>> statusListenerList;
std::mutex mtx_discoveredDevices;
std::mutex mtx_connectedDevices;
std::mutex mtx_discovery;
diff --git a/api/direct_bt/DBTManager.hpp b/api/direct_bt/DBTManager.hpp
index e35522f6..d3694a3f 100644
--- a/api/direct_bt/DBTManager.hpp
+++ b/api/direct_bt/DBTManager.hpp
@@ -39,7 +39,7 @@
#include <jau/environment.hpp>
#include <jau/ringbuffer.hpp>
#include <jau/java_uplink.hpp>
-#include <jau/cow_vector.hpp>
+#include <jau/cow_darray.hpp>
#include "BTTypes.hpp"
#include "BTIoctl.hpp"
@@ -177,7 +177,7 @@ namespace direct_bt {
* @see DBTManager::removeChangedAdapterSetCallback()
*/
typedef jau::FunctionDef<bool, bool, const AdapterInfo&> ChangedAdapterSetCallback;
- typedef jau::cow_vector<ChangedAdapterSetCallback> ChangedAdapterSetCallbackList;
+ typedef jau::cow_darray<ChangedAdapterSetCallback> ChangedAdapterSetCallbackList;
/**
* A thread safe singleton handler of the Linux Kernel's BlueZ manager control channel.
@@ -238,7 +238,7 @@ namespace direct_bt {
ChangedAdapterSetCallbackList mgmtChangedAdapterSetCallbackList;
- jau::cow_vector<std::shared_ptr<AdapterInfo>> adapterInfos;
+ jau::cow_darray<std::shared_ptr<AdapterInfo>> adapterInfos;
/**
* Using defaultIOCapability on added AdapterInfo.
diff --git a/api/direct_bt/GATTHandler.hpp b/api/direct_bt/GATTHandler.hpp
index d477b649..2dd53019 100644
--- a/api/direct_bt/GATTHandler.hpp
+++ b/api/direct_bt/GATTHandler.hpp
@@ -38,7 +38,7 @@
#include <jau/environment.hpp>
#include <jau/ringbuffer.hpp>
-#include <jau/cow_vector.hpp>
+#include <jau/cow_darray.hpp>
#include "UUID.hpp"
#include "BTTypes.hpp"
@@ -173,7 +173,7 @@ namespace direct_bt {
/** send immediate confirmation of indication events from device, defaults to true. */
jau::relaxed_atomic_bool sendIndicationConfirmation = true;
- jau::cow_vector<std::shared_ptr<GATTCharacteristicListener>> characteristicListenerList;
+ jau::cow_darray<std::shared_ptr<GATTCharacteristicListener>> characteristicListenerList;
uint16_t serverMTU;
std::atomic<uint16_t> usedMTU; // concurrent use in ctor(set), send and l2capReaderThreadImpl
diff --git a/api/direct_bt/HCIHandler.hpp b/api/direct_bt/HCIHandler.hpp
index a33840bd..b42489c0 100644
--- a/api/direct_bt/HCIHandler.hpp
+++ b/api/direct_bt/HCIHandler.hpp
@@ -149,7 +149,7 @@ namespace direct_bt {
typedef jau::FunctionDef<bool, const BDAddressAndType& /* addressAndType */,
const SMPPDUMsg&, const HCIACLData::l2cap_frame& /* source */> HCISMPMsgCallback;
- typedef jau::cow_vector<HCISMPMsgCallback> HCISMPMsgCallbackList;
+ typedef jau::cow_darray<HCISMPMsgCallback> HCISMPMsgCallbackList;
/**
* A thread safe singleton handler of the HCI control channel to one controller (BT adapter)
diff --git a/api/direct_bt/MgmtTypes.hpp b/api/direct_bt/MgmtTypes.hpp
index 027a3dbd..ade7be2c 100644
--- a/api/direct_bt/MgmtTypes.hpp
+++ b/api/direct_bt/MgmtTypes.hpp
@@ -33,7 +33,7 @@
#include <mutex>
#include <jau/function_def.hpp>
-#include <jau/cow_vector.hpp>
+#include <jau/cow_darray.hpp>
#include <jau/packed_attribute.hpp>
#include "BTTypes.hpp"
@@ -2233,7 +2233,7 @@ namespace direct_bt {
};
typedef jau::FunctionDef<bool, const MgmtEvent&> MgmtEventCallback;
- typedef jau::cow_vector<MgmtEventCallback> MgmtEventCallbackList;
+ typedef jau::cow_darray<MgmtEventCallback> MgmtEventCallbackList;
class MgmtAdapterEventCallback {
private:
@@ -2273,7 +2273,7 @@ namespace direct_bt {
}
};
- typedef jau::cow_vector<MgmtAdapterEventCallback> MgmtAdapterEventCallbackList;
+ typedef jau::cow_darray<MgmtAdapterEventCallback> MgmtAdapterEventCallbackList;
} // namespace direct_bt
diff --git a/api/direct_bt/SMPHandler.hpp b/api/direct_bt/SMPHandler.hpp
index 15485c36..8e5d32fa 100644
--- a/api/direct_bt/SMPHandler.hpp
+++ b/api/direct_bt/SMPHandler.hpp
@@ -38,7 +38,7 @@
#include <jau/environment.hpp>
#include <jau/ringbuffer.hpp>
#include <jau/function_def.hpp>
-#include <jau/cow_vector.hpp>
+#include <jau/cow_darray.hpp>
#include "UUID.hpp"
#include "BTTypes.hpp"
@@ -131,7 +131,7 @@ namespace direct_bt {
typedef jau::FunctionDef<bool, const SMPPDUMsg&> SMPSecurityReqCallback;
- typedef jau::cow_vector<SMPSecurityReqCallback> SMPSecurityReqCallbackList;
+ typedef jau::cow_darray<SMPSecurityReqCallback> SMPSecurityReqCallbackList;
/**
* A thread safe SMP handler associated to one device via one L2CAP connection.