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

Merge pull request #12 from mrkraimer/master

Browse Source 
register LocalChannelProvider; traceRecord consistant with pvDatabase…
This commit is contained in:
Marty Kraimer
2016-04-20 11:13:18 -04:00
parent 15c6d32b61 1eea87efc7
commit f7a3ca2c3c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pvAccess/channelProviderLocal.cpp
View File

@ -75,7 +75,8 @@ ChannelProviderLocalPtr getChannelProviderLocal()
dynamic_pointer_cast<ChannelProvider>(channelProviderLocal);
channelProviderLocal->channelFinder =
SyncChannelFind::shared_pointer(new SyncChannelFind(xxx));
LocalChannelProviderFactory::create(channelProviderLocal);
LocalChannelProviderFactoryPtr factory(LocalChannelProviderFactory::create(channelProviderLocal));
registerChannelProviderFactory(factory);
}
return channelProviderLocal;
}

12
src/pvAccess/monitorFactory.cpp
View File

@ -137,7 +137,7 @@ Status MonitorLocal::start()
{
if(pvRecord->getTraceLevel()>0)
{
cout << "MonitorLocal::start() " << endl;
cout << "MonitorLocal::start state " << state << endl;
}
{
Lock xx(mutex);
@ -161,7 +161,7 @@ Status MonitorLocal::start()
Status MonitorLocal::stop()
{
if(pvRecord->getTraceLevel()>0){
cout << "MonitorLocal::stop() " << endl;
cout << "MonitorLocal::stop state " << state << endl;
}
{
Lock xx(mutex);
@ -177,7 +177,7 @@ MonitorElementPtr MonitorLocal::poll()
{
if(pvRecord->getTraceLevel()>1)
{
cout << "MonitorLocal::poll() " << endl;
cout << "MonitorLocal::poll state " << state << endl;
}
{
Lock xx(queueMutex);
@ -190,7 +190,7 @@ void MonitorLocal::release(MonitorElementPtr const & monitorElement)
{
if(pvRecord->getTraceLevel()>1)
{
cout << "MonitorLocal::release() " << endl;
cout << "MonitorLocal::release state " << state << endl;
}
{
Lock xx(queueMutex);
@ -203,7 +203,7 @@ void MonitorLocal::releaseActiveElement()
{
if(pvRecord->getTraceLevel()>1)
{
cout << "MonitorLocal::releaseActiveElement() " << endl;
cout << "MonitorLocal::releaseActiveElement state " << state << endl;
}
{
Lock xx(queueMutex);
@ -294,7 +294,7 @@ void MonitorLocal::endGroupPut(PVRecordPtr const & pvRecord)
{
if(pvRecord->getTraceLevel()>1)
{
cout << "PVCopyMonitor::endGroupPut() dataChanged " << dataChanged << endl;
cout << "PVCopyMonitor::endGroupPut dataChanged " << dataChanged << endl;
}
if(state!=active) return;
{