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

Backed out changeset 6de53cf04511

Browse Source
This commit is contained in:
Matej Sekoranja
2013-02-06 23:49:10 +01:00
parent eacad71e72
commit 605709ee52
5 changed files with 7 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README
+4 -5
View File
@@ -16,9 +16,8 @@ g++ -g -O3 -I${GTEST_DIR}/include -I${GTEST_DIR} -c ${GTEST_DIR}/src/gtest-all.c
g++ -g -O3 -I${GTEST_DIR}/include -I${GTEST_DIR} -c ${GTEST_DIR}/src/gtest_main.cc
ar -rv libgtest_main.a gtest_main.o gtest-all.o
# INSTALL is where you put build artifacts
mkdir -p $INSTALL/gtest/lib/$EPICS_HOST_ARCH
cp -r ${GTEST_DIR}/include $INSTALL/gtest
cp libgtest_main.a $INSTALL/gtest/lib/$EPICS_HOST_ARCH
mkdir -p $EPICS_HOME/gtest/lib
cp -r ${GTEST_DIR}/include $EPICS_HOME/gtest
cp libgtest_main.a $EPICS_HOME/gtest/lib
(you can use cmake, see gtest README)
pvAccessApp/Makefile
-9
View File
@@ -89,13 +89,4 @@ LIBRARY = pvAccess
pvAccess_LIBS += Com
pvAccess_LIBS += pvData
SRC_DIRS += $(PVACCESS)/mb
INC += mb.h
LIBSRCS += mb.cpp
PROD_HOST += mb_stat
mb_stat_SRCS += mb_test.cpp
mb_stat_LIBS += pvAccess pvData Com
include $(TOP)/configure/RULES
pvAccessApp/remoteClient/clientContextImpl.cpp
+1 -19
View File
@@ -31,9 +31,6 @@
#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;
@@ -545,10 +542,6 @@ 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);
@@ -560,14 +553,12 @@ namespace epics {
buffer->putInt(m_ioid);
buffer->putByte((int8)m_pendingRequest);
if (initStage)
if (pendingRequest & QOS_INIT)
{
// pvRequest
SerializationHelper::serializePVRequest(buffer, control, m_pvRequest);
}
MB_POINT_CONDITIONAL(channelGet, 2, !initStage);
stopRequest();
}
@@ -600,9 +591,6 @@ 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));
@@ -616,8 +604,6 @@ namespace epics {
m_structure->deserialize(payloadBuffer, transport.get(), m_bitSet.get());
}
MB_POINT(channelGet, 9);
EXCEPTION_GUARD(m_channelGetRequester->getDone(status));
return true;
}
@@ -625,9 +611,6 @@ 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));
@@ -3972,7 +3955,6 @@ namespace epics {
m_contextState(CONTEXT_NOT_INITIALIZED),
m_configuration(new SystemConfigurationImpl())
{
MB_INIT;
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(remoteClientContext);
loadConfiguration();
}
pvAccessApp/server/responseHandlers.cpp
+1 -15
View File
@@ -16,9 +16,6 @@
#include <sstream>
#include <pv/mb.h>
MB_DECLARE(channelGetServer, 100000);
using std::ostringstream;
using std::hex;
@@ -48,9 +45,8 @@ void ServerBadResponse::handleResponse(osiSockAddr* responseFrom,
ServerResponseHandler::ServerResponseHandler(ServerContextImpl::shared_pointer const & context)
{
MB_INIT;
ResponseHandler::shared_pointer badResponse(new ServerBadResponse(context));
m_handlerTable.resize(CMD_RPC+1);
m_handlerTable[CMD_BEACON].reset(new ServerNoopResponse(context, "Beacon")); /* 0 */
@@ -558,9 +554,6 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
}
else
{
MB_INC_AUTO_ID(channelGetServer);
MB_POINT(channelGetServer, 3);
const bool lastRequest = (QOS_DESTROY & qosCode) != 0;
ServerChannelGetRequesterImpl::shared_pointer request = static_pointer_cast<ServerChannelGetRequesterImpl>(channel->getRequest(ioid));
@@ -576,8 +569,6 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
return;
}
MB_POINT(channelGetServer, 4);
request->getChannelGet()->get(lastRequest);
}
}
@@ -641,7 +632,6 @@ void ServerChannelGetRequesterImpl::channelGetConnect(const Status& status, Chan
void ServerChannelGetRequesterImpl::getDone(const Status& status)
{
MB_POINT(channelGetServer, 5);
{
Lock guard(_mutex);
_status = status;
@@ -701,15 +691,11 @@ void ServerChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendContro
}
else
{
MB_POINT(channelGetServer, 6);
{
// we locked _mutex above, so _channelGet is valid
ScopedLock lock(_channelGet);
_bitSet->serialize(buffer, control);
_pvStructure->serialize(buffer, control, _bitSet.get());
}
MB_POINT(channelGetServer, 7);
}
}
testApp/remote/eget.cpp
+1 -7
View File
@@ -606,16 +606,10 @@ void formatNTImage(std::ostream& /*o*/, PVStructurePtr const & pvStruct)
fprintf(gnuplotPipe, "unset xtics\n");
fprintf(gnuplotPipe, "unset ytics\n");
fprintf(gnuplotPipe, "set size ratio 1\n");
fprintf(gnuplotPipe, "set xrange [0:%u]\n", cols-1);
fprintf(gnuplotPipe, "set yrange [0:%u]\n", rows-1);
fprintf(gnuplotPipe, "set size ratio 1\n");
/*
fprintf(gnuplotPipe, "set lmargin at screen 0\n");
fprintf(gnuplotPipe, "set bmargin at screen 0\n");
fprintf(gnuplotPipe, "set rmargin at screen 0.99999\n");
fprintf(gnuplotPipe, "set tmargin at screen 0.99999\n");
*/
fprintf(gnuplotPipe, "set palette grey\n");
fprintf(gnuplotPipe, "set cbrange [0:255]\n");