Mrntt: Call initializeDeviceReattacher in init
It works surprisingly well on the first try.
This commit is contained in:
@@ -13,12 +13,15 @@
|
||||
#include <asynchronousLoop.h>
|
||||
#include <deviceManager/device.h>
|
||||
#include <deviceManager/deviceRole.h>
|
||||
#include <deviceManager/deviceReattacher.h>
|
||||
#include <callback.h>
|
||||
#include <qutex.h>
|
||||
|
||||
namespace smo {
|
||||
namespace device {
|
||||
|
||||
class DeviceReattacher;
|
||||
|
||||
class DeviceManager
|
||||
{
|
||||
public:
|
||||
@@ -33,6 +36,9 @@ public:
|
||||
void finalize(void)
|
||||
{};
|
||||
|
||||
void initializeDeviceReattacher();
|
||||
void finalizeDeviceReattacher();
|
||||
|
||||
std::string readDapSpecFile(const std::string& filename);
|
||||
void collateAllDapSpecs(void);
|
||||
void parseAllDapSpecs(void);
|
||||
@@ -82,9 +88,9 @@ public:
|
||||
|
||||
private:
|
||||
DeviceManager()
|
||||
: qutex("DeviceManager")
|
||||
: qutex("DeviceManager"), deviceReattacher(nullptr)
|
||||
{}
|
||||
~DeviceManager() = default;
|
||||
~DeviceManager();
|
||||
DeviceManager(const DeviceManager&) = delete;
|
||||
DeviceManager& operator=(const DeviceManager&) = delete;
|
||||
|
||||
@@ -98,6 +104,8 @@ public:
|
||||
static std::vector<DeviceAttachmentSpec> commandLineDASpecs;
|
||||
|
||||
private:
|
||||
std::unique_ptr<DeviceReattacher> deviceReattacher;
|
||||
|
||||
class NewDeviceAttachmentSpecInd;
|
||||
class RemoveDeviceAttachmentSpecReq;
|
||||
class AttachSenseDeviceReq;
|
||||
|
||||
Reference in New Issue
Block a user