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

thread shutdown

Browse Source
This commit is contained in:
Michael Davidsaver
2015-11-18 14:12:48 -06:00
parent 730d30fe54
commit f2b47ef5e9
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/remote/blockingTCPAcceptor.cpp
View File

@@ -232,16 +232,35 @@ namespace pvAccess {
}
void BlockingTCPAcceptor::destroy() {
Lock guard(_mutex);
if(_destroyed) return;
_destroyed = true;
SOCKET sock;
{
Lock guard(_mutex);
if(_destroyed) return;
_destroyed = true;
if(_serverSocketChannel!=INVALID_SOCKET) {
sock = _serverSocketChannel;
_serverSocketChannel = INVALID_SOCKET;
}
if(sock!=INVALID_SOCKET) {
char ipAddrStr[48];
ipAddrToDottedIP(&_bindAddress.ia, ipAddrStr, sizeof(ipAddrStr));
LOG(logLevelDebug, "Stopped accepting connections at %s.", ipAddrStr);
epicsSocketDestroy(_serverSocketChannel);
switch(epicsSocketSystemCallInterruptMechanismQuery())
{
case esscimqi_socketBothShutdownRequired:
shutdown(sock, SHUT_RDWR);
_thread.exitWait();
epicsSocketDestroy(sock);
break;
case esscimqi_socketSigAlarmRequired:
LOG(logLevelError, "SigAlarm close not implemented for this target\n");
case esscimqi_socketCloseRequired:
epicsSocketDestroy(sock);
_thread.exitWait();
break;
}
}
}