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

Merge https://github.com/epics-base/pvAccessCPP

Browse Source
This commit is contained in:
mrkraimer
2018-05-23 15:18:30 -04:00
parent 9b305e5e2b 12e7b7864b
commit 08290b4a99
18 changed files with 85 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pvtoolsSrc/eget.cpp
View File

@@ -1,6 +1,3 @@
#if defined(_WIN32) && !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <iostream>
#include <pv/pvAccess.h>
@@ -937,8 +934,6 @@ void printValue(std::string const & channelName, PVStructure::shared_pointer con
dumpValue(channelName, pv);
}
static string emptyString;
// only in ValueOnlyMode
// NOTE: names might be empty
void printValues(shared_vector<const string> const & names, vector<PVStructure::shared_pointer> const & values)

4
pvtoolsSrc/pvlist.cpp
View File

@@ -67,8 +67,6 @@ string toHex(int8* ba, size_t len) {
}
static string emptyString;
std::size_t readSize(ByteBuffer* buffer) {
int8 b = buffer->getByte();
if(b==-1)
@@ -94,7 +92,7 @@ string deserializeString(ByteBuffer* buffer) {
return str;
}
else
return emptyString;
return std::string();
}
struct ServerEntry {

3
src/ca/caProvider.cpp
View File

@@ -119,9 +119,8 @@ Channel::shared_pointer CAChannelProvider::createChannel(
ChannelRequester::shared_pointer const & channelRequester,
short priority)
{
static std::string emptyString;
Channel::shared_pointer channel(
createChannel(channelName, channelRequester, priority, emptyString));
createChannel(channelName, channelRequester, priority, std::string()));
return channel;
}

24
src/client/pva/client.h
View File

@@ -92,8 +92,7 @@ struct PutEvent
Cancel, //!< request cancelled before completion
Success, //!< It worked!
} event;
std::string message;
void *priv;
std::string message; //!< Check when event==Fail
};
//! Information on get/rpc completion
@@ -177,15 +176,19 @@ struct MonitorEvent
Disconnect=4,//!< subscription interrupted due to loss of communication
Data=8, //!< Data queue not empty. Call Monitor::poll()
} event;
std::string message; // set for event=Fail
std::string message; //!< set for event=Fail
};
/** Subscription usable w/o callbacks
*
* Basic usage is to call wait().
* Basic usage is to call wait() or test().
* If true is returned, then the 'event', 'root', 'changed', and 'overrun'
* members have been updated with a new event.
* Test 'event.event' first to find out which kind of event has occured.
*
* Note that wait()/test() methods are distinct from base class poll().
* wait()/test() check for the arrival of MonitorEvent
* while poll() checks for the availability of data (eg. following a Data event).
*/
struct epicsShareClass MonitorSync : public Monitor
{
@@ -195,15 +198,19 @@ struct epicsShareClass MonitorSync : public Monitor
~MonitorSync();
//! wait for new event
//! @returns true when a new event was received.
//! false if wake() was called.
bool wait();
//! wait for new event
//! @return false on timeout
bool wait(double timeout);
//! check if new event is available
//! check if new event is immediately available.
//! Does not block.
bool test();
//! Abort one call to wait()
//! wait() will return with MonitorEvent::Fail
//! Abort one call to wait(), either concurrent or future.
//! Calls are queued.
//! wait() will return with MonitorEvent::Fail.
void wake();
//! most recent event
@@ -352,7 +359,6 @@ public:
//! Initiate request to change PV
//! @param cb Completion notification callback. Must outlive Operation (call Operation::cancel() to force release)
//! TODO: produce bitset to mask fields being set
Operation put(PutCallback* cb,
epics::pvData::PVStructure::const_shared_pointer pvRequest = epics::pvData::PVStructure::const_shared_pointer());
@@ -374,7 +380,7 @@ public:
};
//! Begin subscription
//! @param cb Completion notification callback. Must outlive Operation (call Operation::cancel() to force release)
//! @param cb Completion notification callback. Must outlive Monitor (call Monitor::cancel() to force release)
Monitor monitor(MonitorCallback *cb,
epics::pvData::PVStructure::const_shared_pointer pvRequest = epics::pvData::PVStructure::const_shared_pointer());

8
src/pipelineService/pipelineServer.cpp
View File

