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

boilerplate reduction

Browse Source
This commit is contained in:
Michael Davidsaver
2017-06-22 14:55:08 +02:00
parent 132eb03aa0
commit 74fbc64d51
6 changed files with 3 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
p2pApp/channel.cpp
View File

@ -84,12 +84,6 @@ GWChannel::getChannelRequester()
return requester;
}
bool
GWChannel::isConnected()
{
return entry->channel->isConnected();
}
void
GWChannel::getField(pva::GetFieldRequester::shared_pointer const & requester,
@ -253,9 +247,6 @@ GWChannel::createChannelArray(
}
void
GWChannel::printInfo()
{ printInfo(std::cout); }
void
GWChannel::printInfo(std::ostream& out)
{

2
p2pApp/channel.h
View File

@ -37,7 +37,6 @@ struct GWChannel : public epics::pvAccess::Channel
virtual ConnectionState getConnectionState();
virtual std::string getChannelName();
virtual std::tr1::shared_ptr<epics::pvAccess::ChannelRequester> getChannelRequester();
virtual bool isConnected();
virtual void getField(epics::pvAccess::GetFieldRequester::shared_pointer const & requester,
std::string const & subField);
@ -64,7 +63,6 @@ struct GWChannel : public epics::pvAccess::Channel
epics::pvAccess::ChannelArrayRequester::shared_pointer const & channelArrayRequester,
epics::pvData::PVStructure::shared_pointer const & pvRequest);
virtual void printInfo();
virtual void printInfo(std::ostream& out);
};

19
p2pApp/server.cpp
View File

@ -61,21 +61,6 @@ GWServerChannelProvider::channelFind(std::string const & channelName,
return ret;
}
pva::ChannelFind::shared_pointer
GWServerChannelProvider::channelList(pva::ChannelListRequester::shared_pointer const & channelListRequester)
{
std::cerr<<"GWServer does not advertise a channel list\n";
return pva::ChannelFind::shared_pointer();
}
pva::Channel::shared_pointer
GWServerChannelProvider::createChannel(std::string const & channelName,
pva::ChannelRequester::shared_pointer const & channelRequester,
short priority)
{
return createChannel(channelName, channelRequester, priority, "foobar");
}
// The return value of this function is ignored
// The newly created channel is given to the ChannelRequester
pva::Channel::shared_pointer
@ -119,10 +104,6 @@ GWServerChannelProvider::createChannel(std::string const & channelName,
return ret; // ignored by caller
}
void GWServerChannelProvider::configure(epics::pvData::PVStructure::shared_pointer /*configuration*/) {
std::cout<<"GWServer being configured\n";
}
void GWServerChannelProvider::destroy()
{
std::cout<<"GWServer destory request\n";

6
p2pApp/server.h
View File

@ -22,15 +22,11 @@ struct GWServerChannelProvider : public
virtual epics::pvAccess::ChannelFind::shared_pointer channelFind(std::string const & channelName,
epics::pvAccess::ChannelFindRequester::shared_pointer const & channelFindRequester);
virtual epics::pvAccess::ChannelFind::shared_pointer channelList(epics::pvAccess::ChannelListRequester::shared_pointer const & channelListRequester);
virtual epics::pvAccess::Channel::shared_pointer createChannel(std::string const & channelName,
epics::pvAccess::ChannelRequester::shared_pointer const & channelRequester,
short priority = PRIORITY_DEFAULT);
using epics::pvAccess::ChannelProvider::createChannel;
virtual epics::pvAccess::Channel::shared_pointer createChannel(std::string const & channelName,
epics::pvAccess::ChannelRequester::shared_pointer const & channelRequester,
short priority, std::string const & addressx);
virtual void configure(epics::pvData::PVStructure::shared_pointer /*configuration*/);
virtual void destroy();
GWServerChannelProvider(const std::tr1::shared_ptr<epics::pvAccess::Configuration>& conf);

2
testApp/utilities.cpp
View File

@ -440,7 +440,7 @@ void TestPV::post(const pvd::BitSet& changed, bool notify)
if(mon->free.empty()) {
mon->inoverflow = true;
mon->overflow->overrunBitSet->or_and(*mon->overflow->changedBitSet, changed); // oflow = prev_changed & new_changed
mon->overflow->overrunBitSet->or_and(*mon->overflow->changedBitSet, changed); // oflow |= prev_changed & new_changed
*mon->overflow->changedBitSet |= changed;
testDiag("overflow changed '%s' overrun '%s'",
toString(*mon->overflow->changedBitSet).c_str(),

5
testApp/utilities.h
View File

@ -22,10 +22,7 @@ struct TestProvider;
// minimally useful boilerplate which must appear *everywhere*
#define DUMBREQUESTER(NAME) \
virtual std::string getRequesterName() { return #NAME; } \
virtual void message(std::string const & message,epics::pvData::MessageType messageType) { \
testDiag("%s : " #NAME "(%p) : %s", epics::pvData::getMessageTypeName(messageType).c_str(), this, message.c_str()); \
}
virtual std::string getRequesterName() { return #NAME; }
template<typename T>
inline std::string toString(const T& tbs)