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

drop deprecated

Browse Source
This commit is contained in:
Michael Davidsaver
2017-12-29 12:03:06 -06:00
parent 49b2507985
commit d33356ced6
12 changed files with 2 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ca/caProvider.cpp
View File

@@ -150,19 +150,6 @@ void CAChannelProvider::addChannel(const CAChannelPtr & channel)
caChannelList.push_back(channel);
}
void CAChannelProvider::configure(epics::pvData::PVStructure::shared_pointer /*configuration*/)
{
}
void CAChannelProvider::flush()
{
}
void CAChannelProvider::poll()
{
}
void CAChannelProvider::threadAttach()
{
ca_attach_context(current_context);

4
src/ca/caProviderPvt.h
View File

@@ -62,10 +62,6 @@ public:
short priority,
std::string const & address);
virtual void configure(epics::pvData::PVStructure::shared_pointer configuration);
virtual void flush();
virtual void poll();
virtual void destroy() EPICS_DEPRECATED {};
void addChannel(const CAChannelPtr & get);

8
src/client/pv/pvAccess.h
View File

@@ -1237,14 +1237,6 @@ public:
*/
virtual Channel::shared_pointer createChannel(std::string const & name,ChannelRequester::shared_pointer const & requester,
short priority, std::string const & address) = 0;
//! @deprecated Changing of Configuration after start is not supported
virtual void configure(epics::pvData::PVStructure::shared_pointer /*configuration*/) EPICS_DEPRECATED {};
//! @deprecated No function
virtual void flush() EPICS_DEPRECATED {};
//! @deprecated No function
virtual void poll() EPICS_DEPRECATED {};
};
/**

3
src/pva/pv/pvaDefs.h
View File

@@ -15,9 +15,6 @@ struct ServerGUID {
char value[12];
};
// 'GUID' can be ambigious on windows/mingw
typedef ServerGUID GUID EPICS_DEPRECATED;
typedef epicsInt32 pvAccessID;
class AtomicBoolean

51
src/remoteClient/clientContextImpl.cpp
View File

@@ -4017,8 +4017,7 @@ public:
EPICS_PVA_MAINTENANCE_VERSION,
EPICS_PVA_DEVELOPMENT_FLAG),
m_contextState(CONTEXT_NOT_INITIALIZED),
m_configuration(conf),
m_flushStrategy(DELAYED)
m_configuration(conf)
{
REFTRACE_INCREMENT(num_instances);
@@ -4106,17 +4105,6 @@ public:
internalDestroy();
}
virtual void dispose() OVERRIDE FINAL
{
try {
destroy();
} catch (std::exception& ex) {
printf("dispose(): %s\n", ex.what()); // tODO remove
} catch (...) {
/* TODO log with low level */
}
}
virtual ~InternalClientContextImpl()
{
REFTRACE_DECREMENT(num_instances);
@@ -4446,8 +4434,6 @@ private:
try
{
Transport::shared_pointer t = m_connector->connect(client, m_responseHandler, *serverAddress, minorRevision, priority);
// TODO !!!
//static_pointer_cast<BlockingTCPTransport>(t)->setFlushStrategy(m_flushStrategy);
return t;
}
catch (std::exception& e)
@@ -4500,39 +4486,6 @@ private:
}
}
virtual void configure(epics::pvData::PVStructure::shared_pointer configuration) OVERRIDE FINAL
{ // remove?
if (m_transportRegistry.numberOfActiveTransports() > 0)
throw std::runtime_error("Configure must be called when there is no transports active.");
PVInt::shared_pointer pvStrategy = dynamic_pointer_cast<PVInt>(configuration->getSubField("strategy"));
if (pvStrategy.get())
{
int32 value = pvStrategy->get();
switch (value)
{
case IMMEDIATE:
case DELAYED:
case USER_CONTROLED:
m_flushStrategy = static_cast<FlushStrategy>(value);
break;
default:
// TODO report warning
break;
}
}
}
virtual void flush() OVERRIDE FINAL
{
m_transportRegistry.toArray(m_flushTransports);
TransportRegistry::transportVector_t::const_iterator iter = m_flushTransports.begin();
while (iter != m_flushTransports.end())
(*iter++)->flushSendQueue();
m_flushTransports.clear();
}
std::map<std::string, std::tr1::shared_ptr<SecurityPlugin> >& getSecurityPlugins() OVERRIDE FINAL
{
return SecurityPluginRegistry::instance().getClientSecurityPlugins();
@@ -4683,8 +4636,6 @@ private:
Configuration::shared_pointer m_configuration;
TransportRegistry::transportVector_t m_flushTransports;
FlushStrategy m_flushStrategy;
};
size_t InternalClientContextImpl::num_instances;

10
src/remoteClient/pv/clientContextImpl.h
View File

