Merge pull request #63 from epics-base/accesss-security

Accesss security

src/Makefile

@@ -23,11 +23,6 @@ INC += pv/pvDatabase.h
 
 INC += pv/channelProviderLocal.h
 
-INC += pv/traceRecord.h
-INC += pv/removeRecord.h
-INC += pv/addRecord.h
-INC += pv/processRecord.h
-
 INC += pv/pvSupport.h
 INC += pv/controlSupport.h
 INC += pv/scalarAlarmSupport.h

src/pv/addRecord.h

@@ -1,63 +0,0 @@
-/* addRecord.h */
-/**
- * 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 2013.04.18
- */
-#ifndef ADDRECORD_H
-#define ADDRECORD_H
-
-#include <pv/channelProviderLocal.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvDatabase {
-
-
-class AddRecord;
-typedef std::tr1::shared_ptr<AddRecord> AddRecordPtr;
-
-/**
- * @brief Add another record in the same database.
- *
- * A record to add another record
- * It is meant to be used via a channelPutGet request.
- * The argument has one field: recordName.
- * The result has a field named status.
- */
-class epicsShareClass AddRecord :
-    public PVRecord
-{
-public:
-    POINTER_DEFINITIONS(AddRecord);
-    /**
-     * Factory methods to create AddRecord.
-     * @param recordName The name for the AddRecord.
-     * @return A shared pointer to AddRecord..
-     */
-    static AddRecordPtr create(
-        std::string const & recordName);
-    /**
-     * standard init method required by PVRecord
-     * @return true unless record name already exists.
-     */
-    virtual bool init();
-    /**
-     * @brief Add the record specified by  recordName.
-     */
-    virtual void process();
-private:
-    AddRecord(
-        std::string const & recordName,
-        epics::pvData::PVStructurePtr const & pvStructure);
-    epics::pvData::PVStringPtr pvRecordName;
-    epics::pvData::PVStringPtr pvResult;
-};
-
-}}
-
-#endif  /* ADDRECORD_H */

src/pv/channelProviderLocal.h

@@ -362,6 +362,12 @@ public:
      * @return true if client can write
      */
     virtual bool canWrite();
+    /**
+     * @brief determines if client can read
+     *
+     * @return true if client can read
+     */
+    virtual bool canRead();
 protected:
     shared_pointer getPtrSelf()
     {

src/pv/processRecord.h

@@ -1,89 +0,0 @@
-/* processRecord.h */
-/**
- * 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 2019.06.07
- */
-#ifndef PROCESSRECORD_H
-#define PROCESSRECORD_H
-
-#include <map>
-#include <epicsThread.h>
-#include <pv/event.h>
-#include <pv/channelProviderLocal.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvDatabase {
-
-typedef std::tr1::shared_ptr<epicsThread> EpicsThreadPtr;
-
-class ProcessRecord;
-typedef std::tr1::shared_ptr<ProcessRecord> ProcessRecordPtr;
-
-/**
- * @brief Process another record in the same database.
- *
- * A record to process another record
- * It is meant to be used via a channelPutGet request.
- * The argument has one field: recordName.
- * The result has a field named status.
- */
-class epicsShareClass ProcessRecord :
-    public PVRecord,
-    public epicsThreadRunable
-{
-public:
-    POINTER_DEFINITIONS(ProcessRecord);
-    /**
-     * Factory methods to create ProcessRecord.
-     * @param recordName The name for the ProcessRecord.
-     * @param delay Delay time to wait between process requests.
-     * @return A shared pointer to ProcessRecord.
-     */
-    static ProcessRecordPtr create(
-        std::string const & recordName,double delay);
-    /**
-     * standard init method required by PVRecord
-     * @return true unless record name already exists.
-     */
-    virtual bool init();
-    /**
-     * @brief Process the record specified by  recordName.
-     */
-    virtual void process();
-    /**
-     * @brief The run method for the thread.
-     */
-    virtual void run();
-    /**
-     * @brief Start the thread
-     */
-    void startThread();
-    /**
-     * @brief Stop the thread
-     */
-    void stop();
-private:
-    ProcessRecord(
-        std::string const & recordName,
-        epics::pvData::PVStructurePtr const & pvStructure,double delay);
-    double delay;
-    EpicsThreadPtr thread;
-    epics::pvData::Event runStop;
-    epics::pvData::Event runReturn;
-    PVDatabasePtr pvDatabase;
-    PVRecordMap pvRecordMap;
-    epics::pvData::PVStringPtr pvCommand;
-    epics::pvData::PVStringPtr pvRecordName;
-    epics::pvData::PVStringPtr pvResult;
-    epics::pvData::Mutex mutex;
-};
-
-}}
-
-#endif  /* PROCESSRECORD_H */

src/pv/pvDatabase.h

@@ -248,6 +248,16 @@ public:
      * @return The name.
      */
     std::string getAsGroup() const {return asGroup;}
+    /**
+     * @brief set access security level.
+     * @param level The level
+     */
+    void setAsLevel(int level) {asLevel=level;}
+    /**
+     * @brief set access security group
+     * @param group The group name
+     */
+    void setAsGroup(const std::string& group) {asGroup = group;}
 protected:
     /**
      * @brief Constructor

src/pv/removeRecord.h

@@ -1,63 +0,0 @@
-/* removeRecord.h */
-/**
- * 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 2013.04.18
- */
-#ifndef REMOVERECORD_H
-#define REMOVERECORD_H
-
-#include <pv/channelProviderLocal.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvDatabase {
-
-
-class RemoveRecord;
-typedef std::tr1::shared_ptr<RemoveRecord> RemoveRecordPtr;
-
-/**
- * @brief Remove another record in the same database.
- *
- * A record to remove another record
- * It is meant to be used via a channelPutGet request.
- * The argument has one field: recordName.
- * The result has a field named status.
- */
-class epicsShareClass RemoveRecord :
-    public PVRecord
-{
-public:
-    POINTER_DEFINITIONS(RemoveRecord);
-    /**
-     * Factory methods to create RemoveRecord.
-     * @param recordName The name for the RemoveRecord.
-     * @return A shared pointer to RemoveRecord..
-     */
-    static RemoveRecordPtr create(
-        std::string const & recordName);
-    /**
-     * standard init method required by PVRecord
-     * @return true unless record name already exists.
-     */
-    virtual bool init();
-    /**
-     * @brief Remove the record specified by  recordName.
-     */
-    virtual void process();
-private:
-    RemoveRecord(
-        std::string const & recordName,
-        epics::pvData::PVStructurePtr const & pvStructure);
-    epics::pvData::PVStringPtr pvRecordName;
-    epics::pvData::PVStringPtr pvResult;
-};
-
-}}
-
-#endif  /* REMOVERECORD_H */

src/pv/traceRecord.h