@@ -454,9 +454,9 @@ class PipelineChannelProvider :
public:
POINTER_DEFINITIONS(PipelineChannelProvider);
static string PROVIDER_NAME;
static const string PROVIDER_NAME;
static Status noSuchChannelStatus;
static const Status noSuchChannelStatus;
// TODO thread pool support
@@ -619,8 +619,8 @@ private:
epics::pvData::Mutex m_mutex;
};
string PipelineChannelProvider::PROVIDER_NAME("PipelineService");
Status PipelineChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
const string PipelineChannelProvider::PROVIDER_NAME("PipelineService");
const Status PipelineChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
PipelineServer::PipelineServer()
:m_channelProviderImpl(new PipelineChannelProvider)

2
src/remote/channelSearchManager.cpp
View File

@@ -50,6 +50,8 @@ public:
namespace epics {
namespace pvAccess {
// these are byte offset in a CMD_SEARCH request message
// used to mangle a buffer to support incremental construction. (ick!!!)
const int ChannelSearchManager::DATA_COUNT_POSITION = PVA_MESSAGE_HEADER_SIZE + 4+1+3+16+2+1+4;
const int ChannelSearchManager::CAST_POSITION = PVA_MESSAGE_HEADER_SIZE + 4;
const int ChannelSearchManager::PAYLOAD_POSITION = 4;

5
src/remote/codec.cpp
View File

@@ -4,11 +4,6 @@
* in file LICENSE that is included with this distribution.
*/
#if defined(_WIN32) && !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <map>
#include <string>
#include <vector>

3
src/remoteClient/clientContextImpl.cpp
View File

@@ -54,7 +54,6 @@ Status ClientChannelImpl::channelDestroyed(
Status::STATUSTYPE_WARNING, "channel destroyed");
Status ClientChannelImpl::channelDisconnected(
Status::STATUSTYPE_WARNING, "channel disconnected");
string emptyString;
}}
namespace {
@@ -3096,7 +3095,7 @@ public:
ChannelRequester::shared_pointer const & channelRequester,
short priority) OVERRIDE FINAL
{
return createChannel(channelName, channelRequester, priority, emptyString);
return createChannel(channelName, channelRequester, priority, std::string());
}
virtual Channel::shared_pointer createChannel(

8
src/rpcService/rpcServer.cpp
View File

@@ -248,9 +248,9 @@ class RPCChannelProvider :
public:
POINTER_DEFINITIONS(RPCChannelProvider);
static string PROVIDER_NAME;
static const string PROVIDER_NAME;
static Status noSuchChannelStatus;
static const Status noSuchChannelStatus;
// TODO thread pool support
@@ -413,8 +413,8 @@ private:
epics::pvData::Mutex m_mutex;
};
string RPCChannelProvider::PROVIDER_NAME("rpcService");
Status RPCChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
const string RPCChannelProvider::PROVIDER_NAME("rpcService");
const Status RPCChannelProvider::noSuchChannelStatus(Status::STATUSTYPE_ERROR, "no such channel");
RPCServer::RPCServer(const Configuration::const_shared_pointer &conf)

4
src/server/beaconEmitter.cpp
View File

@@ -4,10 +4,6 @@
* in file LICENSE that is included with this distribution.
*/
#if defined(_WIN32) && !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <algorithm>
#define epicsExportSharedSymbols

19
src/server/pv/responseHandlers.h
View File

