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

TCP transport now basically works. Still some bugs to squash.

Browse Source
This commit is contained in:
miha_vitorovic
2011-01-07 09:53:33 +01:00
parent 387d8aa0dc
commit 71b9dfec6d
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -417,11 +417,6 @@ namespace epics {
void BlockingTCPTransport::processReadCached(bool nestedCall,
ReceiveStage inStage, int requiredBytes, bool addToBuffer) {
// TODO remove debug
errlogSevPrintf(errlogInfo,
"processReadCached(%d, %d, %d, %d), _stage: %d",
nestedCall, inStage, requiredBytes, addToBuffer, _stage);
try {
while(!_closed) {
if(_stage==READ_FROM_SOCKET||inStage!=NONE) {
@@ -458,11 +453,6 @@ namespace epics {
int requiredPosition = (currentStartPosition
+requiredBytes);
// TODO remove debug
errlogSevPrintf(errlogInfo,
"requredPos:%d, buffer->pos:%d",
requiredPosition, _socketBuffer->getPosition());
while(_socketBuffer->getPosition()<requiredPosition) {
// read
char readBuffer[MAX_TCP_RECV];
@@ -472,12 +462,6 @@ namespace epics {
maxToRead, 0);
_socketBuffer->put(readBuffer, 0, bytesRead);
// TODO remove debug
if(bytesRead>0) errlogSevPrintf(
errlogInfo,
"***!!! got %d bytes of %d (reqPos=%d)!!!***",
bytesRead, requiredBytes, requiredPosition);
if(bytesRead<0) {
// error (disconnect, end-of-stream) detected
close(true);