epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Dirk's VxWorks port II.

Browse Source
This commit is contained in:
Matej Sekoranja
2012-03-28 20:36:21 +02:00
parent 81f9aac2b0
commit c31a4ed7ea
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pvAccessApp/remote/blockingTCP.h
View File

@@ -35,7 +35,7 @@ namespace epics {
//class MonitorSender;
enum ReceiveStage {
READ_FROM_SOCKET, PROCESS_HEADER, PROCESS_PAYLOAD, NONE
READ_FROM_SOCKET, PROCESS_HEADER, PROCESS_PAYLOAD, UNDEFINED_STAGE
};
enum SendQueueFlushStrategy {

8
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -464,7 +464,7 @@ namespace pvAccess {
_socketBuffer->setLimit(_storedLimit);
_stage = PROCESS_HEADER;
processReadCached(true, NONE, size-remainingBytes);
processReadCached(true, UNDEFINED_STAGE, size-remainingBytes);
// copy before position
for(int i = remainingBytes-1, j = _socketBuffer->getPosition()
@@ -499,7 +499,7 @@ namespace pvAccess {
ReceiveStage inStage, int requiredBytes) {
try {
while(likely(!_closed.get())) {
if(_stage==READ_FROM_SOCKET||inStage!=NONE) {
if(_stage==READ_FROM_SOCKET||inStage!=UNDEFINED_STAGE) {
// add to bytes read
int currentPosition = _socketBuffer->getPosition();
@@ -565,7 +565,7 @@ namespace pvAccess {
aliveNotification();
// exit
if(inStage!=NONE) return;
if(inStage!=UNDEFINED_STAGE) return;
_stage = PROCESS_HEADER;
}
@@ -962,7 +962,7 @@ namespace pvAccess {
Transport::shared_pointer ptr = obj->shared_from_this(); // hold reference
try{
obj->processReadCached(false, NONE, CA_MESSAGE_HEADER_SIZE);
obj->processReadCached(false, UNDEFINED_STAGE, CA_MESSAGE_HEADER_SIZE);
} catch (...) {
printf("rcvThreadRunnner exception\n");
}