@@ -115,10 +115,7 @@ private:
class ServerSearchHandler : public AbstractServerResponseHandler
{
public:
// TODO
static std::map<std::string, std::tr1::weak_ptr<ChannelProvider> > s_channelNameToProvider;
static std::string SUPPORTED_PROTOCOL;
static const std::string SUPPORTED_PROTOCOL;
ServerSearchHandler(ServerContextImpl::shared_pointer const & context);
virtual ~ServerSearchHandler() {}
@@ -126,9 +123,6 @@ public:
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & transport, epics::pvData::int8 version, epics::pvData::int8 command,
std::size_t payloadSize, epics::pvData::ByteBuffer* payloadBuffer) OVERRIDE FINAL;
private:
std::vector<ChannelProvider::shared_pointer> _providers;
};
@@ -173,10 +167,9 @@ private:
class ServerCreateChannelHandler : public AbstractServerResponseHandler
{
public:
ServerCreateChannelHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Create channel request") {
_providers = context->getChannelProviders();
}
ServerCreateChannelHandler(ServerContextImpl::shared_pointer const & context)
:AbstractServerResponseHandler(context, "Create channel request")
{}
virtual ~ServerCreateChannelHandler() {}
virtual void handleResponse(osiSockAddr* responseFrom,
@@ -184,10 +177,10 @@ public:
std::size_t payloadSize, epics::pvData::ByteBuffer* payloadBuffer) OVERRIDE FINAL;
private:
static std::string SERVER_CHANNEL_NAME;
// Name of the magic "server" PV used to implement channelList() and server info
static const std::string SERVER_CHANNEL_NAME;
void disconnect(Transport::shared_pointer const & transport);
std::vector<ChannelProvider::shared_pointer> _providers;
};
namespace detail {

41
src/server/pv/serverContextImpl.h
View File

@@ -123,13 +123,13 @@ public:
* Broadcast (UDP send) transport.
* @return broadcast transport.
*/
BlockingUDPTransport::shared_pointer getBroadcastTransport();
const BlockingUDPTransport::shared_pointer& getBroadcastTransport();
/**
* Get channel providers.
* @return channel providers.
*/
virtual std::vector<ChannelProvider::shared_pointer>& getChannelProviders() OVERRIDE FINAL;
virtual const std::vector<ChannelProvider::shared_pointer>& getChannelProviders() OVERRIDE FINAL;
/**
* Return <code>true</code> if channel provider name is provided by configuration (e.g. system env. var.).
@@ -137,6 +137,9 @@ public:
*/
bool isChannelProviderNamePreconfigured();
// used by ServerChannelFindRequesterImpl
typedef std::map<std::string, std::tr1::weak_ptr<ChannelProvider> > s_channelNameToProvider_t;
s_channelNameToProvider_t s_channelNameToProvider;
private:
/**
@@ -188,9 +191,6 @@ private:
*/
epics::pvData::int32 _receiveBufferSize;
/**
* Timer.
*/
epics::pvData::Timer::shared_pointer _timer;
/**
@@ -198,14 +198,11 @@ private:
*/
BlockingUDPTransportVector _udpTransports;
/**
* UDP socket used to sending.
/** UDP socket used to sending.
* constant after ServerContextImpl::initialize()
*/
BlockingUDPTransport::shared_pointer _broadcastTransport;
/**
* Beacon emitter.
*/
BeaconEmitter::shared_pointer _beaconEmitter;
/**
@@ -219,24 +216,15 @@ private:
*/
TransportRegistry _transportRegistry;
/**
* Response handler.
*/
ResponseHandler::shared_pointer _responseHandler;
/**
* Channel provider.
*/
// const after loadConfiguration()
std::vector<ChannelProvider::shared_pointer> _channelProviders;
/**
* Run mutex.
*/
public:
epics::pvData::Mutex _mutex;
private:
/**
* Run event.
*/
epics::pvData::Event _runEvent;
/**
@@ -244,19 +232,10 @@ private:
*/
BeaconServerStatusProvider::shared_pointer _beaconServerStatusProvider;
/**
* Generate ServerGUID.
*/
void generateGUID();
/**
* Initialize logger.
*/
void initializeLogger();
/**
* Load configuration.
*/
void loadConfiguration();
Configuration::const_shared_pointer configuration;

44
src/server/responseHandlers.cpp
View File

@@ -4,10 +4,6 @@
* in file LICENSE that is included with this distribution.
*/
#if defined(_WIN32) && !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <sstream>
#include <time.h>
#include <stdlib.h>
@@ -226,10 +222,10 @@ void ServerEchoHandler::handleResponse(osiSockAddr* responseFrom,
/****************************************************************************************/
std::string ServerSearchHandler::SUPPORTED_PROTOCOL = "tcp";
const std::string ServerSearchHandler::SUPPORTED_PROTOCOL = "tcp";
ServerSearchHandler::ServerSearchHandler(ServerContextImpl::shared_pointer const & context) :
AbstractServerResponseHandler(context, "Search request"), _providers(context->getChannelProviders())
AbstractServerResponseHandler(context, "Search request")
{
// initialize random seed with some random value
srand ( time(NULL) );
@@ -283,6 +279,7 @@ void ServerSearchHandler::handleResponse(osiSockAddr* responseFrom,
const int32 count = payloadBuffer->getShort() & 0xFFFF;
// TODO DoS attack?
// You bet! With a reply address encoded in the request we don't even need a forged UDP header.
const bool responseRequired = (QOS_REPLY_REQUIRED & qosCode) != 0;
//
@@ -332,15 +329,14 @@ void ServerSearchHandler::handleResponse(osiSockAddr* responseFrom,
if (allowed)
{
// TODO object pool!!!
const std::vector<ChannelProvider::shared_pointer>& _providers = _context->getChannelProviders();
int providerCount = _providers.size();
std::tr1::shared_ptr<ServerChannelFindRequesterImpl> tp(new ServerChannelFindRequesterImpl(_context, providerCount));
tp->set(name, searchSequenceId, cid, responseAddress, responseRequired, false);
// TODO use std::make_shared
ChannelFindRequester::shared_pointer spr = tp;
for (int i = 0; i < providerCount; i++)
_providers[i]->channelFind(name, spr);
_providers[i]->channelFind(name, tp);
}
}
}
@@ -404,8 +400,6 @@ ServerChannelFindRequesterImpl* ServerChannelFindRequesterImpl::set(std::string
return this;
}
std::map<string, std::tr1::weak_ptr<ChannelProvider> > ServerSearchHandler::s_channelNameToProvider;
void ServerChannelFindRequesterImpl::channelFindResult(const Status& /*status*/, ChannelFind::shared_pointer const & channelFind, bool wasFound)
{
// TODO status
@@ -431,7 +425,8 @@ void ServerChannelFindRequesterImpl::channelFindResult(const Status& /*status*/,
{
if (wasFound && _expectedResponseCount > 1)
{
ServerSearchHandler::s_channelNameToProvider[_name] = channelFind->getChannelProvider();
Lock L(_context->_mutex);
_context->s_channelNameToProvider[_name] = channelFind->getChannelProvider();
}
_wasFound = wasFound;
@@ -528,7 +523,7 @@ private:
static Structure::const_shared_pointer channelListStructure;
static Structure::const_shared_pointer infoStructure;
static std::string helpString;
static const std::string helpString;
ServerContextImpl::shared_pointer m_serverContext;
@@ -575,7 +570,7 @@ public:
PVStringArray::shared_pointer allChannelNames = result->getSubFieldT<PVStringArray>("value");
ChannelListRequesterImpl::shared_pointer listListener(new ChannelListRequesterImpl());
std::vector<ChannelProvider::shared_pointer>& providers = m_serverContext->getChannelProviders();
const std::vector<ChannelProvider::shared_pointer>& providers = m_serverContext->getChannelProviders();
size_t providerCount = providers.size();
for (size_t i = 0; i < providerCount; i++)
@@ -681,7 +676,7 @@ Structure::const_shared_pointer ServerRPCService::infoStructure =
createStructure();
std::string ServerRPCService::helpString =
const std::string ServerRPCService::helpString =
"pvAccess server RPC service.\n"
"arguments:\n"
"\tstring op\toperation to execute\n"
@@ -696,7 +691,7 @@ std::string ServerRPCService::helpString =
namespace epics {
namespace pvAccess {
std::string ServerCreateChannelHandler::SERVER_CHANNEL_NAME = "server";
const std::string ServerCreateChannelHandler::SERVER_CHANNEL_NAME = "server";
void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & transport, int8 version, int8 command,
@@ -763,10 +758,21 @@ void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom,
}
else
{
const std::vector<ChannelProvider::shared_pointer>& _providers(_context->getChannelProviders());
ServerContextImpl::s_channelNameToProvider_t::const_iterator it;
if (_providers.size() == 1)
ServerChannelRequesterImpl::create(_providers[0], transport, channelName, cid, css);
else
ServerChannelRequesterImpl::create(ServerSearchHandler::s_channelNameToProvider[channelName].lock(), transport, channelName, cid, css); // TODO !!!!
else {
ChannelProvider::shared_pointer prov;
{
Lock L(_context->_mutex);
if((it = _context->s_channelNameToProvider.find(channelName)) != _context->s_channelNameToProvider.end())
prov = it->second.lock();
}
if(prov)
ServerChannelRequesterImpl::create(prov, transport, channelName, cid, css);
}
}
}

4
src/server/serverContext.cpp
View File

@@ -497,12 +497,12 @@ const osiSockAddr* ServerContextImpl::getServerInetAddress()
return NULL;
}
BlockingUDPTransport::shared_pointer ServerContextImpl::getBroadcastTransport()
const BlockingUDPTransport::shared_pointer& ServerContextImpl::getBroadcastTransport()
{
return _broadcastTransport;
}
std::vector<ChannelProvider::shared_pointer>& ServerContextImpl::getChannelProviders()
const std::vector<ChannelProvider::shared_pointer>& ServerContextImpl::getChannelProviders()
{
return _channelProviders;
}

12
testApp/remote/channelAccessIFTest.cpp
View File

@@ -32,17 +32,17 @@ namespace TR1 = std::tr1;
// int value, 1Hz increment by one
std::string ChannelAccessIFTest::TEST_COUNTER_CHANNEL_NAME = "testCounter";
const std::string ChannelAccessIFTest::TEST_COUNTER_CHANNEL_NAME = "testCounter";
// int value, increment on process
std::string ChannelAccessIFTest::TEST_SIMPLECOUNTER_CHANNEL_NAME = "testSimpleCounter";
const std::string ChannelAccessIFTest::TEST_SIMPLECOUNTER_CHANNEL_NAME = "testSimpleCounter";
// double value, NTScalar
std::string ChannelAccessIFTest::TEST_CHANNEL_NAME = "testValue";
const std::string ChannelAccessIFTest::TEST_CHANNEL_NAME = "testValue";
// double value
std::string ChannelAccessIFTest::TEST_VALUEONLY_CHANNEL_NAME = "testValueOnly";
const std::string ChannelAccessIFTest::TEST_VALUEONLY_CHANNEL_NAME = "testValueOnly";
// RPC sum service: int a + int b -> int c
std::string ChannelAccessIFTest::TEST_SUMRPC_CHANNEL_NAME = "testSum";
const std::string ChannelAccessIFTest::TEST_SUMRPC_CHANNEL_NAME = "testSum";
// double[] value
std::string ChannelAccessIFTest::TEST_ARRAY_CHANNEL_NAME = "testArray1";
const std::string ChannelAccessIFTest::TEST_ARRAY_CHANNEL_NAME = "testArray1";
#ifdef ENABLE_STRESS_TESTS
#define EXTRA_STRESS_TESTS 5

12
testApp/remote/channelAccessIFTest.h
View File

@@ -16,12 +16,12 @@ public:
protected:
static std::string TEST_COUNTER_CHANNEL_NAME;
static std::string TEST_SIMPLECOUNTER_CHANNEL_NAME;
static std::string TEST_CHANNEL_NAME;
static std::string TEST_VALUEONLY_CHANNEL_NAME;
static std::string TEST_SUMRPC_CHANNEL_NAME;
static std::string TEST_ARRAY_CHANNEL_NAME;
static const std::string TEST_COUNTER_CHANNEL_NAME;
static const std::string TEST_SIMPLECOUNTER_CHANNEL_NAME;
static const std::string TEST_CHANNEL_NAME;
static const std::string TEST_VALUEONLY_CHANNEL_NAME;
static const std::string TEST_SUMRPC_CHANNEL_NAME;
static const std::string TEST_ARRAY_CHANNEL_NAME;
ChannelProvider::shared_pointer getChannelProvider() { return m_provider; }

5
testApp/remote/testCodec.cpp
View File

@@ -2,11 +2,6 @@
* testCodec.cpp
*/
#if defined(_WIN32) && !defined(NOMINMAX)
#define NOMINMAX
#endif
#include <epicsExit.h>
#include <epicsUnitTest.h>
#include <testMain.h>

8
testApp/remote/testServer.cpp
View File

@@ -2,10 +2,6 @@
* testServer.cpp
*/
#if defined(_WIN32) && !defined(NOMINMAX)
#define NOMINMAX
#endif
// disable buggy boost enable_shared_from_this assert code
#define BOOST_DISABLE_ASSERTS
@@ -2515,7 +2511,7 @@ public:
typedef std::tr1::shared_ptr<MockServerChannelProvider> shared_pointer;
typedef std::tr1::shared_ptr<const MockServerChannelProvider> const_shared_pointer;
static string PROVIDER_NAME;
static const string PROVIDER_NAME;
MockServerChannelProvider() :
m_mockChannelFind(),
@@ -2699,7 +2695,7 @@ private:
epics::auto_ptr<epics::pvData::Thread> m_imgThread;
};
string MockServerChannelProvider::PROVIDER_NAME = "local";
const string MockServerChannelProvider::PROVIDER_NAME = "local";
struct TestServer
{