diff --git a/src/Makefile b/src/Makefile index 0cfac65..f6e9b7b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,8 +20,8 @@ INC += pv/pvSupport.h INC += pv/controlSupport.h INC += pv/scalarAlarmSupport.h -INC += pv/pvdbcrScalar.h -INC += pv/pvdbcrScalarArray.h +INC += pv/pvdbcrScalarRecord.h +INC += pv/pvdbcrScalarArrayRecord.h INC += pv/pvdbcrAddRecord.h INC += pv/pvdbcrRemoveRecord.h INC += pv/pvdbcrProcessRecord.h diff --git a/src/pv/pvdbcrScalarArray.h b/src/pv/pvdbcrScalarArrayRecord.h similarity index 66% rename from src/pv/pvdbcrScalarArray.h rename to src/pv/pvdbcrScalarArrayRecord.h index d5458d1..e1e2889 100644 --- a/src/pv/pvdbcrScalarArray.h +++ b/src/pv/pvdbcrScalarArrayRecord.h @@ -7,8 +7,8 @@ * @author mrk * @date 2021.04.11 */ -#ifndef PVDBCRSCALARARRAY_H -#define PVDBCRSCALARARRAY_H +#ifndef PVDBCRSCALARARRAYRECORD_H +#define PVDBCRSCALARARRAYRECORD_H #include #include @@ -18,26 +18,26 @@ namespace epics { namespace pvDatabase { -class PvdbcrScalarArray; -typedef std::tr1::shared_ptr PvdbcrScalarArrayPtr; +class PvdbcrScalarArrayRecord; +typedef std::tr1::shared_ptr PvdbcrScalarArrayRecordPtr; /** - * @brief PvdbcrScalarArray creates a record with a scalar array value, alarm, and timeStamp. + * @brief PvdbcrScalarArrayRecord creates a record with a scalar array value, alarm, and timeStamp. * */ -class epicsShareClass PvdbcrScalarArray : +class epicsShareClass PvdbcrScalarArrayRecord : public PVRecord { private: - PvdbcrScalarArray( + PvdbcrScalarArrayRecord( std::string const & recordName,epics::pvData::PVStructurePtr const & pvStructure, int asLevel,std::string const & asGroup); public: - POINTER_DEFINITIONS(PvdbcrScalarArray); + POINTER_DEFINITIONS(PvdbcrScalarArrayRecord); /** * The Destructor. */ - virtual ~PvdbcrScalarArray() {} + virtual ~PvdbcrScalarArrayRecord() {} /** * @brief Create a record. * @@ -47,11 +47,11 @@ public: * @param asGroup The access security group. * @return The PVRecord */ - static PvdbcrScalarArrayPtr create( + static PvdbcrScalarArrayRecordPtr create( std::string const & recordName,std::string const & scalarType, int asLevel=0,std::string const & asGroup = std::string("DEFAULT")); }; }} -#endif /* PVDBCRSCALARARRAY_H */ +#endif /* PVDBCRSCALARARRAYRECORD_H */ diff --git a/src/pv/pvdbcrScalar.h b/src/pv/pvdbcrScalarRecord.h similarity index 69% rename from src/pv/pvdbcrScalar.h rename to src/pv/pvdbcrScalarRecord.h index efcafd2..8a520a9 100644 --- a/src/pv/pvdbcrScalar.h +++ b/src/pv/pvdbcrScalarRecord.h @@ -7,8 +7,8 @@ * @author mrk * @date 2021.04.11 */ -#ifndef PVDBCRSCALAR_H -#define PVDBCRSCALAR_H +#ifndef PVDBCRSCALARRECORD_H +#define PVDBCRSCALARRECORD_H #include #include @@ -18,26 +18,26 @@ namespace epics { namespace pvDatabase { -class PvdbcrScalar; -typedef std::tr1::shared_ptr PvdbcrScalarPtr; +class PvdbcrScalarRecord; +typedef std::tr1::shared_ptr PvdbcrScalarRecordPtr; /** - * @brief PvdbcrScalar creates a record with a scalar value, alarm, and timeStamp. + * @brief PvdbcrScalarRecord creates a record with a scalar value, alarm, and timeStamp. * */ -class epicsShareClass PvdbcrScalar : +class epicsShareClass PvdbcrScalarRecord : public PVRecord { private: - PvdbcrScalar( + PvdbcrScalarRecord( std::string const & recordName,epics::pvData::PVStructurePtr const & pvStructure, int asLevel,std::string const & asGroup); public: - POINTER_DEFINITIONS(PvdbcrScalar); + POINTER_DEFINITIONS(PvdbcrScalarRecord); /** * The Destructor. */ - virtual ~PvdbcrScalar() {} + virtual ~PvdbcrScalarRecord() {} /** * @brief Create a record. * @@ -47,11 +47,11 @@ public: * @param asGroup The access security group. * @return The PVRecord */ - static PvdbcrScalarPtr create( + static PvdbcrScalarRecordPtr create( std::string const & recordName,std::string const & scalarType, int asLevel=0,std::string const & asGroup = std::string("DEFAULT")); }; }} -#endif /* PVDBCRSCALAR_H */ +#endif /* PVDBCRSCALARRECORD_H */ diff --git a/src/special/Makefile b/src/special/Makefile index 93f7723..37b0fb1 100644 --- a/src/special/Makefile +++ b/src/special/Makefile @@ -2,18 +2,17 @@ SRC_DIRS += $(PVDATABASE_SRC)/special -DBD += pvdbcrTraceRecordRegister.dbd -DBD += pvdbcrRemoveRecordRegister.dbd -DBD += pvdbcrAddRecordRegister.dbd -DBD += pvdbcrProcessRecordRegister.dbd -DBD += pvdbcrScalarRegister.dbd -DBD += pvdbcrScalarArrayRegister.dbd -DBD += pvdbSpecialRegister.dbd - -LIBSRCS += pvdbcrScalarRegister.cpp -LIBSRCS += pvdbcrScalarArrayRegister.cpp -LIBSRCS += pvdbcrTraceRecordRegister.cpp -LIBSRCS += pvdbcrRemoveRecordRegister.cpp -LIBSRCS += pvdbcrAddRecordRegister.cpp -LIBSRCS += pvdbcrProcessRecordRegister.cpp +DBD += pvdbcrScalarRecord.dbd +DBD += pvdbcrScalarArrayRecord.dbd +DBD += pvdbcrAddRecord.dbd +DBD += pvdbcrRemoveRecord.dbd +DBD += pvdbcrProcessRecord.dbd +DBD += pvdbcrTraceRecord.dbd +DBD += pvdbcrAllRecords.dbd +LIBSRCS += pvdbcrScalarRecord.cpp +LIBSRCS += pvdbcrScalarArrayRecord.cpp +LIBSRCS += pvdbcrAddRecord.cpp +LIBSRCS += pvdbcrRemoveRecord.cpp +LIBSRCS += pvdbcrProcessRecord.cpp +LIBSRCS += pvdbcrTraceRecord.cpp diff --git a/src/special/pvdbSpecialRegister.dbd b/src/special/pvdbSpecialRegister.dbd deleted file mode 100644 index eb36e2e..0000000 --- a/src/special/pvdbSpecialRegister.dbd +++ /dev/null @@ -1,6 +0,0 @@ -include "pvdbcrAddRecordRegister.dbd" -include "pvdbcrRemoveRecordRegister.dbd" -include "pvdbcrProcessRecordRegister.dbd" -include "pvdbcrTraceRecordRegister.dbd" -include "pvdbcrScalarRegister.dbd" -include "pvdbcrScalarArrayRegister.dbd" diff --git a/src/special/pvdbcrAddRecordRegister.cpp b/src/special/pvdbcrAddRecord.cpp similarity index 97% rename from src/special/pvdbcrAddRecordRegister.cpp rename to src/special/pvdbcrAddRecord.cpp index b67bb1e..e0c0369 100644 --- a/src/special/pvdbcrAddRecordRegister.cpp +++ b/src/special/pvdbcrAddRecord.cpp @@ -133,7 +133,7 @@ static void pvdbcrAddRecordCallFunc(const iocshArgBuf *args) if(!result) cout << "recordname " << recordName << " not added" << endl; } -static void pvdbcrAddRecordRegister(void) +static void pvdbcrAddRecord(void) { static int firstTime = 1; if (firstTime) { @@ -143,5 +143,5 @@ static void pvdbcrAddRecordRegister(void) } extern "C" { - epicsExportRegistrar(pvdbcrAddRecordRegister); + epicsExportRegistrar(pvdbcrAddRecord); } diff --git a/src/special/pvdbcrAddRecord.dbd b/src/special/pvdbcrAddRecord.dbd new file mode 100644 index 0000000..83c7649 --- /dev/null +++ b/src/special/pvdbcrAddRecord.dbd @@ -0,0 +1 @@ +registrar("pvdbcrAddRecord") diff --git a/src/special/pvdbcrAddRecordRegister.dbd b/src/special/pvdbcrAddRecordRegister.dbd deleted file mode 100644 index 65f7c9b..0000000 --- a/src/special/pvdbcrAddRecordRegister.dbd +++ /dev/null @@ -1 +0,0 @@ -registrar("pvdbcrAddRecordRegister") diff --git a/src/special/pvdbcrAllRecords.dbd b/src/special/pvdbcrAllRecords.dbd new file mode 100644 index 0000000..6abf999 --- /dev/null +++ b/src/special/pvdbcrAllRecords.dbd @@ -0,0 +1,6 @@ +include "pvdbcrAddRecord.dbd" +include "pvdbcrRemoveRecord.dbd" +include "pvdbcrProcessRecord.dbd" +include "pvdbcrTraceRecord.dbd" +include "pvdbcrScalarRecord.dbd" +include "pvdbcrScalarArrayRecord.dbd" diff --git a/src/special/pvdbcrProcessRecordRegister.cpp b/src/special/pvdbcrProcessRecord.cpp similarity index 98% rename from src/special/pvdbcrProcessRecordRegister.cpp rename to src/special/pvdbcrProcessRecord.cpp index 16c62a9..48ffcf1 100644 --- a/src/special/pvdbcrProcessRecordRegister.cpp +++ b/src/special/pvdbcrProcessRecord.cpp @@ -192,7 +192,7 @@ static void pvdbcrProcessRecordCallFunc(const iocshArgBuf *args) if(!result) cout << "recordname " << recordName << " not added" << endl; } -static void pvdbcrProcessRecordRegister(void) +static void pvdbcrProcessRecord(void) { static int firstTime = 1; if (firstTime) { @@ -202,5 +202,5 @@ static void pvdbcrProcessRecordRegister(void) } extern "C" { - epicsExportRegistrar(pvdbcrProcessRecordRegister); + epicsExportRegistrar(pvdbcrProcessRecord); } diff --git a/src/special/pvdbcrProcessRecord.dbd b/src/special/pvdbcrProcessRecord.dbd new file mode 100644 index 0000000..04bfa4c --- /dev/null +++ b/src/special/pvdbcrProcessRecord.dbd @@ -0,0 +1 @@ +registrar("pvdbcrProcessRecord") diff --git a/src/special/pvdbcrProcessRecordRegister.dbd b/src/special/pvdbcrProcessRecordRegister.dbd deleted file mode 100644 index 8948909..0000000 --- a/src/special/pvdbcrProcessRecordRegister.dbd +++ /dev/null @@ -1 +0,0 @@ -registrar("pvdbcrProcessRecordRegister") diff --git a/src/special/pvdbcrRemoveRecordRegister.cpp b/src/special/pvdbcrRemoveRecord.cpp similarity index 97% rename from src/special/pvdbcrRemoveRecordRegister.cpp rename to src/special/pvdbcrRemoveRecord.cpp index 34289b5..cb1987b 100644 --- a/src/special/pvdbcrRemoveRecordRegister.cpp +++ b/src/special/pvdbcrRemoveRecord.cpp @@ -109,7 +109,7 @@ static void pvdbcrRemoveRecordCallFunc(const iocshArgBuf *args) if(!result) cout << "recordname " << recordName << " not added" << endl; } -static void pvdbcrRemoveRecordRegister(void) +static void pvdbcrRemoveRecord(void) { static int firstTime = 1; if (firstTime) { @@ -119,5 +119,5 @@ static void pvdbcrRemoveRecordRegister(void) } extern "C" { - epicsExportRegistrar(pvdbcrRemoveRecordRegister); + epicsExportRegistrar(pvdbcrRemoveRecord); } diff --git a/src/special/pvdbcrRemoveRecord.dbd b/src/special/pvdbcrRemoveRecord.dbd new file mode 100644 index 0000000..3f4f884 --- /dev/null +++ b/src/special/pvdbcrRemoveRecord.dbd @@ -0,0 +1 @@ +registrar("pvdbcrRemoveRecord") diff --git a/src/special/pvdbcrRemoveRecordRegister.dbd b/src/special/pvdbcrRemoveRecordRegister.dbd deleted file mode 100644 index 99d21c5..0000000 --- a/src/special/pvdbcrRemoveRecordRegister.dbd +++ /dev/null @@ -1 +0,0 @@ -registrar("pvdbcrRemoveRecordRegister") diff --git a/src/special/pvdbcrScalarArrayRegister.cpp b/src/special/pvdbcrScalarArrayRecord.cpp similarity index 79% rename from src/special/pvdbcrScalarArrayRegister.cpp rename to src/special/pvdbcrScalarArrayRecord.cpp index b8f4b17..bcc700c 100644 --- a/src/special/pvdbcrScalarArrayRegister.cpp +++ b/src/special/pvdbcrScalarArrayRecord.cpp @@ -21,20 +21,20 @@ // The following must be the last include for code pvDatabase implements #include #define epicsExportSharedSymbols -#include "pv/pvdbcrScalarArray.h" #include "pv/pvDatabase.h" +#include "pv/pvdbcrScalarArrayRecord.h" using namespace epics::pvData; using namespace std; namespace epics { namespace pvDatabase { -PvdbcrScalarArray::PvdbcrScalarArray( +PvdbcrScalarArrayRecord::PvdbcrScalarArrayRecord( std::string const & recordName,epics::pvData::PVStructurePtr const & pvStructure, int asLevel,std::string const & asGroup) : PVRecord(recordName,pvStructure,asLevel,asGroup) {} -PvdbcrScalarArrayPtr PvdbcrScalarArray::create( +PvdbcrScalarArrayRecordPtr PvdbcrScalarArrayRecord::create( std::string const & recordName,std::string const & scalarType, int asLevel,std::string const & asGroup) { @@ -46,9 +46,9 @@ PvdbcrScalarArrayPtr PvdbcrScalarArray::create( addArray("value",st) -> add("timeStamp",standardField->timeStamp()) -> add("alarm",standardField->alarm()) -> - createStructure(); + createStructure(); PVStructurePtr pvStructure = pvDataCreate->createPVStructure(top); - PvdbcrScalarArrayPtr pvRecord(new PvdbcrScalarArray(recordName,pvStructure,asLevel,asGroup)); + PvdbcrScalarArrayRecordPtr pvRecord(new PvdbcrScalarArrayRecord(recordName,pvStructure,asLevel,asGroup)); pvRecord->initPVRecord(); return pvRecord; }; @@ -60,18 +60,18 @@ 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 const iocshFuncDef pvdbcrScalarArrayFuncDef = {"pvdbcrScalarArrayRecord", 4,args}; static void pvdbcrScalarArrayCallFunc(const iocshArgBuf *args) { char *sval = args[0].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalarArray recordName not specified"); + throw std::runtime_error("pvdbcrScalarArrayRecord recordName not specified"); } string recordName = string(sval); sval = args[1].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalarArray scalarType not specified"); + throw std::runtime_error("pvdbcrScalarArrayRecord scalarType not specified"); } string scalarType = string(sval); int asLevel = args[2].ival; @@ -80,8 +80,8 @@ static void pvdbcrScalarArrayCallFunc(const iocshArgBuf *args) if(sval) { asGroup = string(sval); } - epics::pvDatabase::PvdbcrScalarArrayPtr record - = epics::pvDatabase::PvdbcrScalarArray::create(recordName,scalarType); + epics::pvDatabase::PvdbcrScalarArrayRecordPtr record + = epics::pvDatabase::PvdbcrScalarArrayRecord::create(recordName,scalarType); epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); record->setAsLevel(asLevel); record->setAsGroup(asGroup); @@ -89,7 +89,7 @@ static void pvdbcrScalarArrayCallFunc(const iocshArgBuf *args) if(!result) cout << "recordname " << recordName << " not added" << endl; } -static void pvdbcrScalarArrayRegister(void) +static void pvdbcrScalarArrayRecord(void) { static int firstTime = 1; if (firstTime) { @@ -99,5 +99,5 @@ static void pvdbcrScalarArrayRegister(void) } extern "C" { - epicsExportRegistrar(pvdbcrScalarArrayRegister); + epicsExportRegistrar(pvdbcrScalarArrayRecord); } diff --git a/src/special/pvdbcrScalarArrayRecord.dbd b/src/special/pvdbcrScalarArrayRecord.dbd new file mode 100644 index 0000000..9e4c68f --- /dev/null +++ b/src/special/pvdbcrScalarArrayRecord.dbd @@ -0,0 +1 @@ +registrar("pvdbcrScalarArrayRecord") diff --git a/src/special/pvdbcrScalarArrayRegister.dbd b/src/special/pvdbcrScalarArrayRegister.dbd deleted file mode 100644 index db27b53..0000000 --- a/src/special/pvdbcrScalarArrayRegister.dbd +++ /dev/null @@ -1 +0,0 @@ -registrar("pvdbcrScalarArrayRegister") diff --git a/src/special/pvdbcrScalarRegister.cpp b/src/special/pvdbcrScalarRecord.cpp similarity index 79% rename from src/special/pvdbcrScalarRegister.cpp rename to src/special/pvdbcrScalarRecord.cpp index 4b2a557..c5c6b1b 100644 --- a/src/special/pvdbcrScalarRegister.cpp +++ b/src/special/pvdbcrScalarRecord.cpp @@ -21,20 +21,20 @@ // The following must be the last include for code pvDatabase implements #include #define epicsExportSharedSymbols -#include "pv/pvdbcrScalar.h" #include "pv/pvDatabase.h" +#include "pv/pvdbcrScalarRecord.h" using namespace epics::pvData; using namespace std; namespace epics { namespace pvDatabase { -PvdbcrScalar::PvdbcrScalar( +PvdbcrScalarRecord::PvdbcrScalarRecord( std::string const & recordName,epics::pvData::PVStructurePtr const & pvStructure, int asLevel,std::string const & asGroup) : PVRecord(recordName,pvStructure,asLevel,asGroup) {} -PvdbcrScalarPtr PvdbcrScalar::create( +PvdbcrScalarRecordPtr PvdbcrScalarRecord::create( std::string const & recordName,std::string const & scalarType, int asLevel,std::string const & asGroup) { @@ -46,9 +46,9 @@ PvdbcrScalarPtr PvdbcrScalar::create( add("value",st) -> add("timeStamp",standardField->timeStamp()) -> add("alarm",standardField->alarm()) -> - createStructure(); + createStructure(); PVStructurePtr pvStructure = pvDataCreate->createPVStructure(top); - PvdbcrScalarPtr pvRecord(new PvdbcrScalar(recordName,pvStructure,asLevel,asGroup)); + PvdbcrScalarRecordPtr pvRecord(new PvdbcrScalarRecord(recordName,pvStructure,asLevel,asGroup)); pvRecord->initPVRecord(); return pvRecord; }; @@ -60,18 +60,18 @@ 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 const iocshFuncDef pvdbcrScalarFuncDef = {"pvdbcrScalarRecord", 4,args}; static void pvdbcrScalarCallFunc(const iocshArgBuf *args) { char *sval = args[0].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalar recordName not specified"); + throw std::runtime_error("pvdbcrScalarRecord recordName not specified"); } string recordName = string(sval); sval = args[1].sval; if(!sval) { - throw std::runtime_error("pvdbcrScalar scalarType not specified"); + throw std::runtime_error("pvdbcrScalarRecord scalarType not specified"); } string scalarType = string(sval); int asLevel = args[2].ival; @@ -80,8 +80,8 @@ static void pvdbcrScalarCallFunc(const iocshArgBuf *args) if(sval) { asGroup = string(sval); } - epics::pvDatabase::PvdbcrScalarPtr record - = epics::pvDatabase::PvdbcrScalar::create(recordName,scalarType); + epics::pvDatabase::PvdbcrScalarRecordPtr record + = epics::pvDatabase::PvdbcrScalarRecord::create(recordName,scalarType); epics::pvDatabase::PVDatabasePtr master = epics::pvDatabase::PVDatabase::getMaster(); record->setAsLevel(asLevel); record->setAsGroup(asGroup); @@ -89,7 +89,7 @@ static void pvdbcrScalarCallFunc(const iocshArgBuf *args) if(!result) cout << "recordname " << recordName << " not added" << endl; } -static void pvdbcrScalarRegister(void) +static void pvdbcrScalarRecord(void) { static int firstTime = 1; if (firstTime) { @@ -99,5 +99,5 @@ static void pvdbcrScalarRegister(void) } extern "C" { - epicsExportRegistrar(pvdbcrScalarRegister); + epicsExportRegistrar(pvdbcrScalarRecord); } diff --git a/src/special/pvdbcrScalarRecord.dbd b/src/special/pvdbcrScalarRecord.dbd new file mode 100644 index 0000000..2abcea3 --- /dev/null +++ b/src/special/pvdbcrScalarRecord.dbd @@ -0,0 +1 @@ +registrar("pvdbcrScalarRecord") diff --git a/src/special/pvdbcrScalarRegister.dbd b/src/special/pvdbcrScalarRegister.dbd deleted file mode 100644 index 1202c71..0000000 --- a/src/special/pvdbcrScalarRegister.dbd +++ /dev/null @@ -1 +0,0 @@ -registrar("pvdbcrScalarRegister") diff --git a/src/special/pvdbcrTraceRecordRegister.cpp b/src/special/pvdbcrTraceRecord.cpp similarity index 97% rename from src/special/pvdbcrTraceRecordRegister.cpp rename to src/special/pvdbcrTraceRecord.cpp index 46c5e47..36122af 100644 --- a/src/special/pvdbcrTraceRecordRegister.cpp +++ b/src/special/pvdbcrTraceRecord.cpp @@ -114,7 +114,7 @@ static void pvdbcrTraceRecordCallFunc(const iocshArgBuf *args) if(!result) cout << "recordname " << recordName << " not added" << endl; } -static void pvdbcrTraceRecordRegister(void) +static void pvdbcrTraceRecord(void) { static int firstTime = 1; if (firstTime) { @@ -124,5 +124,5 @@ static void pvdbcrTraceRecordRegister(void) } extern "C" { - epicsExportRegistrar(pvdbcrTraceRecordRegister); + epicsExportRegistrar(pvdbcrTraceRecord); } diff --git a/src/special/pvdbcrTraceRecord.dbd b/src/special/pvdbcrTraceRecord.dbd new file mode 100644 index 0000000..4d4eff3 --- /dev/null +++ b/src/special/pvdbcrTraceRecord.dbd @@ -0,0 +1 @@ +registrar("pvdbcrTraceRecord") diff --git a/src/special/pvdbcrTraceRecordRegister.dbd b/src/special/pvdbcrTraceRecordRegister.dbd deleted file mode 100644 index c525320..0000000 --- a/src/special/pvdbcrTraceRecordRegister.dbd +++ /dev/null @@ -1 +0,0 @@ -registrar("pvdbcrTraceRecordRegister")