Add RAII locks for thread safety

- Removed the extra step checking for PolledBno devices, as the thread-safety additions ensure no streams will clash

Author: bparks13

Source/Onix1.cpp

@@ -120,6 +120,8 @@ std::vector<int> Onix1::getDeviceIndices(device_map_t deviceMap, int hubIndex)
 
 int Onix1::get_opt_(int option, void* value, size_t* size) const
 {
+	const ScopedLock lock(optionLock);
+
 	int rc = oni_get_opt(ctx_, option, value, size);
 	if (rc != ONI_ESUCCESS)
 		LOGE(oni_error_str(rc));
@@ -128,6 +130,8 @@ int Onix1::get_opt_(int option, void* value, size_t* size) const
 
 int Onix1::readRegister(oni_dev_idx_t devIndex, oni_reg_addr_t registerAddress, oni_reg_val_t* value) const
 {
+	const ScopedLock lock(registerLock);
+
 	int rc = oni_read_reg(ctx_, devIndex, registerAddress, value);
 	if (rc != ONI_ESUCCESS)
 		LOGE(oni_error_str(rc));
@@ -136,6 +140,8 @@ int Onix1::readRegister(oni_dev_idx_t devIndex, oni_reg_addr_t registerAddress,
 
 int Onix1::writeRegister(oni_dev_idx_t devIndex, oni_reg_addr_t registerAddress, oni_reg_val_t value) const
 {
+	const ScopedLock lock(registerLock);
+
 	int rc = oni_write_reg(ctx_, devIndex, registerAddress, value);
 	if (rc != ONI_ESUCCESS)
 		LOGE(oni_error_str(rc));
@@ -161,6 +167,8 @@ double Onix1::convertTimestampToSeconds(uint64_t timestamp) const
 
 oni_frame_t* Onix1::readFrame() const
 {
+	const ScopedLock lock(frameLock);
+
 	oni_frame_t* frame = nullptr;
 	int rc = oni_read_frame(ctx_, &frame);
 	if (rc < ONI_ESUCCESS)

Source/Onix1.h

@@ -27,6 +27,8 @@
 #include <system_error>
 #include <exception>
 
+#include <DataThreadHeaders.h>
+
 #include "../../plugin-GUI/Source/Utils/Utils.h"
 
 namespace OnixSourcePlugin
@@ -90,6 +92,8 @@ namespace OnixSourcePlugin
 		template <typename opt_t>
 		int setOption(int option, const opt_t value)
 		{
+			const ScopedLock lock(optionLock);
+
 			int rc = oni_set_opt(ctx_, option, &value, opt_size_<opt_t>(value));
 			if (rc != ONI_ESUCCESS) LOGE(oni_error_str(rc));
 			return rc;
@@ -123,6 +127,10 @@ namespace OnixSourcePlugin
 		/** The ONI ctx object */
 		oni_ctx ctx_;
 
+		CriticalSection registerLock;
+		CriticalSection frameLock;
+		CriticalSection optionLock;
+
 		int major;
 		int minor;
 		int patch;

Source/OnixDevice.h

@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include <DataThreadHeaders.h>
-
 #include <ctime>
 #include <ratio>
 #include <chrono>

Source/OnixSource.cpp

@@ -1052,12 +1052,6 @@ bool OnixSource::stopAcquisition()
 	if (!portA->getErrorFlag() && !portB->getErrorFlag())
 		waitForThreadToExit(2000);
 
-	for (const auto& polledBno055 : getDevices(OnixDeviceType::POLLEDBNO))
-	{
-		if (polledBno055 != nullptr && polledBno055->isEnabled())
-			polledBno055->stopAcquisition(); // NB: Polled BNO must be stopped before other devices to ensure there are no stream clashes
-	}
-
 	for (const auto& source : enabledSources)
 	{
 		source->stopAcquisition();