From 85db68a1eaa94510218c11311b5118fabe8f0538 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Wed, 13 Aug 2014 23:49:18 +0200 Subject: [PATCH] clang port --- pvtoolsSrc/eget.cpp | 2 +- pvtoolsSrc/pvget.cpp | 2 +- pvtoolsSrc/pvutils.cpp | 4 +- src/ca/caChannel.cpp | 18 ++- src/ca/caProvider.cpp | 9 +- src/remoteClient/clientContextImpl.cpp | 81 ++++++---- src/remoteClient/clientContextImpl.h | 2 + src/rpcService/rpcServer.cpp | 21 ++- src/server/responseHandlers.cpp | 90 +++++++---- src/server/responseHandlers.h | 5 +- src/server/serverContext.cpp | 12 +- src/v3ioc/PVAServerRegister.cpp | 6 +- testApp/remote/testCodec.cpp | 4 +- testApp/remote/testGetPerformance.cpp | 5 - testApp/remote/testMonitorPerformance.cpp | 7 +- testApp/remote/testNTImage.cpp | 2 +- testApp/remote/testServer.cpp | 187 ++++------------------ 17 files changed, 199 insertions(+), 258 deletions(-) diff --git a/pvtoolsSrc/eget.cpp b/pvtoolsSrc/eget.cpp index 8689ffb..02e982a 100644 --- a/pvtoolsSrc/eget.cpp +++ b/pvtoolsSrc/eget.cpp @@ -1333,7 +1333,7 @@ class MonitorRequesterImpl : public MonitorRequester { MonitorElement::shared_pointer element; - while (element = monitor->poll()) + while ((element = monitor->poll())) { if (mode == ValueOnlyMode) { diff --git a/pvtoolsSrc/pvget.cpp b/pvtoolsSrc/pvget.cpp index e334fad..cd9659f 100644 --- a/pvtoolsSrc/pvget.cpp +++ b/pvtoolsSrc/pvget.cpp @@ -246,7 +246,7 @@ class MonitorRequesterImpl : public MonitorRequester { MonitorElement::shared_pointer element; - while (element = monitor->poll()) + while ((element = monitor->poll())) { if (mode == ValueOnlyMode) { diff --git a/pvtoolsSrc/pvutils.cpp b/pvtoolsSrc/pvutils.cpp index ce3c144..1fbaccc 100644 --- a/pvtoolsSrc/pvutils.cpp +++ b/pvtoolsSrc/pvutils.cpp @@ -87,7 +87,9 @@ std::ostream& terse(std::ostream& o, PVField::shared_pointer const & pv) return terseStructureArray(o, static_pointer_cast(pv)); break; default: - throw logic_error("unknown Field type: " + type); + std::ostringstream msg("unknown Field type: "); + msg << type; + throw std::logic_error(msg.str()); } } diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp index ab8f043..5a3922e 100644 --- a/src/ca/caChannel.cpp +++ b/src/ca/caChannel.cpp @@ -467,7 +467,11 @@ ChannelGet::shared_pointer CAChannelGet::create( ChannelGetRequester::shared_pointer const & channelGetRequester, epics::pvData::PVStructure::shared_pointer const & pvRequest) { - ChannelGet::shared_pointer thisPtr(new CAChannelGet(channel, channelGetRequester, pvRequest)); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new CAChannelGet(channel, channelGetRequester, pvRequest) + ); + ChannelGet::shared_pointer thisPtr = tp; static_cast(thisPtr.get())->activate(); return thisPtr; } @@ -938,7 +942,11 @@ ChannelPut::shared_pointer CAChannelPut::create( ChannelPutRequester::shared_pointer const & channelPutRequester, epics::pvData::PVStructure::shared_pointer const & pvRequest) { - ChannelPut::shared_pointer thisPtr(new CAChannelPut(channel, channelPutRequester, pvRequest)); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new CAChannelPut(channel, channelPutRequester, pvRequest) + ); + ChannelPut::shared_pointer thisPtr = tp; static_cast(thisPtr.get())->activate(); return thisPtr; } @@ -1259,7 +1267,11 @@ Monitor::shared_pointer CAChannelMonitor::create( epics::pvData::MonitorRequester::shared_pointer const & monitorRequester, epics::pvData::PVStructure::shared_pointer const & pvRequest) { - Monitor::shared_pointer thisPtr(new CAChannelMonitor(channel, monitorRequester, pvRequest)); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new CAChannelMonitor(channel, monitorRequester, pvRequest) + ); + Monitor::shared_pointer thisPtr = tp; static_cast(thisPtr.get())->activate(); return thisPtr; } diff --git a/src/ca/caProvider.cpp b/src/ca/caProvider.cpp index 2087701..de75c4b 100644 --- a/src/ca/caProvider.cpp +++ b/src/ca/caProvider.cpp @@ -173,7 +173,9 @@ public: if (!sharedProvider.get()) { try { - sharedProvider.reset(new CAChannelProvider()); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new CAChannelProvider()); + sharedProvider = tp; } catch (std::exception &e) { LOG(logLevelError, "Unhandled exception caught at %s:%d: %s", __FILE__, __LINE__, e.what()); } catch (...) { @@ -186,7 +188,10 @@ public: virtual ChannelProvider::shared_pointer newInstance() { try { - return ChannelProvider::shared_pointer(new CAChannelProvider()); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new CAChannelProvider()); + ChannelProvider::shared_pointer ni = tp; + return ni; } catch (std::exception &e) { LOG(logLevelError, "Unhandled exception caught at %s:%d: %s", __FILE__, __LINE__, e.what()); return ChannelProvider::shared_pointer(); diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp index f37ca92..27142c8 100644 --- a/src/remoteClient/clientContextImpl.cpp +++ b/src/remoteClient/clientContextImpl.cpp @@ -441,10 +441,12 @@ namespace epics { public: static ChannelProcess::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelProcessRequester::shared_pointer const & callback, PVStructure::shared_pointer const & pvRequest) { - ChannelProcess::shared_pointer thisPointer( + // TODO use std::make_shared + std::tr1::shared_ptr tp( new ChannelProcessRequestImpl(channel, callback, pvRequest), delayed_destroyable_deleter() ); + ChannelProcess::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -576,7 +578,7 @@ namespace epics { void activate() { - if (m_pvRequest == 0) + if (!m_pvRequest) { ChannelGet::shared_pointer thisPointer = dynamic_pointer_cast(shared_from_this()); EXCEPTION_GUARD(m_channelGetRequester->channelGetConnect(pvRequestNull, thisPointer, nullStructure)); @@ -600,7 +602,11 @@ namespace epics { public: static ChannelGet::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelGetRequester::shared_pointer const & channelGetRequester, PVStructure::shared_pointer const & pvRequest) { - ChannelGet::shared_pointer thisPointer(new ChannelGetImpl(channel, channelGetRequester, pvRequest), delayed_destroyable_deleter()); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new ChannelGetImpl(channel, channelGetRequester, pvRequest), + delayed_destroyable_deleter()); + ChannelGet::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -799,7 +805,7 @@ namespace epics { void activate() { - if (m_pvRequest == 0) + if (!m_pvRequest) { ChannelPut::shared_pointer thisPointer = dynamic_pointer_cast(shared_from_this()); EXCEPTION_GUARD(m_channelPutRequester->channelPutConnect(pvRequestNull, thisPointer, nullStructure)); @@ -823,7 +829,11 @@ namespace epics { public: static ChannelPut::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelPutRequester::shared_pointer const & channelPutRequester, PVStructure::shared_pointer const & pvRequest) { - ChannelPut::shared_pointer thisPointer(new ChannelPutImpl(channel, channelPutRequester, pvRequest), delayed_destroyable_deleter()); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new ChannelPutImpl(channel, channelPutRequester, pvRequest), + delayed_destroyable_deleter()); + ChannelPut::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -1064,7 +1074,7 @@ namespace epics { void activate() { - if (m_pvRequest == 0) + if (!m_pvRequest) { ChannelPutGet::shared_pointer thisPointer = dynamic_pointer_cast(shared_from_this()); EXCEPTION_GUARD(m_channelPutGetRequester->channelPutGetConnect(pvRequestNull, thisPointer, nullStructure, nullStructure)); @@ -1085,7 +1095,11 @@ namespace epics { public: static ChannelPutGet::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelPutGetRequester::shared_pointer const & channelPutGetRequester, PVStructure::shared_pointer const & pvRequest) { - ChannelPutGet::shared_pointer thisPointer(new ChannelPutGetImpl(channel, channelPutGetRequester, pvRequest), delayed_destroyable_deleter()); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new ChannelPutGetImpl(channel, channelPutGetRequester, pvRequest), + delayed_destroyable_deleter()); + ChannelPutGet::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -1385,7 +1399,7 @@ namespace epics { void activate() { - if (m_pvRequest == 0) + if (!m_pvRequest) { ChannelRPC::shared_pointer thisPointer = dynamic_pointer_cast(shared_from_this()); EXCEPTION_GUARD(m_channelRPCRequester->channelRPCConnect(pvRequestNull, thisPointer)); @@ -1407,7 +1421,11 @@ namespace epics { public: static ChannelRPC::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelRPCRequester::shared_pointer const & channelRPCRequester, PVStructure::shared_pointer const & pvRequest) { - ChannelRPC::shared_pointer thisPointer(new ChannelRPCImpl(channel, channelRPCRequester, pvRequest), delayed_destroyable_deleter()); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new ChannelRPCImpl(channel, channelRPCRequester, pvRequest), + delayed_destroyable_deleter()); + ChannelRPC::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -1589,7 +1607,7 @@ namespace epics { void activate() { - if (m_pvRequest == 0) + if (!m_pvRequest) { ChannelArray::shared_pointer thisPointer = dynamic_pointer_cast(shared_from_this()); EXCEPTION_GUARD(m_channelArrayRequester->channelArrayConnect(pvRequestNull, thisPointer, Array::shared_pointer())); @@ -1611,7 +1629,11 @@ namespace epics { public: static ChannelArray::shared_pointer create(ChannelImpl::shared_pointer const & channel, ChannelArrayRequester::shared_pointer const & channelArrayRequester, PVStructure::shared_pointer const & pvRequest) { - ChannelArray::shared_pointer thisPointer(new ChannelArrayImpl(channel, channelArrayRequester, pvRequest), delayed_destroyable_deleter()); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new ChannelArrayImpl(channel, channelArrayRequester, pvRequest), + delayed_destroyable_deleter()); + ChannelArray::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -2325,7 +2347,7 @@ namespace epics { void activate() { - if (m_pvRequest == 0) + if (!m_pvRequest) { Monitor::shared_pointer thisPointer = dynamic_pointer_cast(shared_from_this()); EXCEPTION_GUARD(m_monitorRequester->monitorConnect(pvRequestNull, thisPointer, StructureConstPtr())); @@ -2339,7 +2361,7 @@ namespace epics { pvField = pvOptions->getSubField("queueSize"); if (pvField.get()) { PVStringPtr pvString = pvOptions->getStringField("queueSize"); - if(pvString.get()!=NULL) { + if(pvString) { int32 size; std::stringstream ss; ss << pvString->get(); @@ -2352,7 +2374,8 @@ namespace epics { BaseRequestImpl::activate(); if (queueSize<2) queueSize = 2; - m_monitorStrategy.reset(new MonitorStrategyQueue(m_monitorRequester, queueSize)); + std::tr1::shared_ptr tp(new MonitorStrategyQueue(m_monitorRequester, queueSize)); + m_monitorStrategy = tp; // subscribe try { @@ -2370,11 +2393,13 @@ namespace epics { MonitorRequester::shared_pointer const & monitorRequester, PVStructure::shared_pointer const & pvRequest) { - Monitor::shared_pointer thisPointer( + // TODO use std::make_shared + std::tr1::shared_ptr tp( new ChannelMonitorImpl( channel, monitorRequester, pvRequest), delayed_destroyable_deleter()); + Monitor::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -2777,13 +2802,13 @@ namespace epics { std::tr1::shared_ptr beaconHandler = context->getBeaconHandler(protocol, responseFrom); // currently we care only for servers used by this context - if (beaconHandler == 0) + if (!beaconHandler) return; // extra data PVFieldPtr data; const FieldConstPtr field = getFieldCreate()->deserialize(payloadBuffer, transport.get()); - if (field != 0) + if (field) { data = getPVDataCreate()->createPVField(field); data->deserialize(payloadBuffer, transport.get()); @@ -3252,12 +3277,6 @@ namespace epics { */ bool m_allowCreation; - /** - * Reference counting. - * NOTE: synced on m_channelMutex. - */ - int m_references; - /* ****************** */ /* PVA protocol fields */ /* ****************** */ @@ -3333,7 +3352,11 @@ namespace epics { short priority, auto_ptr& addresses) { - ChannelImpl::shared_pointer thisPointer(new InternalChannelImpl(context, channelID, name, requester, priority, addresses), delayed_destroyable_deleter()); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new InternalChannelImpl(context, channelID, name, requester, priority, addresses), + delayed_destroyable_deleter()); + ChannelImpl::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -3893,7 +3916,7 @@ namespace epics { ResponseRequest::shared_pointer ptr; for (int i = 0; i< count; i++) { - if(ptr = rrs[i].lock()) + if((ptr = rrs[i].lock())) { EXCEPTION_GUARD(ptr->reportStatus(status)); } @@ -4055,7 +4078,9 @@ namespace epics { static shared_pointer create() { - shared_pointer thisPointer(new InternalClientContextImpl(), delayed_destroyable_deleter()); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new InternalClientContextImpl(), delayed_destroyable_deleter()); + shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(); return thisPointer; } @@ -4070,7 +4095,7 @@ namespace epics { TODO final ConfigurationProvider configurationProvider = ConfigurationFactory.getProvider(); Configuration config = configurationProvider.getConfiguration("pvAccess-client"); - if (config == 0) + if (!config) config = configurationProvider.getConfiguration("system"); return config; */ @@ -4534,7 +4559,7 @@ TODO checkState(); checkChannelName(name); - if (requester == 0) + if (!requester) throw std::runtime_error("0 requester"); if (priority < ChannelProvider::PRIORITY_MIN || priority > ChannelProvider::PRIORITY_MAX) diff --git a/src/remoteClient/clientContextImpl.h b/src/remoteClient/clientContextImpl.h index 6d88dbe..594e6bf 100644 --- a/src/remoteClient/clientContextImpl.h +++ b/src/remoteClient/clientContextImpl.h @@ -126,6 +126,8 @@ namespace epics { virtual void configure(epics::pvData::PVStructure::shared_pointer configuration) = 0; virtual void flush() = 0; virtual void poll() = 0; + + virtual void destroy() = 0; }; epicsShareExtern ClientContextImpl::shared_pointer createClientContextImpl(); diff --git a/src/rpcService/rpcServer.cpp b/src/rpcService/rpcServer.cpp index 4bd8ca2..f74d0ae 100644 --- a/src/rpcService/rpcServer.cpp +++ b/src/rpcService/rpcServer.cpp @@ -257,9 +257,11 @@ public: return nullPtr; } - ChannelRPC::shared_pointer channelRPCImpl( + // TODO use std::make_shared + std::tr1::shared_ptr tp( new ChannelRPCServiceImpl(shared_from_this(), channelRPCRequester, m_rpcService) ); + ChannelRPC::shared_pointer channelRPCImpl = tp; channelRPCRequester->channelRPCConnect(Status::Ok, channelRPCImpl); return channelRPCImpl; } @@ -322,7 +324,12 @@ Channel::shared_pointer createRPCChannel(ChannelProvider::shared_pointer const & ChannelRequester::shared_pointer const & channelRequester, RPCService::shared_pointer const & rpcService) { - return Channel::shared_pointer(new RPCChannel(provider, channelName, channelRequester, rpcService)); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new RPCChannel(provider, channelName, channelRequester, rpcService) + ); + Channel::shared_pointer channel = tp; + return channel; } @@ -409,11 +416,14 @@ public: return nullChannel; } - Channel::shared_pointer rpcChannel(new RPCChannel( + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new RPCChannel( shared_from_this(), channelName, channelRequester, iter->second)); + Channel::shared_pointer rpcChannel = tp; channelRequester->channelCreated(Status::Ok, rpcChannel); return rpcChannel; } @@ -473,7 +483,10 @@ public: virtual ChannelProvider::shared_pointer newInstance() { - return ChannelProvider::shared_pointer(new RPCChannelProvider()); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new RPCChannelProvider()); + ChannelProvider::shared_pointer channelProvider = tp; + return channelProvider; } private: diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp index 5c0b52e..fda28c2 100644 --- a/src/server/responseHandlers.cpp +++ b/src/server/responseHandlers.cpp @@ -251,7 +251,9 @@ byteAddress[i] = payloadBuffer->getByte(); }; int providerCount = _providers.size(); ServerChannelFindRequesterImpl* pr = new ServerChannelFindRequesterImpl(_context, providerCount); pr->set(name, searchSequenceId, cid, responseAddress, responseRequired, false); - ChannelFindRequester::shared_pointer spr(pr); + // TODO use std::make_shared + std::tr1::shared_ptr tp(pr); + ChannelFindRequester::shared_pointer spr = tp; for (int i = 0; i < providerCount; i++) _providers[i]->channelFind(name, spr); @@ -264,7 +266,9 @@ byteAddress[i] = payloadBuffer->getByte(); }; { ServerChannelFindRequesterImpl* pr = new ServerChannelFindRequesterImpl(_context, 1); pr->set("", searchSequenceId, 0, responseAddress, true, true); - ChannelFindRequester::shared_pointer spr(pr); + // TODO use std::make_shared + std::tr1::shared_ptr tp(pr); + ChannelFindRequester::shared_pointer spr = tp; spr->channelFindResult(Status::Ok, ChannelFind::shared_pointer(), false); } } @@ -552,7 +556,9 @@ void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom, // TODO singleton!!! ServerRPCService::shared_pointer serverRPCService(new ServerRPCService(_context)); - ChannelRequester::shared_pointer cr(new ServerChannelRequesterImpl(transport, channelName, cid)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelRequesterImpl(transport, channelName, cid)); + ChannelRequester::shared_pointer cr = tp; Channel::shared_pointer serverChannel = createRPCChannel(ChannelProvider::shared_pointer(), channelName, cr, serverRPCService); cr->channelCreated(Status::Ok, serverChannel); } @@ -585,7 +591,9 @@ ChannelRequester::shared_pointer ServerChannelRequesterImpl::create( ChannelProvider::shared_pointer const & provider, Transport::shared_pointer const & transport, const string channelName, const pvAccessID cid) { - ChannelRequester::shared_pointer cr(new ServerChannelRequesterImpl(transport, channelName, cid)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelRequesterImpl(transport, channelName, cid)); + ChannelRequester::shared_pointer cr = tp; // TODO exception guard and report error back provider->createChannel(channelName, cr, transport->getPriority()); return cr; @@ -868,7 +876,9 @@ ServerChannelGetRequesterImpl::ServerChannelGetRequesterImpl(ServerContextImpl:: ChannelGetRequester::shared_pointer ServerChannelGetRequesterImpl::create(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport, PVStructure::shared_pointer const & pvRequest) { - ChannelGetRequester::shared_pointer thisPointer(new ServerChannelGetRequesterImpl(context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelGetRequesterImpl(context, channel, ioid, transport)); + ChannelGetRequester::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(pvRequest); return thisPointer; } @@ -1029,7 +1039,7 @@ void ServerPutHandler::handleResponse(osiSockAddr* responseFrom, const int8 qosCode = payloadBuffer->getByte(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_PUT, transport, ioid, qosCode, BaseChannelRequester::badCIDStatus); return; @@ -1050,7 +1060,7 @@ void ServerPutHandler::handleResponse(osiSockAddr* responseFrom, const bool get = (QOS_GET & qosCode) != 0; ServerChannelPutRequesterImpl::shared_pointer request = static_pointer_cast(channel->getRequest(ioid)); - if (request == NULL) + if (!request.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_PUT, transport, ioid, qosCode, BaseChannelRequester::badIOIDStatus); return; @@ -1102,7 +1112,9 @@ ServerChannelPutRequesterImpl::ServerChannelPutRequesterImpl(ServerContextImpl:: ChannelPutRequester::shared_pointer ServerChannelPutRequesterImpl::create(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport, PVStructure::shared_pointer const & pvRequest) { - ChannelPutRequester::shared_pointer thisPointer(new ServerChannelPutRequesterImpl(context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelPutRequesterImpl(context, channel, ioid, transport)); + ChannelPutRequester::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(pvRequest); return thisPointer; } @@ -1274,7 +1286,7 @@ void ServerPutGetHandler::handleResponse(osiSockAddr* responseFrom, const int8 qosCode = payloadBuffer->getByte(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_PUT_GET, transport, ioid, qosCode, BaseChannelRequester::badCIDStatus); return; @@ -1296,7 +1308,7 @@ void ServerPutGetHandler::handleResponse(osiSockAddr* responseFrom, const bool getPut = (QOS_GET_PUT & qosCode) != 0; ServerChannelPutGetRequesterImpl::shared_pointer request = static_pointer_cast(channel->getRequest(ioid)); - if (request == NULL) + if (!request.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_PUT_GET, transport, ioid, qosCode, BaseChannelRequester::badIOIDStatus); return; @@ -1349,7 +1361,9 @@ ServerChannelPutGetRequesterImpl::ServerChannelPutGetRequesterImpl(ServerContext ChannelPutGetRequester::shared_pointer ServerChannelPutGetRequesterImpl::create(ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest) { - ChannelPutGetRequester::shared_pointer thisPointer(new ServerChannelPutGetRequesterImpl(context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelPutGetRequesterImpl(context, channel, ioid, transport)); + ChannelPutGetRequester::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(pvRequest); return thisPointer; } @@ -1554,7 +1568,7 @@ void ServerMonitorHandler::handleResponse(osiSockAddr* responseFrom, const int8 qosCode = payloadBuffer->getByte(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_MONITOR, transport, ioid, qosCode, BaseChannelRequester::badCIDStatus); return; @@ -1576,7 +1590,7 @@ void ServerMonitorHandler::handleResponse(osiSockAddr* responseFrom, const bool process = (QOS_PROCESS & qosCode) != 0; ServerMonitorRequesterImpl::shared_pointer request = static_pointer_cast(channel->getRequest(ioid)); - if (request == NULL) + if (!request.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_MONITOR, transport, ioid, qosCode, BaseChannelRequester::badIOIDStatus); return; @@ -1619,7 +1633,9 @@ MonitorRequester::shared_pointer ServerMonitorRequesterImpl::create( ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest) { - MonitorRequester::shared_pointer thisPointer(new ServerMonitorRequesterImpl(context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerMonitorRequesterImpl(context, channel, ioid, transport)); + MonitorRequester::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(pvRequest); return thisPointer; } @@ -1741,7 +1757,7 @@ void ServerMonitorRequesterImpl::send(ByteBuffer* buffer, TransportSendControl* return; MonitorElement::shared_pointer element = monitor->poll(); - if (element != NULL) + if (element.get()) { control->startMessage((int8)CMD_MONITOR, sizeof(int32)/sizeof(int8) + 1); buffer->putInt(_ioid); @@ -1787,7 +1803,7 @@ void ServerArrayHandler::handleResponse(osiSockAddr* responseFrom, const int8 qosCode = payloadBuffer->getByte(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_ARRAY, transport, ioid, qosCode, BaseChannelRequester::badCIDStatus); return; @@ -1810,7 +1826,7 @@ void ServerArrayHandler::handleResponse(osiSockAddr* responseFrom, const bool getLength = (QOS_PROCESS & qosCode) != 0; ServerChannelArrayRequesterImpl::shared_pointer request = static_pointer_cast(channel->getRequest(ioid)); - if (request == NULL) + if (!request.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_ARRAY, transport, ioid, qosCode, BaseChannelRequester::badIOIDStatus); return; @@ -1873,7 +1889,9 @@ ChannelArrayRequester::shared_pointer ServerChannelArrayRequesterImpl::create( ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest) { - ChannelArrayRequester::shared_pointer thisPointer(new ServerChannelArrayRequesterImpl(context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelArrayRequesterImpl(context, channel, ioid, transport)); + ChannelArrayRequester::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(pvRequest); return thisPointer; } @@ -2069,14 +2087,14 @@ void ServerDestroyRequestHandler::handleResponse(osiSockAddr* responseFrom, const pvAccessID ioid = payloadBuffer->getInt(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { failureResponse(transport, ioid, BaseChannelRequester::badCIDStatus); return; } Destroyable::shared_pointer request = channel->getRequest(ioid); - if (request == NULL) + if (!request.get()) { failureResponse(transport, ioid, BaseChannelRequester::badIOIDStatus); return; @@ -2109,21 +2127,21 @@ void ServerCancelRequestHandler::handleResponse(osiSockAddr* responseFrom, const pvAccessID ioid = payloadBuffer->getInt(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { failureResponse(transport, ioid, BaseChannelRequester::badCIDStatus); return; } Destroyable::shared_pointer request = channel->getRequest(ioid); - if (request == NULL) + if (!request.get()) { failureResponse(transport, ioid, BaseChannelRequester::badIOIDStatus); return; } ChannelRequest::shared_pointer cr = dynamic_pointer_cast(request); - if (cr == NULL) + if (!cr.get()) { failureResponse(transport, ioid, BaseChannelRequester::notAChannelRequestStatus); return; @@ -2157,7 +2175,7 @@ void ServerProcessHandler::handleResponse(osiSockAddr* responseFrom, const int8 qosCode = payloadBuffer->getByte(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_PROCESS, transport, ioid, qosCode, BaseChannelRequester::badCIDStatus); return; @@ -2177,7 +2195,7 @@ void ServerProcessHandler::handleResponse(osiSockAddr* responseFrom, const bool lastRequest = (QOS_DESTROY & qosCode) != 0; ServerChannelProcessRequesterImpl::shared_pointer request = static_pointer_cast(channel->getRequest(ioid)); - if (request == NULL) + if (!request.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_PROCESS, transport, ioid, qosCode, BaseChannelRequester::badIOIDStatus); return; @@ -2206,7 +2224,9 @@ ChannelProcessRequester::shared_pointer ServerChannelProcessRequesterImpl::creat ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport,PVStructure::shared_pointer const & pvRequest) { - ChannelProcessRequester::shared_pointer thisPointer(new ServerChannelProcessRequesterImpl(context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelProcessRequesterImpl(context, channel, ioid, transport)); + ChannelProcessRequester::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(pvRequest); return thisPointer; } @@ -2267,7 +2287,7 @@ void ServerChannelProcessRequesterImpl::destroy() { Lock guard(_mutex); _channel->unregisterRequest(_ioid); - if (_channelProcess != NULL) + if (_channelProcess.get()) { _channelProcess->destroy(); } @@ -2319,7 +2339,7 @@ void ServerGetFieldHandler::handleResponse(osiSockAddr* responseFrom, const pvAccessID ioid = payloadBuffer->getInt(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { getFieldFailureResponse(transport, ioid, BaseChannelRequester::badCIDStatus); return; @@ -2328,7 +2348,9 @@ void ServerGetFieldHandler::handleResponse(osiSockAddr* responseFrom, string subField = SerializeHelper::deserializeString(payloadBuffer, transport.get()); // issue request - GetFieldRequester::shared_pointer gfr(new ServerGetFieldRequesterImpl(_context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerGetFieldRequesterImpl(_context, channel, ioid, transport)); + GetFieldRequester::shared_pointer gfr = tp; // TODO exception check channel->getChannel()->getField(gfr, subField); } @@ -2401,7 +2423,7 @@ void ServerRPCHandler::handleResponse(osiSockAddr* responseFrom, const int8 qosCode = payloadBuffer->getByte(); ServerChannelImpl::shared_pointer channel = static_pointer_cast(casTransport->getChannel(sid)); - if (channel == NULL) + if (!channel.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_RPC, transport, ioid, qosCode, BaseChannelRequester::badCIDStatus); return; @@ -2421,7 +2443,7 @@ void ServerRPCHandler::handleResponse(osiSockAddr* responseFrom, const bool lastRequest = (QOS_DESTROY & qosCode) != 0; ServerChannelRPCRequesterImpl::shared_pointer request = static_pointer_cast(channel->getRequest(ioid)); - if (request == NULL) + if (!request.get()) { BaseChannelRequester::sendFailureMessage((int8)CMD_RPC, transport, ioid, qosCode, BaseChannelRequester::badIOIDStatus); return; @@ -2461,7 +2483,9 @@ ChannelRPCRequester::shared_pointer ServerChannelRPCRequesterImpl::create( ServerContextImpl::shared_pointer const & context, ServerChannelImpl::shared_pointer const & channel, const pvAccessID ioid, Transport::shared_pointer const & transport, PVStructure::shared_pointer const & pvRequest) { - ChannelRPCRequester::shared_pointer thisPointer(new ServerChannelRPCRequesterImpl(context, channel, ioid, transport)); + // TODO use std::make_shared + std::tr1::shared_ptr tp(new ServerChannelRPCRequesterImpl(context, channel, ioid, transport)); + ChannelRPCRequester::shared_pointer thisPointer = tp; static_cast(thisPointer.get())->activate(pvRequest); return thisPointer; } @@ -2523,7 +2547,7 @@ void ServerChannelRPCRequesterImpl::destroy() { Lock guard(_mutex); _channel->unregisterRequest(_ioid); - if (_channelRPC != NULL) + if (_channelRPC.get()) { _channelRPC->destroy(); } diff --git a/src/server/responseHandlers.h b/src/server/responseHandlers.h index 94ee96f..41f0deb 100644 --- a/src/server/responseHandlers.h +++ b/src/server/responseHandlers.h @@ -748,8 +748,8 @@ namespace pvAccess { class ServerGetFieldHandlerTransportSender : public TransportSender { public: - ServerGetFieldHandlerTransportSender(const pvAccessID ioid,const epics::pvData::Status& status, Transport::shared_pointer const & transport): - _ioid(ioid), _status(status), _transport(transport) { + ServerGetFieldHandlerTransportSender(const pvAccessID ioid,const epics::pvData::Status& status, Transport::shared_pointer const & /*transport*/): + _ioid(ioid), _status(status) { } virtual ~ServerGetFieldHandlerTransportSender() {} @@ -771,7 +771,6 @@ namespace pvAccess { private: const pvAccessID _ioid; const epics::pvData::Status _status; - Transport::shared_pointer const & _transport; }; diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp index 48912cf..68eb734 100644 --- a/src/server/serverContext.cpp +++ b/src/server/serverContext.cpp @@ -151,7 +151,7 @@ bool ServerContextImpl::isChannelProviderNamePreconfigured() void ServerContextImpl::initialize(ChannelProviderRegistry::shared_pointer const & channelProviderRegistry) { Lock guard(_mutex); - if (channelProviderRegistry == NULL) + if (!channelProviderRegistry.get()) { THROW_BASE_EXCEPTION("non null channelProviderRegistry expected"); } @@ -393,21 +393,21 @@ void ServerContextImpl::destroy() void ServerContextImpl::internalDestroy() { // stop responding to search requests - if (_broadcastTransport != NULL) + if (_broadcastTransport.get()) { _broadcastTransport->close(); _broadcastTransport.reset(); } // stop accepting connections - if (_acceptor != NULL) + if (_acceptor.get()) { _acceptor->destroy(); _acceptor.reset(); } // stop emitting beacons - if (_beaconEmitter != NULL) + if (_beaconEmitter.get()) { _beaconEmitter->destroy(); _beaconEmitter.reset(); @@ -421,7 +421,7 @@ void ServerContextImpl::destroyAllTransports() { // not initialized yet - if (_transportRegistry == NULL) + if (!_transportRegistry.get()) { return; } @@ -556,7 +556,7 @@ BeaconServerStatusProvider::shared_pointer ServerContextImpl::getBeaconServerSta osiSockAddr* ServerContextImpl::getServerInetAddress() { - if(_acceptor != NULL) + if(_acceptor.get()) { return const_cast(_acceptor->getBindAddress()); } diff --git a/src/v3ioc/PVAServerRegister.cpp b/src/v3ioc/PVAServerRegister.cpp index 620af8a..c2acc29 100644 --- a/src/v3ioc/PVAServerRegister.cpp +++ b/src/v3ioc/PVAServerRegister.cpp @@ -59,7 +59,7 @@ private: void PVAServerCTX::start() { - if(ctx!=NULL) { + if(ctx.get()) { cout<< "PVAServer already started" << endl; return; } @@ -68,7 +68,7 @@ void PVAServerCTX::start() void PVAServerCTX::stop() { - if(ctx==NULL) { + if(!ctx.get()) { cout<< "PVAServer already stopped" << endl; return; } @@ -83,7 +83,7 @@ PVAServerCTXPtr PVAServerCTX::getPVAServerCTX() static Mutex mutex; Lock xx(mutex); - if(pvPVAServerCTX==NULL) { + if(!pvPVAServerCTX.get()) { pvPVAServerCTX = PVAServerCTXPtr(new PVAServerCTX()); } return pvPVAServerCTX; diff --git a/testApp/remote/testCodec.cpp b/testApp/remote/testCodec.cpp index 1a0d4b5..6bae4ec 100644 --- a/testApp/remote/testCodec.cpp +++ b/testApp/remote/testCodec.cpp @@ -2998,7 +2998,7 @@ namespace epics { public: TransportSenderForTestEnqueueSendRequestExceptionThrown( - TestCodec & codec): _codec(codec) {} + TestCodec & /*codec*/)/*: _codec(codec)*/ {} void unlock() { } @@ -3019,7 +3019,7 @@ namespace epics { } private: - TestCodec &_codec; + //TestCodec &_codec; }; diff --git a/testApp/remote/testGetPerformance.cpp b/testApp/remote/testGetPerformance.cpp index 183e259..cae125b 100644 --- a/testApp/remote/testGetPerformance.cpp +++ b/testApp/remote/testGetPerformance.cpp @@ -125,9 +125,6 @@ private: Event m_event; Event m_connectionEvent; string m_channelName; - int m_count; - - timeval m_startTime; public: @@ -395,8 +392,6 @@ int main (int argc, char *argv[]) int opt; // getopt() current option std::string testFile; - Requester::shared_pointer requester(new RequesterImpl()); - setvbuf(stdout,NULL,_IOLBF,BUFSIZ); // Set stdout to line buffering while ((opt = getopt(argc, argv, ":hr:w:i:c:s:l:bf:v")) != -1) { diff --git a/testApp/remote/testMonitorPerformance.cpp b/testApp/remote/testMonitorPerformance.cpp index e86f5f0..2b347b5 100644 --- a/testApp/remote/testMonitorPerformance.cpp +++ b/testApp/remote/testMonitorPerformance.cpp @@ -119,9 +119,6 @@ private: Event m_event; Event m_connectionEvent; string m_channelName; - int m_count; - - timeval m_startTime; public: @@ -164,7 +161,7 @@ public: { MonitorElement::shared_pointer element; - while (element = monitor->poll()) + while ((element = monitor->poll())) { channelCount++; if (channelCount == channels) @@ -375,8 +372,6 @@ int main (int argc, char *argv[]) int opt; // getopt() current option std::string testFile; - Requester::shared_pointer requester(new RequesterImpl()); - setvbuf(stdout,NULL,_IOLBF,BUFSIZ); // Set stdout to line buffering while ((opt = getopt(argc, argv, ":hr:w:i:c:s:l:f:v")) != -1) { diff --git a/testApp/remote/testNTImage.cpp b/testApp/remote/testNTImage.cpp index 9a247d6..c491012 100644 --- a/testApp/remote/testNTImage.cpp +++ b/testApp/remote/testNTImage.cpp @@ -20,7 +20,7 @@ epics::pvData::StructureConstPtr makeImageStruc() { static epics::pvData::StructureConstPtr imageStruc; - if (imageStruc == NULL) + if (!imageStruc.get()) { FieldConstPtrArray fields; StringArray names; diff --git a/testApp/remote/testServer.cpp b/testApp/remote/testServer.cpp index 0fe8834..6ec538c 100644 --- a/testApp/remote/testServer.cpp +++ b/testApp/remote/testServer.cpp @@ -518,153 +518,6 @@ class ChannelRequesterImpl : public ChannelRequester } }; -class GetFieldRequesterImpl : public GetFieldRequester -{ - virtual string getRequesterName() - { - return "GetFieldRequesterImpl"; - }; - - virtual void message(std::string const & message,MessageType messageType) - { - std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl; - } - - virtual void getDone(const epics::pvData::Status& status,epics::pvData::FieldConstPtr field) - { - std::cout << "getDone(" << status << ", "; - if (field) - { - std::cout << *field; - } - else - std::cout << "(null)"; - std::cout << ")" << std::endl; - } -}; - -class ChannelGetRequesterImpl : public ChannelGetRequester -{ - //TODO weak ChannelGet::shared_pointer m_channelGet; - epics::pvData::PVStructure::shared_pointer m_pvStructure; - epics::pvData::BitSet::shared_pointer m_bitSet; - - virtual string getRequesterName() - { - return "ChannelGetRequesterImpl"; - }; - - virtual void message(std::string const & message,MessageType messageType) - { - std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl; - } - - virtual void channelGetConnect(const epics::pvData::Status& status, - ChannelGet::shared_pointer const & /*channelGet*/, - epics::pvData::PVStructure::shared_pointer const & pvStructure, - epics::pvData::BitSet::shared_pointer const & bitSet) - { - std::cout << "channelGetConnect(" << status << ")" << std::endl; - - //m_channelGet = channelGet; - m_pvStructure = pvStructure; - m_bitSet = bitSet; - } - - virtual void getDone(const epics::pvData::Status& status) - { - std::cout << "getDone(" << status << ")" << std::endl; - std::cout << *m_pvStructure; - std::cout << std::endl; - } -}; - -class ChannelPutRequesterImpl : public ChannelPutRequester -{ - //TODO weak ChannelPut::shared_pointer m_channelPut; - epics::pvData::PVStructure::shared_pointer m_pvStructure; - epics::pvData::BitSet::shared_pointer m_bitSet; - - virtual string getRequesterName() - { - return "ChannelPutRequesterImpl"; - }; - - virtual void message(std::string const & message,MessageType messageType) - { - std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl; - } - - virtual void channelPutConnect(const epics::pvData::Status& status, - ChannelPut::shared_pointer const & /*channelPut*/, - epics::pvData::PVStructure::shared_pointer const & pvStructure, - epics::pvData::BitSet::shared_pointer const & bitSet) - { - std::cout << "channelPutConnect(" << status << ")" << std::endl; - - //m_channelPut = channelPut; - m_pvStructure = pvStructure; - m_bitSet = bitSet; - } - - virtual void getDone(const epics::pvData::Status& status) - { - std::cout << "getDone(" << status << ")" << std::endl; - std::cout << *m_pvStructure; - std::cout << std::endl; - } - - virtual void putDone(const epics::pvData::Status& status) - { - std::cout << "putDone(" << status << ")" << std::endl; - std::cout << *m_pvStructure; - std::cout << std::endl; - } - -}; - - -class MonitorRequesterImpl : public MonitorRequester -{ - virtual string getRequesterName() - { - return "MonitorRequesterImpl"; - }; - - virtual void message(std::string const & message,MessageType messageType) - { - std::cout << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")" << std::endl; - } - - virtual void monitorConnect(const Status& status, Monitor::shared_pointer const & /*monitor*/, - StructureConstPtr& structure) - { - std::cout << "monitorConnect(" << status << ")" << std::endl; - if (structure) - { - std::cout << *structure << std::endl; - } - } - - virtual void monitorEvent(Monitor::shared_pointer const & monitor) - { - std::cout << "monitorEvent" << std::endl; - - MonitorElement::shared_pointer element = monitor->poll(); - - std::cout << "changed/overrun " << *element->changedBitSet << '/' << - *element->overrunBitSet << std::endl << *element->pvStructurePtr << std::endl; - - monitor->release(element); - } - - virtual void unlisten(Monitor::shared_pointer const & /*monitor*/) - { - std::cout << "unlisten" << std::endl; - } -}; - - class ChannelProcessRequesterImpl : public ChannelProcessRequester { //TODO weak ChannelProcess::shared_pointer m_channelProcess; @@ -748,8 +601,11 @@ public: ChannelProcessRequester::shared_pointer const & channelProcessRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) { - ChannelProcess::shared_pointer thisPtr(new MockChannelProcess(channel, channelProcessRequester, pvStructure, pvRequest)); - + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new MockChannelProcess(channel, channelProcessRequester, pvStructure, pvRequest) + ); + ChannelProcess::shared_pointer thisPtr = tp; // TODO pvRequest channelProcessRequester->channelProcessConnect(Status::Ok, thisPtr); @@ -863,7 +719,7 @@ public: { char c = val[3]; c++; - pvString->put("gen" + c); + pvString->put("gen" + string(1, c)); } break; } @@ -983,7 +839,11 @@ public: PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) { - ChannelGet::shared_pointer thisPtr(new MockChannelGet(channel, channelGetRequester, pvStructure, pvRequest)); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new MockChannelGet(channel, channelGetRequester, pvStructure, pvRequest) + ); + ChannelGet::shared_pointer thisPtr = tp; // register structureChangedListeners[channel->getChannelName()].push_back(std::tr1::dynamic_pointer_cast(thisPtr)); @@ -1108,7 +968,11 @@ public: PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) { - ChannelPut::shared_pointer thisPtr(new MockChannelPut(channel, channelPutRequester, pvStructure, pvRequest)); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new MockChannelPut(channel, channelPutRequester, pvStructure, pvRequest) + ); + ChannelPut::shared_pointer thisPtr = tp; channelPutRequester->channelPutConnect(Status::Ok, thisPtr, static_cast(thisPtr.get())->m_pvStructure->getStructure()); return thisPtr; @@ -1777,7 +1641,7 @@ protected: PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelArray); m_pvStructureArray = pvStructure->getSubField("value"); - if (m_pvStructureArray != 0) + if (m_pvStructureArray.get()) m_pvArray = std::tr1::dynamic_pointer_cast( getPVDataCreate()->createPVField(m_pvStructureArray->getField())); } @@ -2025,7 +1889,6 @@ private: PVStructure::shared_pointer m_copy; BitSet::shared_pointer m_changedBitSet; BitSet::shared_pointer m_overrunBitSet; - bool m_first; Mutex m_lock; enum QueueState { MM_STATE_FULL, MM_STATE_TAKEN, MM_STATE_FREE }; QueueState m_state ; @@ -2045,7 +1908,6 @@ protected: m_copy(getPVDataCreate()->createPVStructure(m_pvStructure->getStructure())), m_changedBitSet(new BitSet(m_pvStructure->getNumberFields())), m_overrunBitSet(new BitSet(m_pvStructure->getNumberFields())), - m_first(true), m_lock(), m_state(MM_STATE_FREE), m_thisPtr(new MonitorElement()) @@ -2069,7 +1931,11 @@ public: MonitorRequester::shared_pointer const & monitorRequester, PVStructure::shared_pointer const & pvStructure, PVStructure::shared_pointer const & pvRequest) { - Monitor::shared_pointer thisPtr(new MockMonitor(channelName, monitorRequester, pvStructure, pvRequest)); + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new MockMonitor(channelName, monitorRequester, pvStructure, pvRequest) + ); + Monitor::shared_pointer thisPtr = tp; // register structureChangedListeners[channelName].push_back(std::tr1::dynamic_pointer_cast(thisPtr)); @@ -2423,8 +2289,11 @@ public: string name, string remoteAddress) { - Channel::shared_pointer channelPtr(new MockChannel(provider, requester, name, remoteAddress)); - + // TODO use std::make_shared + std::tr1::shared_ptr tp( + new MockChannel(provider, requester, name, remoteAddress) + ); + Channel::shared_pointer channelPtr = tp; // already connected, report state requester->channelStateChange(channelPtr, CONNECTED); @@ -2497,7 +2366,7 @@ public: pvField = m_pvStructure->getSubField(subField); } - if(pvField == NULL) + if(!pvField.get()) { string errMsg = "field '" + subField + "' not found"; FieldConstPtr nullPtr;