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

remote.h interfaces sync with Java - cleanup

Browse Source
This commit is contained in:
Matej Sekoranja
2012-07-25 12:46:04 +02:00
parent 48f8b3b77e
commit 4f15626281
18 changed files with 202 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pvAccessApp/remote/blockingUDPTransport.cpp
View File

@@ -89,11 +89,11 @@ namespace epics {
BlockingUDPTransport::threadRunner, this);
}
void BlockingUDPTransport::close(bool forced) {
close(forced, true);
void BlockingUDPTransport::close() {
close(true);
}
void BlockingUDPTransport::close(bool forced, bool waitForThreadToComplete) {
void BlockingUDPTransport::close(bool waitForThreadToComplete) {
{
Lock guard(_mutex);
if(_closed.get()) return;
@@ -226,14 +226,14 @@ namespace epics {
LOG(logLevelError, "Socket recvfrom error: %s", errStr);
}
close(true, false);
close(false);
break;
}
}
} catch(...) {
// TODO: catch all exceptions, and act accordingly
close(true, false);
close(false);
}
String threadName = "UDP-receive "+inetAddressToString(_bindAddress);
@@ -333,7 +333,7 @@ namespace epics {
return allOK;
}
int BlockingUDPTransport::getSocketReceiveBufferSize() const {
size_t BlockingUDPTransport::getSocketReceiveBufferSize() const {
// Get value of the SO_RCVBUF option for this DatagramSocket,
// that is the buffer size used by the platform for input on
// this DatagramSocket.
@@ -349,7 +349,7 @@ namespace epics {
LOG(logLevelError, "Socket getsockopt SO_RCVBUF error: %s", errStr);
}
return sockBufSize;
return (size_t)sockBufSize;
}
void BlockingUDPTransport::threadRunner(void* param) {