@@ -91,12 +91,6 @@ public:
*/
virtual void printInfo(std::ostream& out) = 0;
/**
* Dispose (destroy) server context.
* This calls <code>destroy()</code> and silently handles all exceptions.
*/
virtual void dispose() EPICS_DEPRECATED = 0;
virtual ChannelSearchManager::shared_pointer getChannelSearchManager() = 0;
virtual void checkChannelName(std::string const & name) = 0;
@@ -120,10 +114,6 @@ public:
virtual std::tr1::shared_ptr<BeaconHandler> getBeaconHandler(std::string const & protocol, osiSockAddr* responseFrom) = 0;
virtual void configure(epics::pvData::PVStructure::shared_pointer configuration) = 0;
virtual void flush() {}
virtual void poll() {}
virtual void destroy() = 0;
};

13
src/rpcClient/pv/rpcClient.h
View File

@@ -58,19 +58,6 @@ public:
~RPCClient() {destroy();}
/**
* Performs complete blocking RPC call, opening a channel and connecting to the
* service and sending the request.
*
* @param serviceName the name of the service to connect to
* @param request the request sent to the service
* @param timeout the timeout (in seconds), 0 means forever.
* @return the result of the RPC call.
* @throws RPCRequestException exception thrown on error on timeout.
*/
static epics::pvData::PVStructure::shared_pointer sendRequest(const std::string & serviceName,
epics::pvData::PVStructure::shared_pointer const &request, double timeOut = RPCCLIENT_DEFAULT_TIMEOUT) EPICS_DEPRECATED;
/**

8
src/rpcClient/rpcClient.cpp
View File

@@ -269,13 +269,5 @@ RPCClient::shared_pointer RPCClient::create(const std::string & serviceName,
return RPCClient::shared_pointer(new RPCClient(serviceName, pvRequest));
}
pvd::PVStructure::shared_pointer RPCClient::sendRequest(const std::string & serviceName,
pvd::PVStructure::shared_pointer const & queryRequest,
double timeOut)
{
RPCClient client(serviceName, queryRequest);
return client.request(queryRequest, timeOut);
}
}}// namespace epics::pvAccess

2
src/rpcService/pv/rpcService.h
View File

@@ -77,8 +77,6 @@ public:
) = 0;
};
typedef RPCServiceAsync Service EPICS_DEPRECATED;
class epicsShareClass RPCService :
public RPCServiceAsync
{

4
src/server/pv/serverContext.h
View File

@@ -56,8 +56,6 @@ public:
virtual void shutdown() = 0;
void destroy() EPICS_DEPRECATED { this->shutdown(); }
/**
* Prints detailed information about the context to the standard output stream.
*/
@@ -70,8 +68,6 @@ public:
*/
virtual void printInfo(std::ostream& str, int lvl=0) = 0;
void dispose() EPICS_DEPRECATED;
virtual epicsTimeStamp& getStartTime() = 0;
/**

18
src/server/serverContext.cpp
View File

@@ -67,7 +67,7 @@ ServerContextImpl::~ServerContextImpl()
}
catch(std::exception& e)
{
std::cerr<<"Error in: ServerContextImpl::dispose: "<<e.what()<<"\n";
std::cerr<<"Error in: ServerContextImpl::~ServerContextImpl: "<<e.what()<<"\n";
}
REFTRACE_DECREMENT(num_instances);
}
@@ -483,22 +483,6 @@ void ServerContextImpl::printInfo(ostream& str, int lvl)
}
}
void ServerContext::dispose()
{
try
{
shutdown();
}
catch(std::exception& e)
{
std::cerr<<"Error in: ServerContextImpl::dispose: "<<e.what()<<"\n";
}
catch(...)
{
std::cerr<<"Oh no, something when wrong in ServerContextImpl::dispose!\n";
}
}
void ServerContextImpl::setBeaconServerStatusProvider(BeaconServerStatusProvider::shared_pointer const & beaconServerStatusProvider)
{
_beaconServerStatusProvider = beaconServerStatusProvider;

5
testApp/remote/testGetPerformance.cpp
View File

@@ -112,9 +112,6 @@ void get_all()
i != channelGetList.end();
i++)
(*i)->get();
// we assume all channels are from the same provider
if (bulkMode) provider->flush();
}
@@ -321,7 +318,6 @@ void runTest()
Channel::shared_pointer channel = provider->createChannel(*i, channelRequesterImpl);
channels.push_back(channel);
}
if (bulkMode) provider->flush();
bool differentConnectionsWarningIssued = false;
string theRemoteAddress;
@@ -355,7 +351,6 @@ void runTest()
new ChannelGetRequesterImpl(channel->getChannelName())
);
ChannelGet::shared_pointer channelGet = channel->createChannelGet(getRequesterImpl, pvRequest);
if (bulkMode) provider->flush();
bool allOK = getRequesterImpl->waitUntilConnected(timeOut);