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@243 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-30 17:17:00 +00:00
parent f52fec4e78
commit 414f328a8c
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/io/piconnection.cpp
View File

@@ -1172,22 +1172,24 @@ void PIConnection::unboundExtractor(PIPacketExtractor * pe) {
void PIConnection::packetExtractorReceived(uchar * data, int size) {
PIString from(emitter() == 0 ? "" : emitter()->name());
PIIODevice * cd = (PIIODevice * )emitter();
// piCout << "packetExtractorReceived" << from << cd;
if (cd != 0) {
PIVector<PIPacketExtractor * > be(bounded_extractors.value(cd));
//piCout << be << (void*)data << size;
piForeach (PIPacketExtractor * i, be)
i->threadedRead(data, size);
PIVector<PIIODevice * > chd(channels_.value(cd));
piForeach (PIIODevice * d, chd) {
int ret = d->write(data, size);
PIDiagnostics * diag = diags_.value(d);
if (diag != 0) diag->sended(ret);
}
PIDiagnostics * diag = diags_.value(cd);
if (diag != 0) diag->received(size);
}
packetReceived(from, PIByteArray(data, size));
packetReceivedEvent(from, PIByteArray(data, size));
PIIODevice * cd = (PIIODevice * )emitter();
if (cd == 0) return;
PIVector<PIPacketExtractor * > be(bounded_extractors.value(cd));
//piCout << be << (void*)data << size;
piForeach (PIPacketExtractor * i, be)
i->threadedRead(data, size);
PIVector<PIIODevice * > chd(channels_.value(cd));
piForeach (PIIODevice * d, chd) {
int ret = d->write(data, size);
PIDiagnostics * diag = diags_.value(d);
if (diag != 0) diag->sended(ret);
}
PIDiagnostics * diag = diags_.value(cd);
if (diag != 0) diag->received(size);
}

5
src/io/piserial.cpp
View File

@@ -296,7 +296,8 @@ bool PISerial::closeDevice() {
#ifdef WINDOWS
SetCommState(PRIVATE->hCom, &PRIVATE->sdesc);
SetCommMask(PRIVATE->hCom, PRIVATE->mask);
// piCoutObj << "close" << CloseHandle(PRIVATE->hCom);
// piCoutObj << "close" <<
CloseHandle(PRIVATE->hCom);
PRIVATE->hCom = 0;
#else
tcsetattr(fd, TCSANOW, &PRIVATE->sdesc);
@@ -618,7 +619,7 @@ int PISerial::read(void * read_to, int max_size) {
int PISerial::write(const void * data, int max_size, bool wait) {
//piCoutObj << "send " << max_size << ": " << PIString((char*)data, max_size);
// piCoutObj << "send " << max_size;// << ": " << PIString((char*)data, max_size);
if (fd == -1 || !canWrite()) {
//piCoutObj << "Can`t write to uninitialized COM";
return -1;

1
utils/system_daemon/daemon.h
View File

@@ -156,7 +156,6 @@ private:
PITimer dtimer;
PIString conn_name;
PIMutex remote_mutex;
PIMap<int, PIString> dnames;
PIMap<PIString, Remote*> remotes;
PISystemMonitor sys_mon_other;
HostInfo info_my, info_other;