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

removed CDRMonitor, ported to new Timer API

Browse Source
This commit is contained in:
Matej Sekoranja
2012-07-18 11:09:00 +02:00
parent 596d4ce899
commit 49bc940179
19 changed files with 144 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvAccessApp/remote/blockingUDPTransport.cpp
+3 -4
View File
@@ -12,7 +12,6 @@
#include <pv/byteBuffer.h>
#include <pv/lock.h>
#include <pv/CDRMonitor.h>
#include <osdSock.h>
#include <osiSock.h>
@@ -27,7 +26,7 @@ using namespace std;
namespace epics {
namespace pvAccess {
PVDATA_REFCOUNT_MONITOR_DEFINE(blockingUDPTransport);
PVACCESS_REFCOUNT_MONITOR_DEFINE(blockingUDPTransport);
BlockingUDPTransport::BlockingUDPTransport(
auto_ptr<ResponseHandler>& responseHandler, SOCKET channel,
@@ -45,7 +44,7 @@ namespace epics {
_lastMessageStartPosition(0),
_threadId(0)
{
PVDATA_REFCOUNT_MONITOR_CONSTRUCT(blockingUDPTransport);
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(blockingUDPTransport);
// set receive timeout so that we do not have problems at shutdown (recvfrom would block)
struct timeval timeout;
@@ -66,7 +65,7 @@ namespace epics {
}
BlockingUDPTransport::~BlockingUDPTransport() {
PVDATA_REFCOUNT_MONITOR_DESTRUCT(blockingUDPTransport);
PVACCESS_REFCOUNT_MONITOR_DESTRUCT(blockingUDPTransport);
close(true); // close the socket and stop the thread.