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

blockingTCP.h: added TransportRegistry, removed "using namespace"

Browse Source 
BlockingTCPTransport: added TransportRegistry, using osiSock.h functions wherever possible
blockingUDP.h: removed "using namespace"
blockingUDPConnector.cpp: using osiSock.h functions wherever possible
blockingUDPTransport: using osiSock.h functions wherever possible, delete -> delete[]
remote.h: removed "using namespace"
arrayFIFO.h: fixed default ctor, delete -> delete[]
growingCircularBuffer.h: delete -> delete[]
testBlockingUDPClnt.cpp: using osiSock.h functions wherever possible
testBlockingUDPCSrv.cpp: using osiSock.h functions wherever possible
This commit is contained in:
miha_vitorovic
2011-01-03 14:30:38 +01:00
parent 95148e2d50
commit b6df9a4d89
10 changed files with 54 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pvAccessApp/remote/blockingTCPTransport.cpp
View File

@@ -64,7 +64,7 @@ namespace epics {
BlockingTCPTransport::BlockingTCPTransport(SOCKET channel,
ResponseHandler* responseHandler, int receiveBufferSize,
short priority) :
short priority, TransportRegistry* transportRegistry) :
_closed(false), _channel(channel), _remoteTransportRevision(0),
_remoteTransportReceiveBufferSize(MAX_TCP_RECV),
_remoteTransportSocketReceiveBufferSize(MAX_TCP_RECV),
@@ -86,7 +86,8 @@ namespace epics {
_rcvThreadId(NULL), _sendThreadId(NULL), _monitorSendQueue(
new GrowingCircularBuffer<TransportSender*> (100)),
_monitorSender(new MonitorSender(_monitorMutex,
_monitorSendQueue)) {
_monitorSendQueue)), _transportRegistry(
transportRegistry) {
_socketBuffer = new ByteBuffer(max(MAX_TCP_RECV
+MAX_ENSURE_DATA_BUFFER_SIZE, receiveBufferSize));
@@ -122,8 +123,8 @@ namespace epics {
// prepare buffer
clearAndReleaseBuffer();
// TODO: add to registry
//context.getTransportRegistry().put(this);
// add to registry
_transportRegistry->put(this);
}
BlockingTCPTransport::~BlockingTCPTransport() {
@@ -193,8 +194,8 @@ namespace epics {
_closed = true;
// TODO remove from registry
//context.getTransportRegistry().remove(this);
// remove from registry
_transportRegistry->remove(this);
// clean resources
internalClose(force);
@@ -832,11 +833,7 @@ namespace epics {
errlogSevPrintf(errlogInfo, "Connection to %s closed.",
inetAddressToString(_socketAddress).c_str());
int retval = ::shutdown(_channel, SHUT_RDWR);
if(retval<0&&errno!=ENOTCONN) errlogSevPrintf(errlogMajor,
"Error closing socket to %s: %s", inetAddressToString(
_socketAddress).c_str(), strerror(errno));
epicsSocketDestroy(_channel);
}
void BlockingTCPTransport::rcvThreadRunner(void* param) {