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

updated google test install procedure

Browse Source
This commit is contained in:
Matej Sekoranja
2013-02-06 23:31:13 +01:00
parent 6fa8cbe4d6
commit eacad71e72
5 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -31,6 +31,9 @@
#include <pv/serializationHelper.h>
#include <pv/convert.h>
#include <pv/mb.h>
MB_DECLARE(channelGet, 100000);
//#include <tr1/unordered_map>
using std::tr1::dynamic_pointer_cast;
@@ -542,6 +545,10 @@ namespace epics {
virtual void send(ByteBuffer* buffer, TransportSendControl* control) {
int32 pendingRequest = getPendingRequest();
bool initStage = (pendingRequest & QOS_INIT);
MB_POINT_CONDITIONAL(channelGet, 1, !initStage);
if (pendingRequest < 0)
{
BaseRequestImpl::send(buffer, control);
@@ -553,12 +560,14 @@ namespace epics {
buffer->putInt(m_ioid);
buffer->putByte((int8)m_pendingRequest);
if (pendingRequest & QOS_INIT)
if (initStage)
{
// pvRequest
SerializationHelper::serializePVRequest(buffer, control, m_pvRequest);
}
MB_POINT_CONDITIONAL(channelGet, 2, !initStage);
stopRequest();
}
@@ -591,6 +600,9 @@ namespace epics {
}
virtual bool normalResponse(Transport::shared_pointer const & transport, int8 /*version*/, ByteBuffer* payloadBuffer, int8 /*qos*/, const Status& status) {
MB_POINT(channelGet, 8);
if (!status.isSuccess())
{
EXCEPTION_GUARD(m_channelGetRequester->getDone(status));
@@ -604,6 +616,8 @@ namespace epics {
m_structure->deserialize(payloadBuffer, transport.get(), m_bitSet.get());
}
MB_POINT(channelGet, 9);
EXCEPTION_GUARD(m_channelGetRequester->getDone(status));
return true;
}
@@ -611,6 +625,9 @@ namespace epics {
virtual void get(bool lastRequest) {
{
MB_INC_AUTO_ID(channelGet);
MB_POINT(channelGet, 0);
Lock guard(m_mutex);
if (m_destroyed) {
EXCEPTION_GUARD(m_channelGetRequester->getDone(destroyedStatus));
@@ -3955,6 +3972,7 @@ namespace epics {
m_contextState(CONTEXT_NOT_INITIALIZED),
m_configuration(new SystemConfigurationImpl())
{
MB_INIT;
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(remoteClientContext);
loadConfiguration();
}