From 54934b1059667afd76d2ddeb9e54543a01504399 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Thu, 1 May 2003 22:12:44 +0000 Subject: [PATCH] use SIGALRM instead of SIGURG to wakeup blocking socket calls --- src/ca/tcpiiu.cpp | 2 +- src/libCom/osi/os/posix/systemCallIntMech.cpp | 2 +- src/libCom/osi/osiSock.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp index db63ce2af..cc546ee53 100644 --- a/src/ca/tcpiiu.cpp +++ b/src/ca/tcpiiu.cpp @@ -702,7 +702,7 @@ void tcpiiu::initiateAbortShutdown ( epicsGuard < callbackMutex > & cbGuard, // } } break; - case esscimqi_socketSigurgRequired: + case esscimqi_socketSigAlarmRequired: this->recvThread.interruptSocketRecv (); this->sendThread.interruptSocketSend (); break; diff --git a/src/libCom/osi/os/posix/systemCallIntMech.cpp b/src/libCom/osi/os/posix/systemCallIntMech.cpp index a02fe8112..1fe5f6559 100644 --- a/src/libCom/osi/os/posix/systemCallIntMech.cpp +++ b/src/libCom/osi/os/posix/systemCallIntMech.cpp @@ -18,5 +18,5 @@ enum epicsSocketSystemCallInterruptMechanismQueryInfo epicsSocketSystemCallInterruptMechanismQuery () { - return esscimqi_socketSigurgRequired; + return esscimqi_socketSigAlarmRequired; } diff --git a/src/libCom/osi/osiSock.h b/src/libCom/osi/osiSock.h index 35a52f3f6..38eae3775 100644 --- a/src/libCom/osi/osiSock.h +++ b/src/libCom/osi/osiSock.h @@ -176,7 +176,7 @@ epicsShareFunc osiSockAddr epicsShareAPI osiLocalAddr (SOCKET socket); enum epicsSocketSystemCallInterruptMechanismQueryInfo { esscimqi_socketCloseRequired, esscimqi_socketBothShutdownRequired, - esscimqi_socketSigurgRequired, + esscimqi_socketSigAlarmRequired, esscimqi_shuechanismImplemenedHerein }; epicsShareFunc enum epicsSocketSystemCallInterruptMechanismQueryInfo