diff --git a/src/ca/caProvider.cpp b/src/ca/caProvider.cpp index e7fb52e..cd542f6 100644 --- a/src/ca/caProvider.cpp +++ b/src/ca/caProvider.cpp @@ -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); diff --git a/src/ca/caProviderPvt.h b/src/ca/caProviderPvt.h index 6d01361..89a970d 100644 --- a/src/ca/caProviderPvt.h +++ b/src/ca/caProviderPvt.h @@ -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); diff --git a/src/client/pv/pvAccess.h b/src/client/pv/pvAccess.h index 6cd4326..16aa41a 100644 --- a/src/client/pv/pvAccess.h +++ b/src/client/pv/pvAccess.h @@ -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 {}; - }; /** diff --git a/src/pva/pv/pvaDefs.h b/src/pva/pv/pvaDefs.h index 2ba0660..bba9eb3 100644 --- a/src/pva/pv/pvaDefs.h +++ b/src/pva/pv/pvaDefs.h @@ -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 diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp index a2454a7..2ab15f9 100644 --- a/src/remoteClient/clientContextImpl.cpp +++ b/src/remoteClient/clientContextImpl.cpp @@ -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(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(configuration->getSubField("strategy")); - if (pvStrategy.get()) - { - int32 value = pvStrategy->get(); - switch (value) - { - case IMMEDIATE: - case DELAYED: - case USER_CONTROLED: - m_flushStrategy = static_cast(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 >& 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; diff --git a/src/remoteClient/pv/clientContextImpl.h b/src/remoteClient/pv/clientContextImpl.h index 5f5b25e..29852b3 100644 --- a/src/remoteClient/pv/clientContextImpl.h +++ b/src/remoteClient/pv/clientContextImpl.h @@ -91,12 +91,6 @@ public: */ virtual void printInfo(std::ostream& out) = 0; - /** - * Dispose (destroy) server context. - * This calls destroy() 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 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; }; diff --git a/src/rpcClient/pv/rpcClient.h b/src/rpcClient/pv/rpcClient.h index ee1d71a..0202b1b 100644 --- a/src/rpcClient/pv/rpcClient.h +++ b/src/rpcClient/pv/rpcClient.h @@ -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; - /** diff --git a/src/rpcClient/rpcClient.cpp b/src/rpcClient/rpcClient.cpp index a02efb5..317beee 100644 --- a/src/rpcClient/rpcClient.cpp +++ b/src/rpcClient/rpcClient.cpp @@ -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 diff --git a/src/rpcService/pv/rpcService.h b/src/rpcService/pv/rpcService.h index deac4f8..c572557 100644 --- a/src/rpcService/pv/rpcService.h +++ b/src/rpcService/pv/rpcService.h @@ -77,8 +77,6 @@ public: ) = 0; }; -typedef RPCServiceAsync Service EPICS_DEPRECATED; - class epicsShareClass RPCService : public RPCServiceAsync { diff --git a/src/server/pv/serverContext.h b/src/server/pv/serverContext.h index 38af2f4..8eae4cf 100644 --- a/src/server/pv/serverContext.h +++ b/src/server/pv/serverContext.h @@ -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; /** diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp index 84f8e24..1deab07 100644 --- a/src/server/serverContext.cpp +++ b/src/server/serverContext.cpp @@ -67,7 +67,7 @@ ServerContextImpl::~ServerContextImpl() } catch(std::exception& e) { - std::cerr<<"Error in: ServerContextImpl::dispose: "<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);