Cache discovered HackRF results for claimed devices

Changelog.txt

@@ -1,3 +1,8 @@
+Release 0.3.1 (pending)
+==========================
+
+- Cache discovered HackRF results for claimed devices
+
 Release 0.3.0 (2017-04-29)
 ==========================
 

HackRF_Registation.cpp

@@ -23,7 +23,7 @@
 #include "SoapyHackRF.hpp"
 #include <SoapySDR/Registry.hpp>
 
-
+static std::map<std::string, SoapySDR::Kwargs> _cachedResults;
 
 static std::vector<SoapySDR::Kwargs> find_HackRF(const SoapySDR::Kwargs &args)
 {
@@ -86,6 +86,7 @@ static std::vector<SoapySDR::Kwargs> find_HackRF(const SoapySDR::Kwargs &args)
 				if (serialMatch and idxMatch)
 				{
 					results.push_back(options);
+					_cachedResults[serial_str] = options;
 				}
 
 				hackrf_close(device);
@@ -97,6 +98,14 @@ static std::vector<SoapySDR::Kwargs> find_HackRF(const SoapySDR::Kwargs &args)
 
 	hackrf_device_list_free(list);
 
+	//fill in the cached results for claimed handles
+	for (const auto &serial : HackRF_getClaimedSerials())
+	{
+		if (_cachedResults.count(serial) == 0) continue;
+		if (args.count("serial") != 0 and args.at("serial") != serial) continue;
+		results.push_back(_cachedResults.at(serial));
+	}
+
 	return results;
 }
 

HackRF_Settings.cpp

@@ -23,6 +23,11 @@
 
 #include "SoapyHackRF.hpp"
 
+std::set<std::string> &HackRF_getClaimedSerials(void)
+{
+	static std::set<std::string> serials;
+	return serials;
+}
 
 SoapyHackRF::SoapyHackRF( const SoapySDR::Kwargs &args )
 {
@@ -70,11 +75,15 @@ SoapyHackRF::SoapyHackRF( const SoapySDR::Kwargs &args )
 		SoapySDR_logf( SOAPY_SDR_INFO, "Could not Open HackRF Device" );
 		throw std::runtime_error("hackrf open failed");
 	}
+
+	HackRF_getClaimedSerials().insert(_serial);
 }
 
 
 SoapyHackRF::~SoapyHackRF( void )
 {
+	HackRF_getClaimedSerials().erase(_serial);
+
 	if ( _dev )
 	{
 		hackrf_close( _dev );

SoapyHackRF.hpp

@@ -28,6 +28,7 @@
 #include <condition_variable>
 #include <SoapySDR/Device.hpp>
 #include <SoapySDR/Logger.hpp>
+#include <set>
 
 #define BUF_LEN			262144
 #define BUF_NUM			15
@@ -50,6 +51,7 @@ typedef enum {
 	HACKRF_TRANSCEIVER_MODE_TX = 2,
 } HackRF_transceiver_mode_t;
 
+std::set<std::string> &HackRF_getClaimedSerials(void);
 
 /*!
  * The session object manages hackrf_init/exit