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

CSM initialization reordered

Browse Source
This commit is contained in:
Matej Sekoranja
2011-09-28 09:59:40 +02:00
parent ba61be3c1c
commit d372760096
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pvAccessApp/remoteClient/clientContextImpl.cpp
View File

@@ -3616,25 +3616,21 @@ TODO
}
virtual ChannelProvider::shared_pointer const & getProvider() {
//Lock lock(m_contextMutex);
return m_provider;
}
virtual Timer::shared_pointer getTimer()
{
//Lock lock(m_contextMutex);
return m_timer;
}
virtual TransportRegistry::shared_pointer getTransportRegistry()
{
//Lock lock(m_contextMutex);
return m_transportRegistry;
}
virtual Transport::shared_pointer getSearchTransport()
{
//Lock lock(m_contextMutex);
return m_searchTransport;
}
@@ -3735,12 +3731,15 @@ TODO
m_connector.reset(new BlockingTCPConnector(thisPointer, m_receiveBufferSize, m_beaconPeriod));
m_transportRegistry.reset(new TransportRegistry());
// setup UDP transport
initializeUDPTransport();
// TODO what if initialization failed!!!
// setup search manager
m_channelSearchManager.reset(new ChannelSearchManager(thisPointer.get()));
// TODO put memory barrier here...
// setup UDP transport
initializeUDPTransport();
// TODO what if initialization failed!!!
}
/**