@@ -1,66 +0,0 @@
-/* traceRecord.h */
-/**
- * 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 2013.04.18
- */
-#ifndef TRACERECORD_H
-#define TRACERECORD_H
-
-#include <pv/channelProviderLocal.h>
-
-#include <shareLib.h>
-
-
-namespace epics { namespace pvDatabase {
-
-
-class TraceRecord;
-typedef std::tr1::shared_ptr<TraceRecord> TraceRecordPtr;
-
-/**
- * @brief Trace activity of  PVRecord.
- *
- * A record to set the trace value for another record
- * It is meant to be used via a channelPutGet request.
- * The argument has two fields: recordName and  level.
- * The result has a field named status.
- */
-class epicsShareClass TraceRecord :
-    public PVRecord
-{
-public:
-    POINTER_DEFINITIONS(TraceRecord);
-    /**
-     * @brief Factory method to create TraceRecord.
-     *
-     * @param recordName The name for the TraceRecord.
-     * @return A shared pointer to TraceRecord..
-     */
-    static TraceRecordPtr create(
-        std::string const & recordName);
-    /**
-     * standard init method required by PVRecord
-     * @return true unless record name already exists.
-     */
-    virtual bool init();
-    /**
-     * @brief Set the trace level for record specified by  recordName.
-     */
-    virtual void process();
-private:
-    TraceRecord(
-        std::string const & recordName,
-        epics::pvData::PVStructurePtr const & pvStructure);
-    epics::pvData::PVStringPtr pvRecordName;
-    epics::pvData::PVIntPtr pvLevel;
-    epics::pvData::PVStringPtr pvResult;
-};
-
-}}
-
-#endif  /* TRACERECORD_H */

src/pvAccess/channelLocal.cpp

