prepare for moving everything in src/V3IOC to pvAccessCPP

src/pvAccess/channelLocal.cpp

@@ -104,7 +104,7 @@ private:
     bool isDestroyed;
     bool callProcess;
     ChannelLocalPtr channelLocal;
-    ChannelProcessRequester::shared_pointer channelProcessRequester,;
+    ChannelProcessRequester::shared_pointer channelProcessRequester;
     PVRecordPtr pvRecord;
     Mutex mutex;
     int nProcess;
@@ -245,7 +245,7 @@ private:
     bool isDestroyed;
     bool callProcess;
     ChannelLocalPtr channelLocal;
-    ChannelGetRequester::shared_pointer channelGetRequester,;
+    ChannelGetRequester::shared_pointer channelGetRequester;
     PVCopyPtr pvCopy;
     PVStructurePtr pvStructure;
     BitSetPtr bitSet;
@@ -399,7 +399,7 @@ private:
     bool isDestroyed;
     bool callProcess;
     ChannelLocalPtr channelLocal;
-    ChannelPutRequester::shared_pointer channelPutRequester,;
+    ChannelPutRequester::shared_pointer channelPutRequester;
     PVCopyPtr pvCopy;
     PVStructurePtr pvStructure;
     BitSetPtr bitSet;
@@ -580,7 +580,7 @@ private:
     bool isDestroyed;
     bool callProcess;
     ChannelLocalPtr channelLocal;
-    ChannelPutGetRequester::shared_pointer channelPutGetRequester,;
+    ChannelPutGetRequester::shared_pointer channelPutGetRequester;
     PVCopyPtr pvPutCopy;
     PVCopyPtr pvGetCopy;
     PVStructurePtr pvPutStructure;
@@ -805,7 +805,7 @@ private:
     bool isDestroyed;
     bool callProcess;
     ChannelLocalPtr channelLocal;
-    ChannelArrayRequester::shared_pointer channelArrayRequester,;
+    ChannelArrayRequester::shared_pointer channelArrayRequester;
     PVArrayPtr pvArray;
     PVArrayPtr pvCopy;
     PVRecordPtr pvRecord;

src/pvAccess/channelProviderLocal.cpp

@@ -12,6 +12,7 @@
 #include <pv/serverContext.h>
 #include <pv/channelProviderLocal.h>
 #include <pv/traceRecord.h>
+#include <pv/syncChannelFind.h>
 
 namespace epics { namespace pvDatabase { 
 
@@ -24,35 +25,6 @@ using std::endl;
 
 static String providerName("local");
 
-class MockChannelFind : public ChannelFind
-{
-public:
-    typedef std::tr1::shared_ptr<MockChannelFind> shared_pointer;
-
-    MockChannelFind(ChannelProvider::shared_pointer &provider) : m_provider(provider)
-    {
-    }
-
-    virtual ~MockChannelFind() {}
-
-    virtual void destroy()
-    {
-        // one instance for all, do not delete at all
-    }
-    virtual ChannelProvider::shared_pointer getChannelProvider()
-    {
-        return m_provider.lock();
-    };
-
-    virtual void cancelChannelFind()
-    {
-        throw std::runtime_error("not supported");
-    }
-
-private:
-    ChannelProvider::weak_pointer m_provider;
-};
-
 
 class LocalChannelProviderFactory;
 typedef std::tr1::shared_ptr<LocalChannelProviderFactory> LocalChannelProviderFactoryPtr;
@@ -96,7 +68,7 @@ ChannelProviderLocalPtr getChannelProviderLocal()
         channelProviderLocal = ChannelProviderLocalPtr(
             new ChannelProviderLocal());
         ChannelProvider::shared_pointer xxx = dynamic_pointer_cast<ChannelProvider>(channelProviderLocal);
-        channelProviderLocal->channelFinder = MockChannelFind::shared_pointer(new MockChannelFind(xxx));
+        channelProviderLocal->channelFinder = SyncChannelFind::shared_pointer(new SyncChannelFind(xxx));
         LocalChannelProviderFactory::create(channelProviderLocal);
     }
     return channelProviderLocal;
@@ -146,7 +118,7 @@ ChannelFind::shared_pointer ChannelProviderLocal::channelFind(
             channelFinder,
             false);
     }
-    return ChannelFind::shared_pointer();
+    return channelFinder;
 }
 
 Channel::shared_pointer ChannelProviderLocal::createChannel(

src/pvAccess/registerChannelProviderLocal.cpp

@@ -0,0 +1,63 @@
+/*registerChannelProviderLocal.cpp*/
+/**
+ * Copyright - See the COPYRIGHT that is included with this distribution.
+ * EPICS pvData is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution.
+ */
+/**
+ * @author mrk
+ * @date 2014.07.03
+ */
+
+/* Author: Marty Kraimer */
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstddef>
+#include <string>
+#include <cstdio>
+#include <memory>
+#include <iostream>
+
+#include <cantProceed.h>
+#include <epicsStdio.h>
+#include <epicsMutex.h>
+#include <epicsEvent.h>
+#include <epicsThread.h>
+#include <iocsh.h>
+
+#include <epicsExport.h>
+
+#include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+#include <pv/channelProviderLocal.h>
+
+using std::cout;
+using std::endl;
+using namespace epics::pvData;
+using namespace epics::pvAccess;
+using namespace epics::pvDatabase;
+
+static const iocshFuncDef pvdblFuncDef = {
+    "pvdbl", 0, 0
+};
+extern "C" void pvdbl(const iocshArgBuf *args)
+{
+    PVDatabasePtr master = PVDatabase::getMaster();
+    PVStringArrayPtr pvNames = master->getRecordNames();
+    PVStringArray::const_svector xxx = pvNames->view();
+    for(size_t i=0; i<xxx.size(); ++i) cout<< xxx[i] << endl;
+}
+
+
+static void registerChannelProviderLocal(void)
+{
+    static int firstTime = 1;
+    if (firstTime) {
+        firstTime = 0;
+        iocshRegister(&pvdblFuncDef, pvdbl);
+        getChannelProviderLocal();
+    }
+}
+
+epicsExportRegistrar(registerChannelProviderLocal);

src/pvAccess/registerChannelProviderLocal.dbd

@@ -0,0 +1 @@
+registrar("registerChannelProviderLocal")