SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@213 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2016-07-26 19:27:12 +00:00
parent d951871dec
commit 00d163b4bc
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/io/piconnection.cpp
View File

@@ -323,6 +323,7 @@ PIIODevice * PIConnection::addDevice(const PIString & full_path, PIIODevice::Dev
d->setInterval(10.); d->setInterval(10.);
diags_[dev] = d; diags_[dev] = d;
CONNECTU(d, qualityChanged, this, diagQualityChanged); CONNECTU(d, qualityChanged, this, diagQualityChanged);
__device_pool__->init();
} }
__device_pool__->unlock(); __device_pool__->unlock();
} }
@@ -857,6 +858,19 @@ bool PIConnection::isFakeMode() {
PIConnection::DevicePool::DevicePool(): PIThread(false, 10) {
setName("PIConnection::DevicePool");
needLockRun(true);
fake = false;
}
void PIConnection::DevicePool::init() {
if (!isRunning())
start(10);
}
PIIODevice * PIConnection::DevicePool::addDevice(PIConnection * parent, const PIString & fp, PIIODevice::DeviceMode mode, bool start) { PIIODevice * PIConnection::DevicePool::addDevice(PIConnection * parent, const PIString & fp, PIIODevice::DeviceMode mode, bool start) {
DeviceData * dd = devices[fp]; DeviceData * dd = devices[fp];
int pmode(0); int pmode(0);

3
src/io/piconnection.h
View File

@@ -278,8 +278,9 @@ public:
PIOBJECT_SUBCLASS(DevicePool, PIThread) PIOBJECT_SUBCLASS(DevicePool, PIThread)
friend class PIConnection; friend class PIConnection;
public: public:
DevicePool(): PIThread(true, 10) {setName("PIConnection::DevicePool"); needLockRun(true); fake = false;} DevicePool();
void init();
PIIODevice * addDevice(PIConnection * parent, const PIString & fp, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite, bool start = true); PIIODevice * addDevice(PIConnection * parent, const PIString & fp, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite, bool start = true);
bool removeDevice(PIConnection * parent, const PIString & fp); bool removeDevice(PIConnection * parent, const PIString & fp);
void unboundConnection(PIConnection * parent); void unboundConnection(PIConnection * parent);