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

Fixing the TCPConnector cleanup order in case of a server crash.

Browse Source
This commit is contained in:
miha_vitorovic
2011-01-12 14:23:32 +01:00
parent 2565191fb7
commit 3bd11a1e00
2 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pvAccessApp/remote/blockingTCPConnector.cpp
View File

@@ -145,8 +145,6 @@ namespace epics {
// verify
if(!transport->waitUntilVerified(3.0)) {
transport->close(true);
socket = INVALID_SOCKET;
errlogSevPrintf(
errlogMinor,
"Connection to CA server %s failed to be validated, closing it.",
@@ -164,8 +162,9 @@ namespace epics {
return transport;
} catch(...) {
// close socket, if open
if(socket!=INVALID_SOCKET) epicsSocketDestroy(socket);
if(transport!=NULL)
transport->close(true);
else if(socket!=INVALID_SOCKET) epicsSocketDestroy(socket);
_namedLocker->releaseSynchronizationObject(&address);
throw;
}

52
testApp/remote/testBlockingTCPClnt.cpp
View File

@@ -12,6 +12,8 @@
#include "caConstants.h"
#include <timer.h>
#include <epicsException.h>
#include <pvType.h>
#include <osiSock.h>
#include <errlog.h>
@@ -36,11 +38,21 @@ public:
delete _tr;
delete _timer;
}
virtual Timer* getTimer() { return _timer; }
virtual TransportRegistry* getTransportRegistry() { return _tr; }
virtual Channel* getChannel(epics::pvAccess::pvAccessID) { return 0; }
virtual Transport* getSearchTransport() { return 0; }
virtual Configuration* getConfiguration() { return _conf; }
virtual Timer* getTimer() {
return _timer;
}
virtual TransportRegistry* getTransportRegistry() {
return _tr;
}
virtual Channel* getChannel(epics::pvAccess::pvAccessID) {
return 0;
}
virtual Transport* getSearchTransport() {
return 0;
}
virtual Configuration* getConfiguration() {
return _conf;
}
private:
TransportRegistry* _tr;
@@ -50,7 +62,8 @@ private:
class DummyResponseHandler : public ResponseHandler {
public:
DummyResponseHandler(Context* ctx) : ResponseHandler() {
DummyResponseHandler(Context* ctx) :
ResponseHandler() {
}
virtual void handleResponse(osiSockAddr* responseFrom,
@@ -123,18 +136,25 @@ void testBlockingTCPSender() {
return;
}
Transport* transport = connector.connect(&dtc, &drh, srvAddr,
CA_MAGIC_AND_VERSION, CA_DEFAULT_PRIORITY);
Transport* transport=NULL;
try {
transport = connector.connect(&dtc, &drh, srvAddr,
CA_MAGIC_AND_VERSION, CA_DEFAULT_PRIORITY);
cout<<"Sending 10 messages..."<<endl;
cout<<"Sending 10 messages..."<<endl;
for(int i = 0; i<10; i++) {
cout<<" Message: "<<i+1<<endl;
if(!transport->isClosed())
transport->enqueueSendRequest(&dts);
else
break;
sleep(1);
for(int i = 0; i<10; i++) {
cout<<" Message: "<<i+1<<endl;
if(!transport->isClosed())
transport->enqueueSendRequest(&dts);
else
break;
sleep(1);
}
} catch(BaseException* e) {
String info;
e->toString(info);
cout<<info<<endl;
}
delete transport;