@@ -329,6 +329,13 @@ void ChannelGetLocal::get()
 {
     ChannelGetRequester::shared_pointer requester = channelGetRequester.lock();
     if(!requester) return;
+    ChannelLocalPtr channel(channelLocal.lock());
+    if(!channel) throw std::logic_error("channel is deleted");
+    if(!channel->canRead()) {
+        Status status = Status::error("ChannelGet::get is not allowed");
+        requester->getDone(status,getPtrSelf(),PVStructurePtr(),BitSetPtr());
+        return;
+    }
     PVRecordPtr pvr(pvRecord.lock());
     if(!pvr) throw std::logic_error("pvRecord is deleted");
     try {
@@ -490,6 +497,13 @@ void ChannelPutLocal::get()
 {
     ChannelPutRequester::shared_pointer requester = channelPutRequester.lock();
     if(!requester) return;
+    ChannelLocalPtr channel(channelLocal.lock());
+    if(!channel) throw std::logic_error("channel is deleted");
+    if(!channel->canRead()) {
+        Status status = Status::error("ChannelPut::get is not allowed");
+        requester->getDone(status,getPtrSelf(),PVStructurePtr(),BitSetPtr());
+        return;
+    }
     PVRecordPtr pvr(pvRecord.lock());
     if(!pvr) throw std::logic_error("pvRecord is deleted");
     try {
@@ -521,8 +535,9 @@ void ChannelPutLocal::put(
     ChannelPutRequester::shared_pointer requester = channelPutRequester.lock();
     if(!requester) return;
     ChannelLocalPtr channel(channelLocal.lock());
+    if(!channel) throw std::logic_error("channel is deleted");
     if(!channel->canWrite()) {
-        Status status = Status::error("Channel put is not allowed");
+        Status status = Status::error("ChannelPut::put is not allowed");
         requester->putDone(status,getPtrSelf());
         return;
     }
@@ -688,9 +703,10 @@ void ChannelPutGetLocal::putGet(
     ChannelPutGetRequester::shared_pointer requester = channelPutGetRequester.lock();
     if(!requester) return;
     ChannelLocalPtr channel(channelLocal.lock());
-    if(!channel->canWrite()) {
-        Status status = Status::error("Channel putGet is not allowed");
-        requester->putGetDone(status,getPtrSelf(),pvGetStructure,getBitSet);
+    if(!channel) throw std::logic_error("channel is deleted");
+    if(!channel->canWrite()||!channel->canRead() ) {
+        Status status = Status::error("ChannelPutGet::putGet is not allowed");
+        requester->putGetDone(status,getPtrSelf(),PVStructurePtr(),BitSetPtr());
         return;
     }
     PVRecordPtr pvr(pvRecord.lock());
@@ -721,6 +737,13 @@ void ChannelPutGetLocal::getPut()
 {
     ChannelPutGetRequester::shared_pointer requester = channelPutGetRequester.lock();
     if(!requester) return;
+    ChannelLocalPtr channel(channelLocal.lock());
+    if(!channel) throw std::logic_error("channel is deleted");
+    if(!channel->canRead()) {
+        Status status = Status::error("ChannelPutGet::getPut is not allowed");
+        requester->getPutDone(status,getPtrSelf(),PVStructurePtr(),BitSetPtr());
+        return;
+    }
     PVRecordPtr pvr(pvRecord.lock());
     if(!pvr) throw std::logic_error("pvRecord is deleted");
     try {
@@ -748,6 +771,13 @@ void ChannelPutGetLocal::getGet()
 {
     ChannelPutGetRequester::shared_pointer requester = channelPutGetRequester.lock();
     if(!requester) return;
+    ChannelLocalPtr channel(channelLocal.lock());
+    if(!channel) throw std::logic_error("channel is deleted");
+    if(!channel->canRead()) {
+        Status status = Status::error("ChannelPutGet::getGet is not allowed");
+        requester->getPutDone(status,getPtrSelf(),PVStructurePtr(),BitSetPtr());
+        return;
+    }
     PVRecordPtr pvr(pvRecord.lock());
     if(!pvr) throw std::logic_error("pvRecord is deleted");
     try {
@@ -1324,9 +1354,15 @@ bool ChannelLocal::canWrite()
     return false;
 }
 
+bool ChannelLocal::canRead()
+{
+    if(!asActive || (asClientPvt && asCheckGet(asClientPvt))) {
+        return true;
+    }
+    return false;
+}
 ChannelLocal::~ChannelLocal()
 {
-// cout << "~ChannelLocal()" << endl;
     if(asMemberPvt) {
         asRemoveMember(&asMemberPvt);
         asMemberPvt = 0;

src/special/Makefile

@@ -2,17 +2,18 @@
 
 SRC_DIRS += $(PVDATABASE_SRC)/special
 
-LIBSRCS += traceRecord.cpp
-LIBSRCS += removeRecord.cpp
-LIBSRCS += addRecord.cpp
-LIBSRCS += processRecord.cpp
+DBD += pvdbcrTraceRecordRegister.dbd
+DBD += pvdbcrRemoveRecordRegister.dbd
+DBD += pvdbcrAddRecordRegister.dbd
+DBD += pvdbcrProcessRecordRegister.dbd
+DBD += pvdbcrScalarRegister.dbd
+DBD += pvdbcrScalarArrayRegister.dbd
+DBD += pvdbSpecialRegister.dbd
 
-DBD += traceRecordRegister.dbd
-DBD += removeRecordRegister.dbd
-DBD += addRecordRegister.dbd
-DBD += processRecordRegister.dbd
+LIBSRCS += pvdbcrTraceRecordRegister.cpp
+LIBSRCS += pvdbcrRemoveRecordRegister.cpp
+LIBSRCS += pvdbcrAddRecordRegister.cpp
+LIBSRCS += pvdbcrProcessRecordRegister.cpp
+LIBSRCS += pvdbcrScalarRegister.cpp
+LIBSRCS += pvdbcrScalarArrayRegister.cpp
 
-LIBSRCS += traceRecordRegister.cpp
-LIBSRCS += removeRecordRegister.cpp
-LIBSRCS += addRecordRegister.cpp
-LIBSRCS += processRecordRegister.cpp

src/special/addRecordRegister.cpp

@@ -1,62 +0,0 @@
-/*
- * Copyright information and license terms for this software can be
- * found in the file LICENSE that is included with the distribution
- */
-
-/**
- * @author mrk
- * @date 2013.07.24
- */
-
-
-/* Author: Marty Kraimer */
-#include <epicsThread.h>
-#include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
-#include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-
-// The following must be the last include for code pvDatabase uses
-#include <epicsExport.h>
-#define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
-#include "pv/addRecord.h"
-
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-using namespace std;
-
-static const iocshArg testArg0 = { "recordName", iocshArgString };
-static const iocshArg *testArgs[] = {
-    &testArg0};
-
-static const iocshFuncDef addRecordFuncDef = {"addRecordCreate", 1,testArgs};
-
-static void addRecordCallFunc(const iocshArgBuf *args)
-{
-    char *recordName = args[0].sval;
-    if(!recordName) {
-        throw std::runtime_error("addRecordCreate invalid number of arguments");
-    }
-    AddRecordPtr record = AddRecord::create(recordName);
-    bool result = PVDatabase::getMaster()->addRecord(record);
-    if(!result) cout << "recordname" << " not added" << endl;
-}
-
-static void addRecordRegister(void)
-{
-    static int firstTime = 1;
-    if (firstTime) {
-        firstTime = 0;
-        iocshRegister(&addRecordFuncDef, addRecordCallFunc);
-    }
-}
-
-extern "C" {
-    epicsExportRegistrar(addRecordRegister);
-}

src/special/addRecordRegister.dbd

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

src/special/processRecordRegister.cpp

@@ -1,67 +0,0 @@
-/*
- * Copyright information and license terms for this software can be
- * found in the file LICENSE that is included with the distribution
- */
-
-/**
- * @author mrk
- * @date 2013.07.24
- */
-
-
-/* Author: Marty Kraimer */
-
-#include <epicsThread.h>
-#include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
-#include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-
-// The following must be the last include for code pvDatabase uses
-#include <epicsExport.h>
-#define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
-#include "pv/processRecord.h"
-
-
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-using namespace std;
-
-static const iocshArg testArg0 = { "recordName", iocshArgString };
-static const iocshArg testArg1 = { "delay", iocshArgDouble };
-static const iocshArg *testArgs[] = {
-    &testArg0,&testArg1};
-
-static const iocshFuncDef processRecordFuncDef = {"processRecordCreate", 2,testArgs};
-
-static void processRecordCallFunc(const iocshArgBuf *args)
-{
-    char *recordName = args[0].sval;
-    if(!recordName) {
-        throw std::runtime_error("processRecordCreate invalid number of arguments");
-    }
-    double delay = args[1].dval;
-    if(delay<0.0) delay = 1.0;
-    ProcessRecordPtr record = ProcessRecord::create(recordName,delay);
-    bool result = PVDatabase::getMaster()->addRecord(record);
-    if(!result) cout << "recordname" << " not added" << endl;
-}
-
-static void processRecordRegister(void)
-{
-    static int firstTime = 1;
-    if (firstTime) {
-        firstTime = 0;
-        iocshRegister(&processRecordFuncDef, processRecordCallFunc);
-    }
-}
-
-extern "C" {
-    epicsExportRegistrar(processRecordRegister);
-}

src/special/processRecordRegister.dbd

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

src/special/pvdbSpecialRegister.dbd

@@ -0,0 +1,6 @@
+include "pvdbcrAddRecordRegister.dbd"
+include "pvdbcrRemoveRecordRegister.dbd"
+include "pvdbcrProcessRecordRegister.dbd"
+include "pvdbcrTraceRecordRegister.dbd"
+include "pvdbcrScalarRegister.dbd"
+include "pvdbcrScalarArrayRegister.dbd"

src/special/pvdbcrAddRecordRegister.cpp

@@ -1,45 +1,57 @@
-/* addRecord.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
+
 /**
  * @author mrk
- * @date 2013.04.18
+ * @date 2021.03.12
  */
-
-#include <string>
-#include <cstring>
-#include <stdexcept>
-#include <memory>
-#include <set>
-
-#include <pv/lock.h>
-#include <pv/pvType.h>
-#include <pv/pvData.h>
+#include <iocsh.h>
 #include <pv/standardField.h>
-#include <pv/pvTimeStamp.h>
+#include <pv/standardPVField.h>
 #include <pv/timeStamp.h>
-#include <pv/rpcService.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
 #include <pv/pvAccess.h>
-#include <pv/status.h>
 #include <pv/serverContext.h>
 
-
+// The following must be the last include for code exampleLink uses
+#include <epicsExport.h>
 #define epicsExportSharedSymbols
 #include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
 #include "pv/pvDatabase.h"
-#include "pv/addRecord.h"
-
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;
+using namespace epics::pvDatabase;
 using namespace std;
 
-namespace epics { namespace pvDatabase {
+class PvdbcrAddRecord;
+typedef std::tr1::shared_ptr<PvdbcrAddRecord> PvdbcrAddRecordPtr;
 
-AddRecordPtr AddRecord::create(
+
+class epicsShareClass PvdbcrAddRecord :
+    public PVRecord
+{
+private:
+    PvdbcrAddRecord(
+        std::string const & recordName,
+        epics::pvData::PVStructurePtr const & pvStructure);
+    PVStringPtr pvRecordName;
+    epics::pvData::PVStringPtr pvResult;
+public:
+    POINTER_DEFINITIONS(PvdbcrAddRecord);
+
+    static PvdbcrAddRecordPtr create(
+        std::string const & recordName);
+    virtual bool init();
+    virtual void process();
+};
+
+PvdbcrAddRecordPtr PvdbcrAddRecord::create(
     std::string const & recordName)
 {
     FieldCreatePtr fieldCreate = getFieldCreate();
@@ -55,20 +67,20 @@ AddRecordPtr AddRecord::create(
             endNested()->
         createStructure();
     PVStructurePtr pvStructure = pvDataCreate->createPVStructure(topStructure);
-    AddRecordPtr pvRecord(
-        new AddRecord(recordName,pvStructure));
+    PvdbcrAddRecordPtr pvRecord(
+        new PvdbcrAddRecord(recordName,pvStructure));
     if(!pvRecord->init()) pvRecord.reset();
     return pvRecord;
 }
 
-AddRecord::AddRecord(
+PvdbcrAddRecord::PvdbcrAddRecord(
     std::string const & recordName,
-    epics::pvData::PVStructurePtr const & pvStructure)
+    PVStructurePtr const & pvStructure)
 : PVRecord(recordName,pvStructure)
 {
 }
 
-bool AddRecord::init()
+bool PvdbcrAddRecord::init()
 {
     initPVRecord();
     PVStructurePtr pvStructure = getPVStructure();
@@ -79,7 +91,7 @@ bool AddRecord::init()
     return true;
 }
 
-void AddRecord::process()
+void PvdbcrAddRecord::process()
 {
     PVDataCreatePtr pvDataCreate = getPVDataCreate();
     string name = pvRecordName->get();
@@ -113,5 +125,43 @@ void AddRecord::process()
     }
 }
 
+static const iocshArg arg0 = { "recordName", iocshArgString };
+static const iocshArg arg1 = { "asLevel", iocshArgInt };
+static const iocshArg arg2 = { "asGroup", iocshArgString };
+static const iocshArg *args[] = {&arg0,&arg1,&arg2};
 
-}}
+static const iocshFuncDef pvdbcrAddRecordFuncDef = {"pvdbcrAddRecord", 3,args};
+
+static void pvdbcrAddRecordCallFunc(const iocshArgBuf *args)
+{
+    char *sval = args[0].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrAddRecord recordName not specified");
+    }
+    string recordName = string(sval);
+    int asLevel = args[1].ival;
+    string asGroup("DEFAULT");
+    sval = args[2].sval;
+    if(sval) {
+        asGroup = string(sval);
+    }
+    PvdbcrAddRecordPtr record = PvdbcrAddRecord::create(recordName);
+    record->setAsLevel(asLevel);
+    record->setAsGroup(asGroup);
+    PVDatabasePtr master = PVDatabase::getMaster();
+    bool result =  master->addRecord(record);
+    if(!result) cout << "recordname " << recordName << " not added" << endl;
+}
+
+static void pvdbcrAddRecordRegister(void)
+{
+    static int firstTime = 1;
+    if (firstTime) {
+        firstTime = 0;
+        iocshRegister(&pvdbcrAddRecordFuncDef, pvdbcrAddRecordCallFunc);
+    }
+}
+
+extern "C" {
+    epicsExportRegistrar(pvdbcrAddRecordRegister);
+}

src/special/pvdbcrAddRecordRegister.dbd

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

src/special/pvdbcrProcessRecordRegister.cpp

@@ -1,46 +1,70 @@
-/* processRecord.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
+
 /**
  * @author mrk
- * @date 2013.04.18
+ * @date 2021.03.12
  */
-#include <map>
 #include <epicsThread.h>
+#include <epicsGuard.h>
 #include <pv/event.h>
-#include <shareLib.h>
-#include <string>
-#include <cstring>
-#include <stdexcept>
-#include <memory>
-#include <set>
-
 #include <pv/lock.h>
-#include <pv/pvType.h>
-#include <pv/pvData.h>
-#include <pv/pvTimeStamp.h>
+#include <iocsh.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
 #include <pv/timeStamp.h>
-#include <pv/rpcService.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
 #include <pv/pvAccess.h>
-#include <pv/status.h>
 #include <pv/serverContext.h>
 
+#include <epicsExport.h>
 #define epicsExportSharedSymbols
 #include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
 #include "pv/pvDatabase.h"
-#include "pv/processRecord.h"
-
-using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;
+using namespace epics::pvDatabase;
 using namespace std;
 
-namespace epics { namespace pvDatabase {
+typedef std::tr1::shared_ptr<epicsThread> EpicsThreadPtr;
+class PvdbcrProcessRecord;
+typedef std::tr1::shared_ptr<PvdbcrProcessRecord> PvdbcrProcessRecordPtr;
 
-ProcessRecordPtr ProcessRecord::create(
+class epicsShareClass PvdbcrProcessRecord :
+    public PVRecord,
+    public epicsThreadRunable
+{
+public:
+    POINTER_DEFINITIONS(PvdbcrProcessRecord);
+    static PvdbcrProcessRecordPtr create(
+        std::string const & recordName,double delay);
+    virtual bool init();
+    virtual void process();
+    virtual void run();
+    void startThread();
+    void stop();
+private:
+    PvdbcrProcessRecord(
+        std::string const & recordName,
+        epics::pvData::PVStructurePtr const & pvStructure,double delay);
+    double delay;
+    EpicsThreadPtr thread;
+    epics::pvData::Event runStop;
+    epics::pvData::Event runReturn;
+    PVDatabasePtr pvDatabase;
+    PVRecordMap pvRecordMap;
+    epics::pvData::PVStringPtr pvCommand;
+    epics::pvData::PVStringPtr pvRecordName;
+    epics::pvData::PVStringPtr pvResult;
+    epics::pvData::Mutex mutex;
+};
+
+PvdbcrProcessRecordPtr PvdbcrProcessRecord::create(
     std::string const & recordName,double delay)
 {
     FieldCreatePtr fieldCreate = getFieldCreate();
@@ -55,13 +79,13 @@ ProcessRecordPtr ProcessRecord::create(
             endNested()->
         createStructure();
     PVStructurePtr pvStructure = pvDataCreate->createPVStructure(topStructure);
-    ProcessRecordPtr pvRecord(
-        new ProcessRecord(recordName,pvStructure,delay));
+    PvdbcrProcessRecordPtr pvRecord(
+        new PvdbcrProcessRecord(recordName,pvStructure,delay));
     if(!pvRecord->init()) pvRecord.reset();
     return pvRecord;
 }
 
-void ProcessRecord::startThread()
+void PvdbcrProcessRecord::startThread()
 {
     thread = EpicsThreadPtr(new epicsThread(
         *this,
@@ -71,14 +95,14 @@ void ProcessRecord::startThread()
     thread->start();
 }
 
-void ProcessRecord::stop()
+void PvdbcrProcessRecord::stop()
 {
     runStop.signal();
     runReturn.wait();
 }
 
 
-ProcessRecord::ProcessRecord(
+PvdbcrProcessRecord::PvdbcrProcessRecord(
     std::string const & recordName,
     epics::pvData::PVStructurePtr const & pvStructure,double delay)
 : PVRecord(recordName,pvStructure),
@@ -87,7 +111,7 @@ ProcessRecord::ProcessRecord(
 {
 }
 
-bool ProcessRecord::init()
+bool PvdbcrProcessRecord::init()
 {
     initPVRecord();
     PVStructurePtr pvStructure = getPVStructure();
@@ -100,7 +124,7 @@ bool ProcessRecord::init()
     return true;
 }
 
-void ProcessRecord::process()
+void PvdbcrProcessRecord::process()
 {
     string recordName = pvRecordName->get();
     string command = pvCommand->get();
@@ -135,7 +159,7 @@ void ProcessRecord::process()
     }
 }
 
-void ProcessRecord::run()
+void PvdbcrProcessRecord::run()
 {
     while(true) {
         if(runStop.tryWait()) {
@@ -162,5 +186,46 @@ void ProcessRecord::run()
     }
 }
 
+static const iocshArg arg0 = { "recordName", iocshArgString };
+static const iocshArg arg1 = { "delay", iocshArgDouble };
+static const iocshArg arg2 = { "asLevel", iocshArgInt };
+static const iocshArg arg3 = { "asGroup", iocshArgString };
+static const iocshArg *args[] = {&arg0,&arg1,&arg2,&arg3};
 
-}}
+static const iocshFuncDef pvdbcrProcessRecordFuncDef = {"pvdbcrProcessRecord", 4,args};
+
+static void pvdbcrProcessRecordCallFunc(const iocshArgBuf *args)
+{
+    char *sval = args[0].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrProcessRecord recordName not specified");
+    }
+    string recordName = string(sval);
+    double delay = args[1].dval;
+    if(delay<0.0) delay = 1.0;
+    int asLevel = args[2].ival;
+    string asGroup("DEFAULT");
+    sval = args[3].sval;
+    if(sval) {
+        asGroup = string(sval);
+    }
+    PvdbcrProcessRecordPtr record = PvdbcrProcessRecord::create(recordName,delay);
+    record->setAsLevel(asLevel);
+    record->setAsGroup(asGroup);
+    PVDatabasePtr master = PVDatabase::getMaster();
+    bool result =  master->addRecord(record);
+    if(!result) cout << "recordname " << recordName << " not added" << endl;
+}
+
+static void pvdbcrProcessRecordRegister(void)
+{
+    static int firstTime = 1;
+    if (firstTime) {
+        firstTime = 0;
+        iocshRegister(&pvdbcrProcessRecordFuncDef, pvdbcrProcessRecordCallFunc);
+    }
+}
+
+extern "C" {
+    epicsExportRegistrar(pvdbcrProcessRecordRegister);
+}

src/special/pvdbcrProcessRecordRegister.dbd

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

src/special/pvdbcrRemoveRecordRegister.cpp

@@ -0,0 +1,140 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+/**
+ * @author mrk
+ * @date 2021.03.12
+ */
+#include <iocsh.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
+#include <pv/timeStamp.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
+#include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+
+#include <epicsExport.h>
+#define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
+#include "pv/pvDatabase.h"
+using namespace epics::pvData;
+using namespace epics::pvAccess;
+using namespace epics::pvDatabase;
+using namespace std;
+
+class PvdbcrRemoveRecord;
+typedef std::tr1::shared_ptr<PvdbcrRemoveRecord> PvdbcrRemoveRecordPtr;
+
+
+class epicsShareClass PvdbcrRemoveRecord :
+    public PVRecord
+{
+public:
+    POINTER_DEFINITIONS(PvdbcrRemoveRecord);
+    static PvdbcrRemoveRecordPtr create(
+        std::string const & recordName);
+    virtual bool init();
+    virtual void process();
+private:
+    PvdbcrRemoveRecord(
+        std::string const & recordName,
+        epics::pvData::PVStructurePtr const & pvStructure);
+    epics::pvData::PVStringPtr pvRecordName;
+    epics::pvData::PVStringPtr pvResult;
+};
+
+PvdbcrRemoveRecordPtr PvdbcrRemoveRecord::create(
+    std::string const & recordName)
+{
+    FieldCreatePtr fieldCreate = getFieldCreate();
+    PVDataCreatePtr pvDataCreate = getPVDataCreate();
+    StructureConstPtr  topStructure = fieldCreate->createFieldBuilder()->
+        addNestedStructure("argument")->
+            add("recordName",pvString)->
+            endNested()->
+        addNestedStructure("result") ->
+            add("status",pvString) ->
+            endNested()->
+        createStructure();
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(topStructure);
+    PvdbcrRemoveRecordPtr pvRecord(
+        new PvdbcrRemoveRecord(recordName,pvStructure));
+    if(!pvRecord->init()) pvRecord.reset();
+    return pvRecord;
+}
+
+PvdbcrRemoveRecord::PvdbcrRemoveRecord(
+    std::string const & recordName,
+    epics::pvData::PVStructurePtr const & pvStructure)
+: PVRecord(recordName,pvStructure)
+{
+}
+
+bool PvdbcrRemoveRecord::init()
+{
+    initPVRecord();
+    PVStructurePtr pvStructure = getPVStructure();
+    pvRecordName = pvStructure->getSubField<PVString>("argument.recordName");
+    if(!pvRecordName) return false;
+    pvResult = pvStructure->getSubField<PVString>("result.status");
+    if(!pvResult) return false;
+    return true;
+}
+
+void PvdbcrRemoveRecord::process()
+{
+    string name = pvRecordName->get();
+    PVRecordPtr pvRecord = PVDatabase::getMaster()->findRecord(name);
+    if(!pvRecord) {
+        pvResult->put(name + " not found");
+        return;
+    }
+    pvRecord->remove();
+    pvResult->put("success");
+}
+
+static const iocshArg arg0 = { "recordName", iocshArgString };
+static const iocshArg arg1 = { "asLevel", iocshArgInt };
+static const iocshArg arg2 = { "asGroup", iocshArgString };
+static const iocshArg *args[] = {&arg0,&arg1,&arg2};
+
+static const iocshFuncDef pvdbcrRemoveRecordFuncDef = {"pvdbcrRemoveRecord", 3,args};
+
+static void pvdbcrRemoveRecordCallFunc(const iocshArgBuf *args)
+{
+    char *sval = args[0].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrRemoveRecord recordName not specified");
+    }
+    string recordName = string(sval);
+    int asLevel = args[1].ival;
+    string asGroup("DEFAULT");
+    sval = args[2].sval;
+    if(sval) {
+        asGroup = string(sval);
+    }
+    PvdbcrRemoveRecordPtr record = PvdbcrRemoveRecord::create(recordName);
+    record->setAsLevel(asLevel);
+    record->setAsGroup(asGroup);
+    PVDatabasePtr master = PVDatabase::getMaster();
+    bool result =  master->addRecord(record);
+    if(!result) cout << "recordname " << recordName << " not added" << endl;
+}
+
+static void pvdbcrRemoveRecordRegister(void)
+{
+    static int firstTime = 1;
+    if (firstTime) {
+        firstTime = 0;
+        iocshRegister(&pvdbcrRemoveRecordFuncDef, pvdbcrRemoveRecordCallFunc);
+    }
+}
+
+extern "C" {
+    epicsExportRegistrar(pvdbcrRemoveRecordRegister);
+}

src/special/pvdbcrRemoveRecordRegister.dbd

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

src/special/pvdbcrScalarArrayRegister.cpp

@@ -0,0 +1,83 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+/**
+ * @author mrk
+ * @date 2021.03.12
+ */
+
+
+/* Author: Marty Kraimer */
+#include <iocsh.h>
+#include <pv/standardField.h>
+#include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+
+// The following must be the last include for code pvDatabase implements
+#include <epicsExport.h>
+#define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
+#include "pv/pvDatabase.h"
+using namespace epics::pvData;
+using namespace epics::pvDatabase;
+using namespace std;
+
+static const iocshArg arg0 = { "recordName", iocshArgString };
+static const iocshArg arg1 = { "scalarType", iocshArgString };
+static const iocshArg arg2 = { "asLevel", iocshArgInt };
+static const iocshArg arg3 = { "asGroup", iocshArgString };
+static const iocshArg *args[] = {&arg0,&arg1,&arg2,&arg3};
+
+static const iocshFuncDef pvdbcrScalarArrayFuncDef = {"pvdbcrScalarArray", 4,args};
+
+static void pvdbcrScalarArrayCallFunc(const iocshArgBuf *args)
+{
+    char *sval = args[0].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrScalarArrayCreate recordName not specified");
+    }
+    string recordName = string(sval);
+    sval = args[1].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrScalarArrayCreate scalarType not specified");
+    }
+    string scalarType = string(sval);
+    int asLevel = args[2].ival;
+    string asGroup("DEFAULT");
+    sval = args[3].sval;
+    if(sval) {
+        asGroup = string(sval);
+    }
+    ScalarType st = epics::pvData::ScalarTypeFunc::getScalarType(scalarType);
+    FieldCreatePtr fieldCreate = getFieldCreate();
+    StandardFieldPtr standardField = getStandardField();
+    PVDataCreatePtr pvDataCreate = getPVDataCreate();
+    StructureConstPtr top = fieldCreate->createFieldBuilder()->
+        addArray("value",st) ->
+        add("timeStamp",standardField->timeStamp()) ->
+        add("alarm",standardField->alarm()) ->
+        createStructure();
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(top);   
+    PVRecordPtr record = PVRecord::create(recordName,pvStructure);
+    record->setAsLevel(asLevel);
+    record->setAsGroup(asGroup);
+    PVDatabasePtr master = PVDatabase::getMaster();
+    bool result =  master->addRecord(record);
+    if(!result) cout << "recordname " << recordName << " not added" << endl;
+}
+
+static void pvdbcrScalarArrayRegister(void)
+{
+    static int firstTime = 1;
+    if (firstTime) {
+        firstTime = 0;
+        iocshRegister(&pvdbcrScalarArrayFuncDef, pvdbcrScalarArrayCallFunc);
+    }
+}
+
+extern "C" {
+    epicsExportRegistrar(pvdbcrScalarArrayRegister);
+}

src/special/pvdbcrScalarArrayRegister.dbd

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

src/special/pvdbcrScalarRegister.cpp

@@ -0,0 +1,80 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+/**
+ * @author mrk
+ * @date 2021.03.12
+ */
+#include <iocsh.h>
+#include <pv/standardField.h>
+#include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+
+// The following must be the last include for code pvDatabase implements
+#include <epicsExport.h>
+#define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
+#include "pv/pvDatabase.h"
+using namespace epics::pvData;
+using namespace epics::pvDatabase;
+using namespace std;
+
+static const iocshArg arg0 = { "recordName", iocshArgString };
+static const iocshArg arg1 = { "scalarType", iocshArgString };
+static const iocshArg arg2 = { "asLevel", iocshArgInt };
+static const iocshArg arg3 = { "asGroup", iocshArgString };
+static const iocshArg *args[] = {&arg0,&arg1,&arg2,&arg3};
+
+static const iocshFuncDef pvdbcrScalarFuncDef = {"pvdbcrScalar", 4,args};
+
+static void pvdbcrScalarCallFunc(const iocshArgBuf *args)
+{
+    char *sval = args[0].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrScalarArrayCreate recordName not specified");
+    }
+    string recordName = string(sval);
+    sval = args[1].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrScalarArrayCreate scalarType not specified");
+    }
+    string scalarType = string(sval);
+    int asLevel = args[2].ival;
+    string asGroup("DEFAULT");
+    sval = args[3].sval;
+    if(sval) {
+        asGroup = string(sval);
+    }
+    ScalarType st = epics::pvData::ScalarTypeFunc::getScalarType(scalarType);
+    FieldCreatePtr fieldCreate = getFieldCreate();
+    StandardFieldPtr standardField = getStandardField();
+    PVDataCreatePtr pvDataCreate = getPVDataCreate();
+    StructureConstPtr top = fieldCreate->createFieldBuilder()->
+        add("value",st) ->
+        add("timeStamp",standardField->timeStamp()) ->
+        add("alarm",standardField->alarm()) ->
+        createStructure();
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(top);   
+    PVRecordPtr record = PVRecord::create(recordName,pvStructure);
+    record->setAsLevel(asLevel);
+    record->setAsGroup(asGroup);
+    PVDatabasePtr master = PVDatabase::getMaster();
+    bool result =  master->addRecord(record);
+    if(!result) cout << "recordname " << recordName << " not added" << endl;
+}
+
+static void pvdbcrScalarRegister(void)
+{
+    static int firstTime = 1;
+    if (firstTime) {
+        firstTime = 0;
+        iocshRegister(&pvdbcrScalarFuncDef, pvdbcrScalarCallFunc);
+    }
+}
+
+extern "C" {
+    epicsExportRegistrar(pvdbcrScalarRegister);
+}

src/special/pvdbcrScalarRegister.dbd

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

src/special/pvdbcrTraceRecordRegister.cpp

@@ -0,0 +1,146 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+/**
+ * @author mrk
+ * @date 2021.03.12
+ */
+#include <iocsh.h>
+#include <pv/standardField.h>
+#include <pv/standardPVField.h>
+#include <pv/timeStamp.h>
+#include <pv/pvTimeStamp.h>
+#include <pv/alarm.h>
+#include <pv/pvAlarm.h>
+#include <pv/pvAccess.h>
+#include <pv/serverContext.h>
+
+// The following must be the last include
+#include <epicsExport.h>
+#define epicsExportSharedSymbols
+#include "pv/pvStructureCopy.h"
+#include "pv/channelProviderLocal.h"
+#include "pv/pvDatabase.h"
+
+using namespace epics::pvData;
+using namespace epics::pvAccess;
+using namespace epics::pvDatabase;
+using namespace std;
+
+class PvdbcrTraceRecord;
+typedef std::tr1::shared_ptr<PvdbcrTraceRecord> PvdbcrTraceRecordPtr;
+
+class epicsShareClass PvdbcrTraceRecord :
+    public PVRecord
+{
+public:
+    POINTER_DEFINITIONS(PvdbcrTraceRecord);
+    static PvdbcrTraceRecordPtr create(
+        std::string const & recordName);
+    virtual bool init();
+    virtual void process();
+private:
+    PvdbcrTraceRecord(
+        std::string const & recordName,
+        epics::pvData::PVStructurePtr const & pvStructure);
+    epics::pvData::PVStringPtr pvRecordName;
+    epics::pvData::PVIntPtr pvLevel;
+    epics::pvData::PVStringPtr pvResult;
+}; 
+
+PvdbcrTraceRecordPtr PvdbcrTraceRecord::create(
+    std::string const & recordName)
+{
+    FieldCreatePtr fieldCreate = getFieldCreate();
+    PVDataCreatePtr pvDataCreate = getPVDataCreate();
+    StructureConstPtr  topStructure = fieldCreate->createFieldBuilder()->
+        addNestedStructure("argument")->
+            add("recordName",pvString)->
+            add("level",pvInt)->
+            endNested()->
+        addNestedStructure("result") ->
+            add("status",pvString) ->
+            endNested()->
+        createStructure();
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(topStructure);
+    PvdbcrTraceRecordPtr pvRecord(
+        new PvdbcrTraceRecord(recordName,pvStructure));
+    if(!pvRecord->init()) pvRecord.reset();
+    return pvRecord;
+}
+
+PvdbcrTraceRecord::PvdbcrTraceRecord(
+    std::string const & recordName,
+    epics::pvData::PVStructurePtr const & pvStructure)
+: PVRecord(recordName,pvStructure)
+{
+}
+
+
+bool PvdbcrTraceRecord::init()
+{
+    initPVRecord();
+    PVStructurePtr pvStructure = getPVStructure();
+    pvRecordName = pvStructure->getSubField<PVString>("argument.recordName");
+    if(!pvRecordName) return false;
+    pvLevel = pvStructure->getSubField<PVInt>("argument.level");
+    if(!pvLevel) return false;
+    pvResult = pvStructure->getSubField<PVString>("result.status");
+    if(!pvResult) return false;
+    return true;
+}
+
+void PvdbcrTraceRecord::process()
+{
+    string name = pvRecordName->get();
+    PVRecordPtr pvRecord = PVDatabase::getMaster()->findRecord(name);
+    if(!pvRecord) {
+        pvResult->put(name + " not found");
+        return;
+    }
+    pvRecord->setTraceLevel(pvLevel->get());
+    pvResult->put("success");
+}
+
+static const iocshArg arg0 = { "recordName", iocshArgString };
+static const iocshArg arg1 = { "asLevel", iocshArgInt };
+static const iocshArg arg2 = { "asGroup", iocshArgString };
+static const iocshArg *args[] = {&arg0,&arg1,&arg2};
+
+static const iocshFuncDef pvdbcrTraceRecordFuncDef = {"pvdbcrTraceRecord", 3,args};
+
+static void pvdbcrTraceRecordCallFunc(const iocshArgBuf *args)
+{
+    char *sval = args[0].sval;
+    if(!sval) {
+        throw std::runtime_error("pvdbcrTraceRecord recordName not specified");
+    }
+    string recordName = string(sval);
+    int asLevel = args[1].ival;
+    string asGroup("DEFAULT");
+    sval = args[2].sval;
+    if(sval) {
+        asGroup = string(sval);
+    }
+    PvdbcrTraceRecordPtr record = PvdbcrTraceRecord::create(recordName);
+    record->setAsLevel(asLevel);
+    record->setAsGroup(asGroup);
+    PVDatabasePtr master = PVDatabase::getMaster();
+    bool result =  master->addRecord(record);
+    if(!result) cout << "recordname " << recordName << " not added" << endl;
+}
+
+static void pvdbcrTraceRecordRegister(void)
+{
+    static int firstTime = 1;
+    if (firstTime) {
+        firstTime = 0;
+        iocshRegister(&pvdbcrTraceRecordFuncDef, pvdbcrTraceRecordCallFunc);
+    }
+}
+
+extern "C" {
+    epicsExportRegistrar(pvdbcrTraceRecordRegister);
+}

src/special/pvdbcrTraceRecordRegister.dbd

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

src/special/removeRecord.cpp

@@ -1,92 +0,0 @@
-/* removeRecord.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 2013.04.18
- */
-
-#include <string>
-#include <cstring>
-#include <stdexcept>
-#include <memory>
-#include <set>
-
-#include <pv/lock.h>
-#include <pv/pvType.h>
-#include <pv/pvData.h>
-#include <pv/pvTimeStamp.h>
-#include <pv/timeStamp.h>
-#include <pv/rpcService.h>
-#include <pv/pvAccess.h>
-#include <pv/status.h>
-#include <pv/serverContext.h>
-
-
-#define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
-#include "pv/removeRecord.h"
-
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace std;
-
-namespace epics { namespace pvDatabase {
-
-RemoveRecordPtr RemoveRecord::create(
-    std::string const & recordName)
-{
-    FieldCreatePtr fieldCreate = getFieldCreate();
-    PVDataCreatePtr pvDataCreate = getPVDataCreate();
-    StructureConstPtr  topStructure = fieldCreate->createFieldBuilder()->
-        addNestedStructure("argument")->
-            add("recordName",pvString)->
-            endNested()->
-        addNestedStructure("result") ->
-            add("status",pvString) ->
-            endNested()->
-        createStructure();
-    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(topStructure);
-    RemoveRecordPtr pvRecord(
-        new RemoveRecord(recordName,pvStructure));
-    if(!pvRecord->init()) pvRecord.reset();
-    return pvRecord;
-}
-
-RemoveRecord::RemoveRecord(
-    std::string const & recordName,
-    epics::pvData::PVStructurePtr const & pvStructure)
-: PVRecord(recordName,pvStructure)
-{
-}
-
-bool RemoveRecord::init()
-{
-    initPVRecord();
-    PVStructurePtr pvStructure = getPVStructure();
-    pvRecordName = pvStructure->getSubField<PVString>("argument.recordName");
-    if(!pvRecordName) return false;
-    pvResult = pvStructure->getSubField<PVString>("result.status");
-    if(!pvResult) return false;
-    return true;
-}
-
-void RemoveRecord::process()
-{
-    string name = pvRecordName->get();
-    PVRecordPtr pvRecord = PVDatabase::getMaster()->findRecord(name);
-    if(!pvRecord) {
-        pvResult->put(name + " not found");
-        return;
-    }
-    pvRecord->remove();
-    pvResult->put("success");
-}
-
-
-}}

src/special/removeRecordRegister.cpp

@@ -1,62 +0,0 @@
-/*
- * Copyright information and license terms for this software can be
- * found in the file LICENSE that is included with the distribution
- */
-
-/**
- * @author mrk
- * @date 2013.07.24
- */
-
-
-/* Author: Marty Kraimer */
-#include <epicsThread.h>
-#include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
-#include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-
-// The following must be the last include for code pvDatabase uses
-#include <epicsExport.h>
-#define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
-#include "pv/removeRecord.h"
-
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-using namespace std;
-
-static const iocshArg testArg0 = { "recordName", iocshArgString };
-static const iocshArg *testArgs[] = {
-    &testArg0};
-
-static const iocshFuncDef removeRecordFuncDef = {"removeRecordCreate", 1,testArgs};
-
-static void removeRecordCallFunc(const iocshArgBuf *args)
-{
-    char *recordName = args[0].sval;
-    if(!recordName) {
-        throw std::runtime_error("removeRecordCreate invalid number of arguments");
-    }
-    RemoveRecordPtr record = RemoveRecord::create(recordName);
-    bool result = PVDatabase::getMaster()->addRecord(record);
-    if(!result) cout << "recordname" << " not added" << endl;
-}
-
-static void removeRecordRegister(void)
-{
-    static int firstTime = 1;
-    if (firstTime) {
-        firstTime = 0;
-        iocshRegister(&removeRecordFuncDef, removeRecordCallFunc);
-    }
-}
-
-extern "C" {
-    epicsExportRegistrar(removeRecordRegister);
-}

src/special/removeRecordRegister.dbd

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

src/special/traceRecord.cpp

@@ -1,95 +0,0 @@
-/* traceRecord.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 2013.04.18
- */
-
-#include <string>
-#include <cstring>
-#include <stdexcept>
-#include <memory>
-#include <set>
-
-#include <pv/lock.h>
-#include <pv/pvType.h>
-#include <pv/pvData.h>
-#include <pv/pvTimeStamp.h>
-#include <pv/timeStamp.h>
-#include <pv/rpcService.h>
-#include <pv/pvAccess.h>
-#include <pv/status.h>
-#include <pv/serverContext.h>
-
-#define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/channelProviderLocal.h"
-#include "pv/traceRecord.h"
-
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace std;
-
-namespace epics { namespace pvDatabase {
-
-TraceRecordPtr TraceRecord::create(
-    std::string const & recordName)
-{
-    FieldCreatePtr fieldCreate = getFieldCreate();
-    PVDataCreatePtr pvDataCreate = getPVDataCreate();
-    StructureConstPtr  topStructure = fieldCreate->createFieldBuilder()->
-        addNestedStructure("argument")->
-            add("recordName",pvString)->
-            add("level",pvInt)->
-            endNested()->
-        addNestedStructure("result") ->
-            add("status",pvString) ->
-            endNested()->
-        createStructure();
-    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(topStructure);
-    TraceRecordPtr pvRecord(
-        new TraceRecord(recordName,pvStructure));
-    if(!pvRecord->init()) pvRecord.reset();
-    return pvRecord;
-}
-
-TraceRecord::TraceRecord(
-    std::string const & recordName,
-    epics::pvData::PVStructurePtr const & pvStructure)
-: PVRecord(recordName,pvStructure)
-{
-}
-
-
-bool TraceRecord::init()
-{
-    initPVRecord();
-    PVStructurePtr pvStructure = getPVStructure();
-    pvRecordName = pvStructure->getSubField<PVString>("argument.recordName");
-    if(!pvRecordName) return false;
-    pvLevel = pvStructure->getSubField<PVInt>("argument.level");
-    if(!pvLevel) return false;
-    pvResult = pvStructure->getSubField<PVString>("result.status");
-    if(!pvResult) return false;
-    return true;
-}
-
-void TraceRecord::process()
-{
-    string name = pvRecordName->get();
-    PVRecordPtr pvRecord = PVDatabase::getMaster()->findRecord(name);
-    if(!pvRecord) {
-        pvResult->put(name + " not found");
-        return;
-    }
-    pvRecord->setTraceLevel(pvLevel->get());
-    pvResult->put("success");
-}
-
-
-}}

src/special/traceRecordRegister.cpp

@@ -1,63 +0,0 @@
-/*
- * Copyright information and license terms for this software can be
- * found in the file LICENSE that is included with the distribution
- */
-
-/**
- * @author mrk
- * @date 2013.07.24
- */
-
-
-/* Author: Marty Kraimer */
-
-#include <epicsThread.h>
-#include <iocsh.h>
-#include <pv/event.h>
-#include <pv/pvAccess.h>
-#include <pv/serverContext.h>
-#include <pv/pvData.h>
-#include <pv/pvTimeStamp.h>
-#include <pv/rpcService.h>
-
-// The following must be the last include for code pvDatabase uses
-#include <epicsExport.h>
-#define epicsExportSharedSymbols
-#include "pv/pvStructureCopy.h"
-#include "pv/pvDatabase.h"
-#include "pv/traceRecord.h"
-
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-using namespace std;
-
-static const iocshArg testArg0 = { "recordName", iocshArgString };
-static const iocshArg *testArgs[] = {
-    &testArg0};
-
-static const iocshFuncDef traceRecordFuncDef = {"traceRecordCreate", 1,testArgs};
-
-static void traceRecordCallFunc(const iocshArgBuf *args)
-{
-    char *recordName = args[0].sval;
-    if(!recordName) {
-        throw std::runtime_error("traceRecordCreate invalid number of arguments");
-    }
-    TraceRecordPtr record = TraceRecord::create(recordName);
-    bool result = PVDatabase::getMaster()->addRecord(record);
-    if(!result) cout << "recordname" << " not added" << endl;
-}
-
-static void traceRecordRegister(void)
-{
-    static int firstTime = 1;
-    if (firstTime) {
-        firstTime = 0;
-        iocshRegister(&traceRecordFuncDef, traceRecordCallFunc);
-    }
-}
-
-extern "C" {
-    epicsExportRegistrar(traceRecordRegister);
-}

src/special/traceRecordRegister.dbd

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

src/support/controlSupport.cpp

@@ -46,6 +46,7 @@ epics::pvData::StructureConstPtr ControlSupport::controlField(ScalarType scalarT
 
 ControlSupportPtr ControlSupport::create(PVRecordPtr const & pvRecord)
 {
+   cerr << "ControlSupport IS DEPRECATED\n";
    ControlSupportPtr support(new ControlSupport(pvRecord));
    return support;
 }

src/support/scalarAlarmSupport.cpp

@@ -48,6 +48,7 @@ epics::pvData::StructureConstPtr ScalarAlarmSupport::scalarAlarmField()
 
 ScalarAlarmSupportPtr ScalarAlarmSupport::create(PVRecordPtr const & pvRecord)
 {
+   cerr << "ScalarAlarmSupport IS DEPRECATED\n";
    ScalarAlarmSupportPtr support(new ScalarAlarmSupport(pvRecord));
    return support;
 }