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

general indent beautification

Browse Source
This commit is contained in:
Matej Sekoranja
2016-03-10 23:36:16 +01:00
parent d139c42d17
commit 5279d247ca
110 changed files with 21778 additions and 21525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
src/rpcService/rpcServer.cpp
View File

@@ -15,7 +15,8 @@
using namespace epics::pvData;
using std::string;
namespace epics { namespace pvAccess {
namespace epics {
namespace pvAccess {
class ChannelRPCServiceImpl :
@@ -23,13 +24,13 @@ class ChannelRPCServiceImpl :
public RPCResponseCallback,
public std::tr1::enable_shared_from_this<ChannelRPCServiceImpl>
{
private:
private:
Channel::shared_pointer m_channel;
ChannelRPCRequester::shared_pointer m_channelRPCRequester;
Service::shared_pointer m_rpcService;
AtomicBoolean m_lastRequest;
public:
public:
ChannelRPCServiceImpl(
Channel::shared_pointer const & channel,
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
@@ -72,15 +73,15 @@ class ChannelRPCServiceImpl :
status = Status(Status::STATUSTYPE_FATAL, "Unexpected exception caught while calling RPCService.request(PVStructure).");
ok = false;
}
// check null result
if (ok && result.get() == 0)
{
status = Status(Status::STATUSTYPE_FATAL, "RPCService.request(PVStructure) returned null.");
}
m_channelRPCRequester->requestDone(status, shared_from_this(), result);
if (m_lastRequest.get())
destroy();
@@ -132,7 +133,7 @@ class ChannelRPCServiceImpl :
virtual void request(epics::pvData::PVStructure::shared_pointer const & pvArgument)
{
RPCService::shared_pointer rpcService =
std::tr1::dynamic_pointer_cast<RPCService>(m_rpcService);
std::tr1::dynamic_pointer_cast<RPCService>(m_rpcService);
if (rpcService)
{
processRequest(rpcService, pvArgument);
@@ -140,7 +141,7 @@ class ChannelRPCServiceImpl :
}
RPCServiceAsync::shared_pointer rpcServiceAsync =
std::tr1::dynamic_pointer_cast<RPCServiceAsync>(m_rpcService);
std::tr1::dynamic_pointer_cast<RPCServiceAsync>(m_rpcService);
if (rpcServiceAsync)
{
processRequest(rpcServiceAsync, pvArgument);
@@ -152,7 +153,7 @@ class ChannelRPCServiceImpl :
{
m_lastRequest.set();
}
virtual Channel::shared_pointer getChannel()
{
return m_channel;
@@ -190,27 +191,27 @@ private:
static Status notSupportedStatus;
static Status destroyedStatus;
AtomicBoolean m_destroyed;
ChannelProvider::shared_pointer m_provider;
string m_channelName;
ChannelRequester::shared_pointer m_channelRequester;
Service::shared_pointer m_rpcService;
public:
public:
POINTER_DEFINITIONS(RPCChannel);
RPCChannel(
ChannelProvider::shared_pointer const & provider,
string const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
Service::shared_pointer const & rpcService) :
m_provider(provider),
m_channelName(channelName),
m_channelRequester(channelRequester),
m_rpcService(rpcService)
ChannelProvider::shared_pointer const & provider,
string const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
Service::shared_pointer const & rpcService) :
m_provider(provider),
m_channelName(channelName),
m_channelRequester(channelRequester),
m_rpcService(rpcService)
{
}
@@ -223,7 +224,7 @@ public:
{
return m_provider;
}
virtual std::string getRemoteAddress()
{
// local
@@ -233,8 +234,8 @@ public:
virtual ConnectionState getConnectionState()
{
return isConnected() ?
Channel::CONNECTED :
Channel::DESTROYED;
Channel::CONNECTED :
Channel::DESTROYED;
}
virtual std::string getChannelName()
@@ -260,55 +261,55 @@ public:
virtual void getField(GetFieldRequester::shared_pointer const & requester,std::string const & /*subField*/)
{
requester->getDone(notSupportedStatus, epics::pvData::Field::shared_pointer());
requester->getDone(notSupportedStatus, epics::pvData::Field::shared_pointer());
}
virtual ChannelProcess::shared_pointer createChannelProcess(
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
ChannelProcessRequester::shared_pointer const & channelProcessRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelProcess::shared_pointer nullPtr;
channelProcessRequester->channelProcessConnect(notSupportedStatus, nullPtr);
return nullPtr;
return nullPtr;
}
virtual ChannelGet::shared_pointer createChannelGet(
ChannelGetRequester::shared_pointer const & channelGetRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
ChannelGetRequester::shared_pointer const & channelGetRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelGet::shared_pointer nullPtr;
channelGetRequester->channelGetConnect(notSupportedStatus, nullPtr,
epics::pvData::Structure::const_shared_pointer());
return nullPtr;
epics::pvData::Structure::const_shared_pointer());
return nullPtr;
}
virtual ChannelPut::shared_pointer createChannelPut(
ChannelPutRequester::shared_pointer const & channelPutRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
ChannelPutRequester::shared_pointer const & channelPutRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelPut::shared_pointer nullPtr;
channelPutRequester->channelPutConnect(notSupportedStatus, nullPtr,
epics::pvData::Structure::const_shared_pointer());
return nullPtr;
epics::pvData::Structure::const_shared_pointer());
return nullPtr;
}
virtual ChannelPutGet::shared_pointer createChannelPutGet(
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
ChannelPutGetRequester::shared_pointer const & channelPutGetRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelPutGet::shared_pointer nullPtr;
epics::pvData::Structure::const_shared_pointer nullStructure;
channelPutGetRequester->channelPutGetConnect(notSupportedStatus, nullPtr, nullStructure, nullStructure);
return nullPtr;
return nullPtr;
}
virtual ChannelRPC::shared_pointer createChannelRPC(
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
ChannelRPCRequester::shared_pointer const & channelRPCRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
// nothing expected to be in pvRequest
if (channelRPCRequester.get() == 0)
throw std::invalid_argument("channelRPCRequester == null");
@@ -318,7 +319,7 @@ public:
channelRPCRequester->channelRPCConnect(destroyedStatus, nullPtr);
return nullPtr;
}
// TODO use std::make_shared
std::tr1::shared_ptr<ChannelRPCServiceImpl> tp(
new ChannelRPCServiceImpl(shared_from_this(), channelRPCRequester, m_rpcService)
@@ -329,23 +330,23 @@ public:
}
virtual epics::pvData::Monitor::shared_pointer createMonitor(
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
epics::pvData::Monitor::shared_pointer nullPtr;
monitorRequester->monitorConnect(notSupportedStatus, nullPtr, epics::pvData::Structure::shared_pointer());
return nullPtr;
return nullPtr;
}
virtual ChannelArray::shared_pointer createChannelArray(
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
ChannelArrayRequester::shared_pointer const & channelArrayRequester,
epics::pvData::PVStructure::shared_pointer const & /*pvRequest*/)
{
ChannelArray::shared_pointer nullPtr;
channelArrayRequester->channelArrayConnect(notSupportedStatus, nullPtr, epics::pvData::Array::const_shared_pointer());
return nullPtr;
return nullPtr;
}
virtual void printInfo()
{
@@ -365,7 +366,7 @@ public:
{
return getChannelName();
}
virtual void message(std::string const & message,MessageType messageType)
{
// just delegate
@@ -374,41 +375,41 @@ public:
virtual void destroy()
{
m_destroyed.set();
}
m_destroyed.set();
}
};
Status RPCChannel::notSupportedStatus(Status::STATUSTYPE_ERROR, "only channelRPC requests are supported by this channel");
Status RPCChannel::destroyedStatus(Status::STATUSTYPE_ERROR, "channel destroyed");
Channel::shared_pointer createRPCChannel(ChannelProvider::shared_pointer const & provider,
std::string const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
Service::shared_pointer const & rpcService)
std::string const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
Service::shared_pointer const & rpcService)
{
// TODO use std::make_shared
std::tr1::shared_ptr<RPCChannel> tp(
new RPCChannel(provider, channelName, channelRequester, rpcService)
);
new RPCChannel(provider, channelName, channelRequester, rpcService)
);
Channel::shared_pointer channel = tp;
return channel;
}
class RPCChannelProvider :
public virtual ChannelProvider,
public virtual ChannelProvider,
public virtual ChannelFind,
public std::tr1::enable_shared_from_this<RPCChannelProvider> {
public:
POINTER_DEFINITIONS(RPCChannelProvider);
static string PROVIDER_NAME;
static Status noSuchChannelStatus;
// TODO thread pool support
RPCChannelProvider() {
}
@@ -420,19 +421,19 @@ public:
{
return shared_from_this();
}
virtual void cancel() {}
virtual void destroy() {}
virtual ChannelFind::shared_pointer channelFind(std::string const & channelName,
ChannelFindRequester::shared_pointer const & channelFindRequester)
ChannelFindRequester::shared_pointer const & channelFindRequester)
{
bool found;
{
Lock guard(m_mutex);
found = (m_services.find(channelName) != m_services.end()) ||
findWildService(channelName);
findWildService(channelName);
}
ChannelFind::shared_pointer thisPtr(shared_from_this());
channelFindRequester->channelFindResult(Status::Ok, thisPtr, found);
@@ -441,7 +442,7 @@ public:
virtual ChannelFind::shared_pointer channelList(
ChannelListRequester::shared_pointer const & channelListRequester)
ChannelListRequester::shared_pointer const & channelListRequester)
{
if (!channelListRequester.get())
throw std::runtime_error("null requester");
@@ -451,8 +452,8 @@ public:
Lock guard(m_mutex);
channelNames.reserve(m_services.size());
for (RPCServiceMap::const_iterator iter = m_services.begin();
iter != m_services.end();
iter++)
iter != m_services.end();
iter++)
channelNames.push_back(iter->first);
}
@@ -462,9 +463,9 @@ public:
}
virtual Channel::shared_pointer createChannel(
std::string const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
short /*priority*/)
std::string const & channelName,
ChannelRequester::shared_pointer const & channelRequester,
short /*priority*/)
{
Service::shared_pointer service;
@@ -486,7 +487,7 @@ public:
channelRequester->channelCreated(noSuchChannelStatus, nullChannel);
return nullChannel;
}
// TODO use std::make_shared
std::tr1::shared_ptr<RPCChannel> tp(
new RPCChannel(
@@ -526,8 +527,8 @@ public:
if (isWildcardPattern(serviceName))
{
for (RPCWildServiceList::iterator iter = m_wildServices.begin();
iter != m_wildServices.end();
iter++)
iter != m_wildServices.end();
iter++)
if (iter->first == serviceName)
{
m_wildServices.erase(iter);
@@ -536,14 +537,14 @@ public:
}
}
private:
private:
// assumes sync on services
Service::shared_pointer findWildService(string const & wildcard)
{
if (!m_wildServices.empty())
for (RPCWildServiceList::iterator iter = m_wildServices.begin();
iter != m_wildServices.end();
iter++)
iter != m_wildServices.end();
iter++)
if (Wildcard::wildcardfit(iter->first.c_str(), wildcard.c_str()))
return iter->second;
@@ -616,7 +617,7 @@ RPCServer::RPCServer()
m_serverContext = ServerContextImpl::create();
m_serverContext->setChannelProviderName(m_channelProviderImpl->getProviderName());
m_serverContext->initialize(getChannelProviderRegistry());
}
@@ -651,7 +652,7 @@ static void threadRunner(void* usr)
param.server->run(param.timeToRun);
}
/// Method requires usage of std::tr1::shared_ptr<RPCServer>. This instance must be
/// Method requires usage of std::tr1::shared_ptr<RPCServer>. This instance must be
/// owned by a shared_ptr instance.
void RPCServer::runInNewThread(int seconds)
{
@@ -688,4 +689,5 @@ void RPCServer::unregisterService(std::string const & serviceName)
std::tr1::dynamic_pointer_cast<RPCChannelProvider>(m_channelProviderImpl)->unregisterService(serviceName);
}
}}
}
}