move all examples to separate top level build areas.

Documentation needs updating.

.hgignore

@@ -1,11 +1,11 @@
 ^QtC-
-^bin/
+bin/
-^lib/
+lib/
-^doc/
+doc/
-^include/
+include/
-^db/
+db/
-^dbd/
+dbd/
-^documentation/html
+documentation/html
 envPaths
 configure/.*\.local
 /O\..*

Makefile

@@ -6,10 +6,7 @@ DIRS += configure
 DIRS += src
 src_DEPEND_DIRS = configure
 
-DIRS += example
+DIRS += test
-test_DEPEND_DIRS = src
-
-DIRS += iocBoot
 
 include $(TOP)/configure/RULES_TOP
 

arrayPerformance/Makefile

@@ -0,0 +1,11 @@
+#Makefile at top of application tree
+TOP = .
+include $(TOP)/configure/CONFIG
+DIRS += configure
+
+DIRS += src
+src_DEPEND_DIRS = configure
+
+include $(TOP)/configure/RULES_TOP
+
+

arrayPerformance/configure/CONFIG

@@ -0,0 +1,29 @@
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
+
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)
+
+# RELEASE files point to other application tops
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+CONFIG = $(RULES)/configure
+include $(CONFIG)/CONFIG
+
+# Override the Base definition:
+INSTALL_LOCATION = $(TOP)
+
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+ -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+

arrayPerformance/configure/CONFIG_SITE

@@ -0,0 +1,39 @@
+# CONFIG_SITE
+
+# Make any application-specific changes to the EPICS build
+#   configuration variables in this file.
+#
+# Host/target specific settings can be specified in files named
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+#   CONFIG_SITE.Common.$(T_A)
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+# CHECK_RELEASE controls the consistency checking of the support
+#   applications pointed to by the RELEASE* files.
+# Normally CHECK_RELEASE should be set to YES.
+# Set CHECK_RELEASE to NO to disable checking completely.
+# Set CHECK_RELEASE to WARN to perform consistency checking but
+#   continue building anyway if conflicts are found.
+#CHECK_RELEASE = YES
+
+# Set this when you only want to compile this application
+#   for a subset of the cross-compiled target architectures
+#   that Base is built for.
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+
+# To install files into a location other than $(TOP) define
+#   INSTALL_LOCATION here.
+#INSTALL_LOCATION=</path/name/to/install/top>
+
+# Set this when your IOC and the host use different paths
+#   to access the application. This will be needed to boot
+#   from a Microsoft FTP server or with some NFS mounts.
+# You must rebuild in the iocBoot directory for this to
+#   take effect.
+#IOCS_APPL_TOP = </IOC/path/to/application/top>
+
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I $(INSTALL_LOCATION)/include
+
+-include $(TOP)/configure/CONFIG_SITE.local
+-include $(TOP)/../CONFIG.local

arrayPerformance/configure/Makefile

@@ -0,0 +1,8 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+
+TARGETS = $(CONFIG_TARGETS)
+CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
+
+include $(TOP)/configure/RULES

arrayPerformance/configure/RELEASE

@@ -0,0 +1,44 @@
+# RELEASE - Location of external support modules
+#
+# IF YOU MAKE ANY CHANGES to this file you must subsequently
+# do a "gnumake rebuild" in this application's top level
+# directory.
+#
+# The build process does not check dependencies against files
+# that are outside this application, thus you should do a
+# "gnumake rebuild" in the top level directory after EPICS_BASE
+# or any other external module pointed to below is rebuilt.
+#
+# Host- or target-specific settings can be given in files named
+#  RELEASE.$(EPICS_HOST_ARCH).Common
+#  RELEASE.Common.$(T_A)
+#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+#
+# This file should ONLY define paths to other support modules,
+# or include statements that pull in similar RELEASE files.
+# Build settings that are NOT module paths should appear in a
+# CONFIG_SITE file.
+
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+
+# If using the sequencer, point SNCSEQ at its top directory:
+#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
+
+# EPICS_BASE usually appears last so other apps can override stuff:
+
+# do not edit the locations in this file
+# create RELEASE.local with the paths to your EPICS_BASE, PVDATA, and PVACCESS
+# these default locations are needed for the BNL Jenkins server to work
+
+# Set RULES here if you want to take build rules from somewhere
+# other than EPICS_BASE:
+#RULES=/path/to/epics/support/module/rules/x-y
+
+# Leave these in for the Jenkins build at BNL to work
+EPICS_BASE=/home/install/epics/base
+PVDATA=/home/mrk/hg/pvDataCPP
+PVACCESS=/home/mrk/hg/pvAccessCPP
+
+# set your EPICS_BASE, PVDATA and PVACCESS paths in here
+-include $(TOP)/../RELEASE.local
+-include $(TOP)/configure/RELEASE.local

arrayPerformance/configure/RELEASE.local

@@ -0,0 +1,8 @@
+EPICS_BASE=/home/install/epics/base
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+EPICSV4HOME=/home/hg
+PVCOMMON=${EPICSV4HOME}/pvCommonCPP
+PVDATA=${EPICSV4HOME}/pvDataCPP
+PVACCESS=${EPICSV4HOME}/pvAccessCPP
+PVDATABASE=${EPICSV4HOME}/pvDatabaseCPP
+PVASRV=${EPICSV4HOME}/pvaSrv

arrayPerformance/configure/RULES

@@ -0,0 +1,6 @@
+# RULES
+
+include $(CONFIG)/RULES
+
+# Library should be rebuilt because LIBOBJS may have changed.
+$(LIBNAME): ../Makefile

arrayPerformance/configure/RULES.ioc

@@ -0,0 +1,2 @@
+#RULES.ioc
+include $(CONFIG)/RULES.ioc

arrayPerformance/configure/RULES_DIRS

@@ -0,0 +1,2 @@
+#RULES_DIRS
+include $(CONFIG)/RULES_DIRS

arrayPerformance/configure/RULES_TOP

@@ -0,0 +1,3 @@
+#RULES_TOP
+include $(CONFIG)/RULES_TOP
+

arrayPerformance/src/Makefile

@@ -1,7 +1,20 @@
-TOP=../..
+TOP = ..
-
 include $(TOP)/configure/CONFIG
 
+LIBRARY_IOC += pvDatabaseExample
+pvDatabaseExample_LIBS += $(EPICS_BASE_IOC_LIBS)
+pvDatabaseExample_LIBS += Com pvData pvAccess pvDatabase
+
+
+INC+= arrayPerformance.h
+LIBSRCS += arrayPerformance.cpp
+INC+= longArrayMonitor.h
+LIBSRCS += longArrayMonitor.cpp
+INC+= longArrayGet.h
+LIBSRCS += longArrayGet.cpp
+INC+= longArrayPut.h
+LIBSRCS += longArrayPut.cpp
+
 PROD_HOST += arrayPerformanceMain
 arrayPerformanceMain_SRCS += arrayPerformanceMain.cpp
 arrayPerformanceMain_LIBS += pvDatabase pvAccess pvData Com
@@ -28,8 +41,5 @@ vectorPerformanceMain_LIBS += pvDatabase pvAccess pvData Com
 vectorPerformanceMain_LIBS += pvDatabaseExample
 
 
-
 include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
 

example/Makefile

@@ -1,12 +0,0 @@
-TOP = ..
-include $(TOP)/configure/CONFIG
-DIRS += src
-DIRS += record
-DIRS += pvCopy
-DIRS += exampleCounter
-DIRS += exampleServer
-DIRS += examplePVADoubleArrayGet
-DIRS += arrayPerformance
-DIRS += v3IOC
-include $(TOP)/configure/RULES_DIRS
-

example/exampleCounter/Makefile

@@ -1,13 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_HOST += exampleCounterMain
-exampleCounterMain_SRCS += exampleCounterMain.cpp
-exampleCounterMain_LIBS += pvDatabase pvAccess pvData Com
-
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-

example/exampleCounter/exampleCounterMain.cpp

@@ -1,66 +0,0 @@
-/*ExampleCounterMain.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
- */
-
-/* Author: Marty Kraimer */
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-#include <iostream>
-
-#include <pv/standardField.h>
-#include <pv/standardPVField.h>
-#include <pv/exampleCounter.h>
-#include <pv/traceRecord.h>
-#include <pv/channelProviderLocal.h>
-#include <pv/serverContext.h>
-
-using namespace std;
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-
-int main(int argc,char *argv[])
-{
-    PVDatabasePtr master = PVDatabase::getMaster();
-    ChannelProviderLocalPtr channelProvider = getChannelProviderLocal();
-    PVRecordPtr pvRecord;
-    bool result(false);
-    String recordName;
-    recordName = "exampleCounter";
-    pvRecord = ExampleCounter::create(recordName);
-    result = master->addRecord(pvRecord);
-    cout << "result of addRecord " << recordName << " " << result << endl;
-    recordName = "traceRecordPGRPC";
-    pvRecord = TraceRecord::create(recordName);
-    result = master->addRecord(pvRecord);
-    if(!result) cout<< "record " << recordName << " not added" << endl;
-    pvRecord.reset();
-    ServerContext::shared_pointer pvaServer = 
-        startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
-    cout << "exampleCounter\n";
-    string str;
-    while(true) {
-        cout << "Type exit to stop: \n";
-        getline(cin,str);
-        if(str.compare("exit")==0) break;
-
-    }
-    pvaServer->shutdown();
-    epicsThreadSleep(1.0);
-    pvaServer->destroy();
-    channelProvider->destroy();
-    return 0;
-}
-

example/examplePVADoubleArrayGet/Makefile

@@ -1,14 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_HOST += examplePVADoubleArrayGetMain
-examplePVADoubleArrayGetMain_SRCS += examplePVADoubleArrayGetMain.cpp
-examplePVADoubleArrayGetMain_LIBS += pvDatabase pvAccess pvData Com
-examplePVADoubleArrayGetMain_LIBS += pvDatabaseExample
-
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-

example/examplePVADoubleArrayGet/examplePVADoubleArrayGetMain.cpp

@@ -1,80 +0,0 @@
-/*ExamplePVADoubleArrayGetMain.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
- */
-
-/* Author: Marty Kraimer */
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-#include <iostream>
-
-#include <pv/standardField.h>
-#include <pv/standardPVField.h>
-#include <pv/examplePVADoubleArrayGet.h>
-#include <pv/traceRecord.h>
-#include <pv/channelProviderLocal.h>
-#include <pv/serverContext.h>
-#include <pv/clientFactory.h>
-
-using namespace std;
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-
-static StandardPVFieldPtr standardPVField = getStandardPVField();
-
-int main(int argc,char *argv[])
-{
-    PVDatabasePtr master = PVDatabase::getMaster();
-    ClientFactory::start();
-    ChannelProviderLocalPtr channelProvider = getChannelProviderLocal();
-    PVRecordPtr pvRecord;
-    bool result(false);
-    String recordName;
-    PVStructurePtr pvStructure = standardPVField->scalarArray(
-        pvDouble,"alarm,timeStamp");
-    recordName = "doubleArray";
-    pvRecord = PVRecord::create(recordName,pvStructure);
-    result = master->addRecord(pvRecord);
-    if(!result) cout<< "record " << recordName << " not added" << endl;
-    ServerContext::shared_pointer serverContext = startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
-    recordName = "examplePVADoubleArrayGet";
-    if(argc>1) recordName = argv[1];
-    String providerName("local");
-    if(argc>2) providerName = argv[2];
-    String channelName("doubleArray");
-    if(argc>3) channelName = argv[3];
-    pvRecord = ExamplePVADoubleArrayGet::create(
-        recordName,providerName,channelName);
-    if(pvRecord!=NULL) {
-        result = master->addRecord(pvRecord);
-        cout << "result of addRecord " << recordName << " " << result << endl;
-    } else {
-        cout << "ExamplePVADoubleArrayGet::create failed" << endl;
-    }
-    string str;
-    while(true) {
-        cout << "Type exit to stop: \n";
-        getline(cin,str);
-        if(str.compare("exit")==0) break;
-
-    }
-    serverContext->shutdown();
-    epicsThreadSleep(1.0);
-    serverContext->destroy();
-    ClientFactory::stop();
-    channelProvider->destroy();
-    return 0;
-}
-

example/exampleServer/Makefile

@@ -1,12 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_HOST += exampleServerMain
-exampleServerMain_SRCS += exampleServerMain.cpp
-exampleServerMain_LIBS += pvDatabase pvDatabaseExample pvAccess pvData Com
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-

example/exampleServer/exampleServerMain.cpp

@@ -1,57 +0,0 @@
-/*exampleServerMain.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
- */
-
-/* Author: Marty Kraimer */
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-#include <vector>
-#include <iostream>
-
-#include <pv/channelProviderLocal.h>
-#include <pv/exampleServerCreateRecords.h>
-#include <pv/serverContext.h>
-
-using namespace std;
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-
-
-int main(int argc,char *argv[])
-{
-    PVDatabasePtr master = PVDatabase::getMaster();
-    ChannelProviderLocalPtr channelProvider = getChannelProviderLocal();
-    ExampleServerCreateRecords::create();
-    ServerContext::shared_pointer ctx =
-        startPVAServer(PVACCESS_ALL_PROVIDERS,0,true,true);
-    cout << "exampleServer\n";
-    PVStringArrayPtr pvNames = master->getRecordNames();
-    String buffer;
-    pvNames->toString(&buffer);
-    cout << "recordNames" << endl << buffer << endl;
-    string str;
-    while(true) {
-        cout << "Type exit to stop: \n";
-        getline(cin,str);
-        if(str.compare("exit")==0) break;
-
-    }
-    ctx->destroy();
-    epicsThreadSleep(1.0);
-    channelProvider->destroy();
-    return 0;
-}
-

example/record/Makefile

@@ -1,13 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_HOST += testExampleRecord
-testExampleRecord_SRCS += testExampleRecordMain.cpp
-testExampleRecord_LIBS += pvDatabase pvAccess pvData Com
-
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-

example/src/Makefile

@@ -1,33 +0,0 @@
-TOP = ../..
-include $(TOP)/configure/CONFIG
-
-EXAMPLESRC = $(TOP)/example/src/
-
-LIBRARY_IOC += pvDatabaseExample
-pvDatabaseExample_LIBS += $(EPICS_BASE_IOC_LIBS)
-pvDatabaseExample_LIBS += Com pvData pvAccess pvDatabase
-
-SRC_DIRS += $(EXAMPLESRC)/exampleCounter
-INC += exampleCounter.h
-
-SRC_DIRS += $(EXAMPLESRC)/exampleServer
-INC+= exampleServerCreateRecords.h
-LIBSRCS += exampleServerCreateRecords.cpp
-
-SRC_DIRS += $(EXAMPLESRC)/examplePVADoubleArrayGet
-INC+= examplePVADoubleArrayGet.h
-LIBSRCS += examplePVADoubleArrayGet.cpp
-
-SRC_DIRS += $(EXAMPLESRC)/arrayPerformance
-INC+= arrayPerformance.h
-LIBSRCS += arrayPerformance.cpp
-INC+= longArrayMonitor.h
-LIBSRCS += longArrayMonitor.cpp
-INC+= longArrayGet.h
-LIBSRCS += longArrayGet.cpp
-INC+= longArrayPut.h
-LIBSRCS += longArrayPut.cpp
-
-
-include $(TOP)/configure/RULES
-

example/src/exampleCounter/exampleCounter.h

@@ -1,92 +0,0 @@
-/* exampleCounter.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.02
- */
-#ifndef EXAMPLECOUNTER_H
-#define EXAMPLECOUNTER_H
-
-
-#include <pv/pvDatabase.h>
-#include <pv/standardPVField.h>
-#include <pv/timeStamp.h>
-#include <pv/pvTimeStamp.h>
-
-namespace epics { namespace pvDatabase { 
-
-
-class ExampleCounter;
-typedef std::tr1::shared_ptr<ExampleCounter> ExampleCounterPtr;
-
-class ExampleCounter :
-    public PVRecord
-{
-public:
-    POINTER_DEFINITIONS(ExampleCounter);
-    static ExampleCounterPtr create(
-        epics::pvData::String const & recordName);
-    virtual ~ExampleCounter();
-    virtual void destroy();
-    virtual bool init();
-    virtual void process();
-private:
-    ExampleCounter(epics::pvData::String const & recordName,
-        epics::pvData::PVStructurePtr const & pvStructure);
-    epics::pvData::PVLongPtr pvValue;
-    epics::pvData::PVTimeStamp pvTimeStamp;
-    epics::pvData::TimeStamp timeStamp;
-};
-
-ExampleCounterPtr ExampleCounter::create(
-    epics::pvData::String const & recordName)
-{
-    epics::pvData::PVStructurePtr pvStructure =
-       epics::pvData::getStandardPVField()->scalar(epics::pvData::pvLong,"timeStamp,alarm");
-    ExampleCounterPtr pvRecord(
-        new ExampleCounter(recordName,pvStructure));
-    if(!pvRecord->init()) pvRecord.reset();
-    return pvRecord;
-}
-
-ExampleCounter::ExampleCounter(
-    epics::pvData::String const & recordName,
-    epics::pvData::PVStructurePtr const & pvStructure)
-: PVRecord(recordName,pvStructure)
-{
-    pvTimeStamp.attach(pvStructure->getSubField("timeStamp"));
-}
-
-ExampleCounter::~ExampleCounter()
-{
-}
-
-void ExampleCounter::destroy()
-{
-    PVRecord::destroy();
-}
-
-bool ExampleCounter::init()
-{
-    
-    initPVRecord();
-    epics::pvData::PVFieldPtr pvField;
-    pvValue = getPVStructure()->getLongField("value");
-    if(pvValue.get()==NULL) return false;
-    return true;
-}
-
-void ExampleCounter::process()
-{
-    pvValue->put(pvValue->get() + 1.0);
-    timeStamp.getCurrent();
-    pvTimeStamp.set(timeStamp);
-}
-
-}}
-
-#endif  /* EXAMPLECOUNTER_H */

example/src/exampleServer/exampleServerCreateRecords.cpp

@@ -1,142 +0,0 @@
-/*exampleServerCreateRecords.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.07.24
- */
-
-/* Author: Marty Kraimer */
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-#include <vector>
-#include <iostream>
-
-#include <pv/standardField.h>
-#include <pv/standardPVField.h>
-#include <pv/powerSupplyRecordTest.h>
-#include <pv/channelProviderLocal.h>
-#include <pv/exampleCounter.h>
-#include <pv/recordList.h>
-#include <pv/traceRecord.h>
-#include <pv/exampleServerCreateRecords.h>
-
-using namespace std;
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-
-static FieldCreatePtr fieldCreate = getFieldCreate();
-static StandardFieldPtr standardField = getStandardField();
-static PVDataCreatePtr pvDataCreate = getPVDataCreate();
-static StandardPVFieldPtr standardPVField = getStandardPVField();
-
-static PVStructurePtr createPowerSupply()
-{
-    size_t nfields = 5;
-    StringArray names;
-    names.reserve(nfields);
-    FieldConstPtrArray powerSupply;
-    powerSupply.reserve(nfields);
-    names.push_back("alarm");
-    powerSupply.push_back(standardField->alarm());
-    names.push_back("timeStamp");
-    powerSupply.push_back(standardField->timeStamp());
-    String properties("alarm,display");
-    names.push_back("voltage");
-    powerSupply.push_back(standardField->scalar(pvDouble,properties));
-    names.push_back("power");
-    powerSupply.push_back(standardField->scalar(pvDouble,properties));
-    names.push_back("current");
-    powerSupply.push_back(standardField->scalar(pvDouble,properties));
-    return pvDataCreate->createPVStructure(
-            fieldCreate->createStructure(names,powerSupply));
-}
-
-static void createStructureArrayRecord(
-    PVDatabasePtr const &master,
-    ScalarType scalarType,
-    String const &recordName)
-{
-    StructureConstPtr structure = standardField->scalar(
-        pvDouble,
-        String("value,alarm,timeStamp"));
-    StringArray names(2);
-    FieldConstPtrArray fields(2);
-    names[0] = "timeStamp";
-    names[1] = "value";
-    fields[0] = standardField->timeStamp();
-    fields[1] = fieldCreate->createStructureArray(structure);
-    StructureConstPtr top = fieldCreate->createStructure(names,fields);
-    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(top);
-    PVRecordPtr pvRecord = PVRecord::create(recordName,pvStructure);
-    bool result = master->addRecord(pvRecord);
-    if(!result) cout<< "record " << recordName << " not added" << endl;
-}
-
-static void createRecords(
-    PVDatabasePtr const &master,
-    ScalarType scalarType,
-    String const &recordNamePrefix,
-    String const &properties)
-{
-    String recordName = recordNamePrefix;
-    PVStructurePtr pvStructure = standardPVField->scalar(scalarType,properties);
-    PVRecordPtr pvRecord = PVRecord::create(recordName,pvStructure);
-    bool result = master->addRecord(pvRecord);
-    if(!result) cout<< "record " << recordName << " not added" << endl;
-    recordName += "Array";
-    pvStructure = standardPVField->scalarArray(scalarType,properties);
-    pvRecord = PVRecord::create(recordName,pvStructure);
-    result = master->addRecord(pvRecord);
-}
-
-void ExampleServerCreateRecords::create()
-{
-    PVDatabasePtr master = PVDatabase::getMaster();
-    PVRecordPtr pvRecord;
-    String recordName;
-    bool result(false);
-    recordName = "traceRecordPGRPC";
-    pvRecord = TraceRecord::create(recordName);
-    result = master->addRecord(pvRecord);
-    if(!result) cout<< "record " << recordName << " not added" << endl;
-    String properties;
-    recordName = "exampleCounter";
-    pvRecord = ExampleCounter::create(recordName);
-    result = master->addRecord(pvRecord);
-    properties = "alarm,timeStamp";
-    createRecords(master,pvBoolean,"exampleBoolean",properties);
-    createRecords(master,pvByte,"exampleByte",properties);
-    createRecords(master,pvShort,"exampleShort",properties);
-    createRecords(master,pvInt,"exampleInt",properties);
-    createRecords(master,pvLong,"exampleLong",properties);
-    createRecords(master,pvFloat,"exampleFloat",properties);
-    createRecords(master,pvDouble,"exampleDouble",properties);
-    createRecords(master,pvString,"exampleString",properties);
-    createStructureArrayRecord(master,pvDouble,"exampleStructureArray");
-    recordName = "examplePowerSupply";
-    PVStructurePtr pvStructure = createPowerSupply();
-    PowerSupplyRecordTestPtr psr =
-        PowerSupplyRecordTest::create(recordName,pvStructure);
-    if(psr.get()==NULL) {
-        cout << "PowerSupplyRecordTest::create failed" << endl;
-        return;
-    }
-    result = master->addRecord(psr);
-    if(!result) cout<< "record " << recordName << " not added" << endl;
-    recordName = "laptoprecordListPGRPC";
-    pvRecord = RecordListRecord::create(recordName);
-    result = master->addRecord(pvRecord);
-    if(!result) cout<< "record " << recordName << " not added" << endl;
-}
-

example/src/exampleServer/exampleServerCreateRecords.h

@@ -1,27 +0,0 @@
-/* exampleServerCreateRecords.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.07.24
- */
-#ifndef EXAMPLESERVERCREATERECORDS_H
-#define EXAMPLESERVERCREATERECORDS_H
-
-
-#include <pv/pvDatabase.h>
-
-namespace epics { namespace pvDatabase { 
-
-class ExampleServerCreateRecords {
-public:
-    static void create();
-};
-
-
-}}
-
-#endif  /* EXAMPLESERVERCREATERECORDS_H */

example/v3IOC/Makefile

@@ -1,7 +0,0 @@
-TOP = ../..
-include $(TOP)/configure/CONFIG
-DIRS += exampleCounter
-DIRS += exampleServer
-DIRS += examplePVADoubleArrayGet
-include $(TOP)/configure/RULES_DIRS
-

example/v3IOC/exampleCounter/Db/Makefile

@@ -1,21 +0,0 @@
-TOP=../../../..
-include $(TOP)/configure/CONFIG
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-
-#----------------------------------------------------
-#  Optimization of db files using dbst (DEFAULT: NO)
-#DB_OPT = YES
-
-#----------------------------------------------------
-# Create and install (or just install)
-# databases, templates, substitutions like this
-DB += ai.db
-#----------------------------------------------------
-# If <anyname>.db template is not named <anyname>*.template add
-# <anyname>_TEMPLATE = <templatename>
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-

example/v3IOC/exampleCounter/src/Makefile

@@ -1,48 +0,0 @@
-TOP=../../../..
-
-include $(TOP)/configure/CONFIG
-#----------------------------------------
-#  ADD MACRO DEFINITIONS AFTER THIS LINE
-#=============================
-
-#==================================================
-# Build an IOC support library
-#
-
-DBD += exampleCounter.dbd
-
-LIBRARY_IOC += exampleCounterSupport
-exampleCounterSupport_SRCS += exampleCounter.cpp
-exampleCounterSupport_LIBS += pvData
-exampleCounterSupport_LIBS += pvAccess
-exampleCounterSupport_LIBS += pvDatabase
-exampleCounterSupport_LIBS += pvDatabaseExample
-exampleCounterSupport_LIBS += $(EPICS_BASE_IOC_LIBS)
-
-#=============================
-# build an ioc application
-
-PROD_IOC += exampleCounter
-
-
-# <name>_registerRecordDeviceDriver.cpp will be created from <name>.dbd
-exampleCounter_SRCS += exampleCounter_registerRecordDeviceDriver.cpp
-exampleCounter_SRCS_DEFAULT += exampleCounterMain.cpp
-exampleCounter_SRCS_vxWorks += -nil-
-
-
-# The following adds support from base/src/vxWorks
-exampleCounter_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
-
-exampleCounter_LIBS += pvData pvAccess
-exampleCounter_LIBS += pvDatabase
-exampleCounter_LIBS += pvDatabaseExample
-exampleCounter_LIBS += exampleCounterSupport
-exampleCounter_LIBS += $(EPICS_BASE_IOC_LIBS)
-
-#===========================
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-

example/v3IOC/exampleCounter/src/exampleCounterMain.cpp

@@ -1,31 +0,0 @@
-/* exampleCounterMain.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.07.24
- */
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "epicsExit.h"
-#include "epicsThread.h"
-#include "iocsh.h"
-
-int main(int argc,char *argv[])
-{
-    if(argc>=2) {    
-        iocsh(argv[1]);
-        epicsThreadSleep(.2);
-    }
-    iocsh(NULL);
-    epicsExit(0);
-    return(0);
-}

example/v3IOC/examplePVADoubleArrayGet/Db/ai.db

@@ -1,13 +0,0 @@
-record(ai, "$(name)")
-{
-	field(PREC, "1")
-	field(EGU, "amps")
-	field(HIHI, "8")
-	field(HIGH, "6")
-	field(LOW, "4")
-	field(LOLO, "2")
-	field(HHSV, "MAJOR")
-	field(HSV, "MINOR")
-	field(LSV, "MINOR")
-	field(LLSV, "MAJOR")
-}

example/v3IOC/examplePVADoubleArrayGet/Makefile

@@ -1,8 +0,0 @@
-TOP = ../../..
-include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
-include $(TOP)/configure/RULES_DIRS
-

example/v3IOC/exampleServer/src/exampleServer.cpp

@@ -1,60 +0,0 @@
-/*exampleServer.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.07.24
- */
-
-
-/* Author: Marty Kraimer */
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-
-#include <cantProceed.h>
-#include <epicsStdio.h>
-#include <epicsMutex.h>
-#include <epicsEvent.h>
-#include <epicsThread.h>
-#include <iocsh.h>
-
-#include <epicsExport.h>
-
-#include <pv/pvIntrospect.h>
-#include <pv/pvData.h>
-#include <pv/pvAccess.h>
-#include <pv/pvDatabase.h>
-#include <pv/exampleServerCreateRecords.h>
-
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvDatabase;
-
-static const iocshArg testArg0 = { "prefix", iocshArgString };
-static const iocshArg *testArgs[] = {
-    &testArg0};
-
-static const iocshFuncDef exampleServerFuncDef = {
-    "exampleServerCreateRecords", 1, testArgs};
-static void exampleServerCallFunc(const iocshArgBuf *args)
-{
-    ExampleServerCreateRecords::create();
-}
-
-static void exampleServerRegister(void)
-{
-    static int firstTime = 1;
-    if (firstTime) {
-        firstTime = 0;
-        iocshRegister(&exampleServerFuncDef, exampleServerCallFunc);
-    }
-}
-epicsExportRegistrar(exampleServerRegister);

exampleLink/Makefile

@@ -0,0 +1,16 @@
+#Makefile at top of application tree
+TOP = .
+include $(TOP)/configure/CONFIG
+DIRS += configure
+
+DIRS += src
+src_DEPEND_DIRS = configure
+
+DIRS += example
+test_DEPEND_DIRS = src
+
+DIRS += iocBoot
+
+include $(TOP)/configure/RULES_TOP
+
+

exampleLink/configure/CONFIG

@@ -0,0 +1,29 @@
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
+
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)
+
+# RELEASE files point to other application tops
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+CONFIG = $(RULES)/configure
+include $(CONFIG)/CONFIG
+
+# Override the Base definition:
+INSTALL_LOCATION = $(TOP)
+
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+ -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+

exampleLink/configure/CONFIG_SITE

@@ -0,0 +1,39 @@
+# CONFIG_SITE
+
+# Make any application-specific changes to the EPICS build
+#   configuration variables in this file.
+#
+# Host/target specific settings can be specified in files named
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+#   CONFIG_SITE.Common.$(T_A)
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+# CHECK_RELEASE controls the consistency checking of the support
+#   applications pointed to by the RELEASE* files.
+# Normally CHECK_RELEASE should be set to YES.
+# Set CHECK_RELEASE to NO to disable checking completely.
+# Set CHECK_RELEASE to WARN to perform consistency checking but
+#   continue building anyway if conflicts are found.
+#CHECK_RELEASE = YES
+
+# Set this when you only want to compile this application
+#   for a subset of the cross-compiled target architectures
+#   that Base is built for.
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+
+# To install files into a location other than $(TOP) define
+#   INSTALL_LOCATION here.
+#INSTALL_LOCATION=</path/name/to/install/top>
+
+# Set this when your IOC and the host use different paths
+#   to access the application. This will be needed to boot
+#   from a Microsoft FTP server or with some NFS mounts.
+# You must rebuild in the iocBoot directory for this to
+#   take effect.
+#IOCS_APPL_TOP = </IOC/path/to/application/top>
+
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I $(INSTALL_LOCATION)/include
+
+-include $(TOP)/configure/CONFIG_SITE.local
+-include $(TOP)/../CONFIG.local

exampleLink/configure/Makefile

@@ -0,0 +1,8 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+
+TARGETS = $(CONFIG_TARGETS)
+CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
+
+include $(TOP)/configure/RULES

exampleLink/configure/RELEASE

@@ -0,0 +1,44 @@
+# RELEASE - Location of external support modules
+#
+# IF YOU MAKE ANY CHANGES to this file you must subsequently
+# do a "gnumake rebuild" in this application's top level
+# directory.
+#
+# The build process does not check dependencies against files
+# that are outside this application, thus you should do a
+# "gnumake rebuild" in the top level directory after EPICS_BASE
+# or any other external module pointed to below is rebuilt.
+#
+# Host- or target-specific settings can be given in files named
+#  RELEASE.$(EPICS_HOST_ARCH).Common
+#  RELEASE.Common.$(T_A)
+#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+#
+# This file should ONLY define paths to other support modules,
+# or include statements that pull in similar RELEASE files.
+# Build settings that are NOT module paths should appear in a
+# CONFIG_SITE file.
+
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+
+# If using the sequencer, point SNCSEQ at its top directory:
+#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
+
+# EPICS_BASE usually appears last so other apps can override stuff:
+
+# do not edit the locations in this file
+# create RELEASE.local with the paths to your EPICS_BASE, PVDATA, and PVACCESS
+# these default locations are needed for the BNL Jenkins server to work
+
+# Set RULES here if you want to take build rules from somewhere
+# other than EPICS_BASE:
+#RULES=/path/to/epics/support/module/rules/x-y
+
+# Leave these in for the Jenkins build at BNL to work
+EPICS_BASE=/home/install/epics/base
+PVDATA=/home/mrk/hg/pvDataCPP
+PVACCESS=/home/mrk/hg/pvAccessCPP
+
+# set your EPICS_BASE, PVDATA and PVACCESS paths in here
+-include $(TOP)/../RELEASE.local
+-include $(TOP)/configure/RELEASE.local

exampleLink/configure/RELEASE.local

@@ -0,0 +1,8 @@
+EPICS_BASE=/home/install/epics/base
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+EPICSV4HOME=/home/hg
+PVCOMMON=${EPICSV4HOME}/pvCommonCPP
+PVDATA=${EPICSV4HOME}/pvDataCPP
+PVACCESS=${EPICSV4HOME}/pvAccessCPP
+PVDATABASE=${EPICSV4HOME}/pvDatabaseCPP
+PVASRV=${EPICSV4HOME}/pvaSrv

exampleLink/configure/RULES

@@ -0,0 +1,6 @@
+# RULES
+
+include $(CONFIG)/RULES
+
+# Library should be rebuilt because LIBOBJS may have changed.
+$(LIBNAME): ../Makefile

exampleLink/configure/RULES.ioc

@@ -0,0 +1,2 @@
+#RULES.ioc
+include $(CONFIG)/RULES.ioc

exampleLink/configure/RULES_DIRS

@@ -0,0 +1,2 @@
+#RULES_DIRS
+include $(CONFIG)/RULES_DIRS

exampleLink/configure/RULES_TOP

@@ -0,0 +1,3 @@
+#RULES_TOP
+include $(CONFIG)/RULES_TOP
+

exampleLink/example/Db/Makefile

@@ -1,4 +1,4 @@
-TOP=../../../..
+TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE

exampleLink/example/Makefile

@@ -1,4 +1,4 @@
-TOP = ../../..
+TOP = ..
 include $(TOP)/configure/CONFIG
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))

exampleLink/example/src/Makefile

@@ -1,4 +1,4 @@
-TOP=../../../..
+TOP=../..
 
 include $(TOP)/configure/CONFIG
 #----------------------------------------
@@ -9,19 +9,12 @@ include $(TOP)/configure/CONFIG
 # Build an IOC support library
 #
 
-DBD += examplePVADoubleArrayGet.dbd
-
-LIBRARY_IOC += examplePVADoubleArrayGetSupport
-examplePVADoubleArrayGetSupport_SRCS += examplePVADoubleArrayGet.cpp
-examplePVADoubleArrayGetSupport_LIBS += pvData
-examplePVADoubleArrayGetSupport_LIBS += pvAccess
-examplePVADoubleArrayGetSupport_LIBS += pvDatabase
-examplePVADoubleArrayGetSupport_LIBS += pvDatabaseExample
-examplePVADoubleArrayGetSupport_LIBS += $(EPICS_BASE_IOC_LIBS)
-
 #=============================
 # build an ioc application
 
+
+DBD += examplePVADoubleArrayGet.dbd
+
 PROD_IOC += examplePVADoubleArrayGet
 
 
@@ -36,7 +29,6 @@ examplePVADoubleArrayGet_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
 examplePVADoubleArrayGet_LIBS += pvData pvAccess
 examplePVADoubleArrayGet_LIBS += pvDatabase
-examplePVADoubleArrayGet_LIBS += pvDatabaseExample
 examplePVADoubleArrayGet_LIBS += examplePVADoubleArrayGetSupport
 examplePVADoubleArrayGet_LIBS += $(EPICS_BASE_IOC_LIBS)
 

exampleLink/src/Makefile

@@ -0,0 +1,29 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
+
+#==================================================
+# Build an IOC support library
+#
+
+DBD += examplePVADoubleArrayGet.dbd
+
+INC += examplePVADoubleArrayGet.h
+
+LIBRARY_IOC += examplePVADoubleArrayGetSupport
+examplePVADoubleArrayGetSupport_SRCS += examplePVADoubleArrayGet.cpp
+examplePVADoubleArrayGetSupport_SRCS += examplePVADoubleArrayGetRegister.cpp
+examplePVADoubleArrayGetSupport_LIBS += pvData
+examplePVADoubleArrayGetSupport_LIBS += pvAccess
+examplePVADoubleArrayGetSupport_LIBS += pvDatabase
+examplePVADoubleArrayGetSupport_LIBS += $(EPICS_BASE_IOC_LIBS)
+
+#===========================
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
+

exampleLink/src/examplePVADoubleArrayGetInclude.dbd

@@ -1,4 +1,5 @@
 include "base.dbd"
 include "PVAServerRegister.dbd"
+include "PVAClientRegister.dbd"
 include "registerChannelProviderLocal.dbd"
-registrar("exampleCounterRegister")
+registrar("examplePVADoubleArrayGetRegister")

exampleServer/Makefile

@@ -0,0 +1,16 @@
+#Makefile at top of application tree
+TOP = .
+include $(TOP)/configure/CONFIG
+DIRS += configure
+
+DIRS += src
+src_DEPEND_DIRS = configure
+
+DIRS += example
+test_DEPEND_DIRS = src
+
+DIRS += iocBoot
+
+include $(TOP)/configure/RULES_TOP
+
+

exampleServer/configure/CONFIG

@@ -0,0 +1,29 @@
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
+
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)
+
+# RELEASE files point to other application tops
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+CONFIG = $(RULES)/configure
+include $(CONFIG)/CONFIG
+
+# Override the Base definition:
+INSTALL_LOCATION = $(TOP)
+
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+ -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+

exampleServer/configure/CONFIG_SITE

@@ -0,0 +1,39 @@
+# CONFIG_SITE
+
+# Make any application-specific changes to the EPICS build
+#   configuration variables in this file.
+#
+# Host/target specific settings can be specified in files named
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+#   CONFIG_SITE.Common.$(T_A)
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+# CHECK_RELEASE controls the consistency checking of the support
+#   applications pointed to by the RELEASE* files.
+# Normally CHECK_RELEASE should be set to YES.
+# Set CHECK_RELEASE to NO to disable checking completely.
+# Set CHECK_RELEASE to WARN to perform consistency checking but
+#   continue building anyway if conflicts are found.
+#CHECK_RELEASE = YES
+
+# Set this when you only want to compile this application
+#   for a subset of the cross-compiled target architectures
+#   that Base is built for.
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+
+# To install files into a location other than $(TOP) define
+#   INSTALL_LOCATION here.
+#INSTALL_LOCATION=</path/name/to/install/top>
+
+# Set this when your IOC and the host use different paths
+#   to access the application. This will be needed to boot
+#   from a Microsoft FTP server or with some NFS mounts.
+# You must rebuild in the iocBoot directory for this to
+#   take effect.
+#IOCS_APPL_TOP = </IOC/path/to/application/top>
+
+INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
+USR_INCLUDES += -I $(INSTALL_LOCATION)/include
+
+-include $(TOP)/configure/CONFIG_SITE.local
+-include $(TOP)/../CONFIG.local

exampleServer/configure/Makefile

@@ -0,0 +1,8 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+
+TARGETS = $(CONFIG_TARGETS)
+CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
+
+include $(TOP)/configure/RULES

exampleServer/configure/RELEASE

@@ -0,0 +1,44 @@
+# RELEASE - Location of external support modules
+#
+# IF YOU MAKE ANY CHANGES to this file you must subsequently
+# do a "gnumake rebuild" in this application's top level
+# directory.
+#
+# The build process does not check dependencies against files
+# that are outside this application, thus you should do a
+# "gnumake rebuild" in the top level directory after EPICS_BASE
+# or any other external module pointed to below is rebuilt.
+#
+# Host- or target-specific settings can be given in files named
+#  RELEASE.$(EPICS_HOST_ARCH).Common
+#  RELEASE.Common.$(T_A)
+#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+#
+# This file should ONLY define paths to other support modules,
+# or include statements that pull in similar RELEASE files.
+# Build settings that are NOT module paths should appear in a
+# CONFIG_SITE file.
+
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+
+# If using the sequencer, point SNCSEQ at its top directory:
+#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq
+
+# EPICS_BASE usually appears last so other apps can override stuff:
+
+# do not edit the locations in this file
+# create RELEASE.local with the paths to your EPICS_BASE, PVDATA, and PVACCESS
+# these default locations are needed for the BNL Jenkins server to work
+
+# Set RULES here if you want to take build rules from somewhere
+# other than EPICS_BASE:
+#RULES=/path/to/epics/support/module/rules/x-y
+
+# Leave these in for the Jenkins build at BNL to work
+EPICS_BASE=/home/install/epics/base
+PVDATA=/home/mrk/hg/pvDataCPP
+PVACCESS=/home/mrk/hg/pvAccessCPP
+
+# set your EPICS_BASE, PVDATA and PVACCESS paths in here
+-include $(TOP)/../RELEASE.local
+-include $(TOP)/configure/RELEASE.local

exampleServer/configure/RELEASE.local

@@ -0,0 +1,8 @@
+EPICS_BASE=/home/install/epics/base
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+EPICSV4HOME=/home/hg
+PVCOMMON=${EPICSV4HOME}/pvCommonCPP
+PVDATA=${EPICSV4HOME}/pvDataCPP
+PVACCESS=${EPICSV4HOME}/pvAccessCPP
+PVDATABASE=${EPICSV4HOME}/pvDatabaseCPP
+PVASRV=${EPICSV4HOME}/pvaSrv

exampleServer/configure/RULES

@@ -0,0 +1,6 @@
+# RULES
+
+include $(CONFIG)/RULES
+
+# Library should be rebuilt because LIBOBJS may have changed.
+$(LIBNAME): ../Makefile

exampleServer/configure/RULES.ioc

@@ -0,0 +1,2 @@
+#RULES.ioc
+include $(CONFIG)/RULES.ioc

exampleServer/configure/RULES_DIRS

@@ -0,0 +1,2 @@
+#RULES_DIRS
+include $(CONFIG)/RULES_DIRS

exampleServer/configure/RULES_TOP

@@ -0,0 +1,3 @@
+#RULES_TOP
+include $(CONFIG)/RULES_TOP
+

exampleServer/example/Db/Makefile

@@ -1,4 +1,4 @@
-TOP=../../../..
+TOP=../..
 include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS AFTER THIS LINE

exampleServer/example/Makefile

@@ -1,4 +1,4 @@
-TOP = ../../..
+TOP = ..
 include $(TOP)/configure/CONFIG
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))

exampleServer/example/src/Makefile

@@ -1,4 +1,4 @@
-TOP=../../../..
+TOP=../..
 
 include $(TOP)/configure/CONFIG
 #----------------------------------------
@@ -11,14 +11,6 @@ include $(TOP)/configure/CONFIG
 
 DBD += exampleServer.dbd
 
-LIBRARY_IOC += exampleServerSupport
-exampleServerSupport_SRCS += exampleServer.cpp
-exampleServerSupport_LIBS += pvData
-exampleServerSupport_LIBS += pvAccess
-exampleServerSupport_LIBS += pvDatabase
-exampleServerSupport_LIBS += pvDatabaseExample
-exampleServerSupport_LIBS += $(EPICS_BASE_IOC_LIBS)
-
 #=============================
 # build an ioc application
 
@@ -36,7 +28,7 @@ exampleServer_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
 exampleServer_LIBS += pvData pvAccess
 exampleServer_LIBS += pvDatabase
-exampleServer_LIBS += pvDatabaseExample
+exampleServer_LIBS += pvaSrv
 exampleServer_LIBS += exampleServerSupport
 exampleServer_LIBS += $(EPICS_BASE_IOC_LIBS)
 

exampleServer/example/src/exampleServerInclude.dbd

@@ -1,4 +1,5 @@
 include "base.dbd"
 include "PVAServerRegister.dbd"
 include "registerChannelProviderLocal.dbd"
-registrar("exampleServerRegister")
+include "dbPv.dbd"
+include "exampleServer.dbd"

exampleServer/iocBoot/Makefile

@@ -0,0 +1,7 @@
+TOP = ..
+include $(TOP)/configure/CONFIG
+DIRS += $(wildcard *ioc*)
+DIRS += $(wildcard as*)
+DIRS += $(wildcard example*)
+include $(EPICS_BASE)/configure/RULES_DIRS
+

exampleServer/iocBoot/exampleServer/st.cmd

@@ -0,0 +1,23 @@
+< envPaths
+
+cd ${TOP}
+
+## Register all support components
+dbLoadDatabase("dbd/exampleServer.dbd")
+exampleServer_registerRecordDeviceDriver(pdbbase)
+
+## Load record instances
+dbLoadRecords("db/dbScalar.db","name=pvdouble,type=ao")
+dbLoadRecords("db/dbArray.db","name=pvdoubleArray,type=DOUBLE")
+dbLoadRecords("db/dbStringArray.db","name=pvstringArray")
+dbLoadRecords("db/dbEnum.db","name=pvenum")
+dbLoadRecords("db/dbCounter.db","name=pvcounter");
+
+cd ${TOP}/iocBoot/${IOC}
+iocInit()
+dbl
+epicsThreadSleep(1.0)
+exampleServerCreateRecord pvaServer
+startPVAServer
+pvdbl
+

exampleServer/src/Makefile

@@ -0,0 +1,29 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
+
+#==================================================
+# Build an IOC support library
+#
+
+DBD += exampleServer.dbd
+
+INC += exampleServer.h
+
+LIBRARY_IOC += exampleServerSupport
+exampleServerSupport_SRCS += exampleServer.cpp
+exampleServerSupport_SRCS += exampleServerRegister.cpp
+exampleServerSupport_LIBS += pvData
+exampleServerSupport_LIBS += pvAccess
+exampleServerSupport_LIBS += pvDatabase
+exampleServerSupport_LIBS += $(EPICS_BASE_IOC_LIBS)
+
+#===========================
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
+

exampleServer/src/exampleServer.cpp

@@ -0,0 +1,79 @@
+/* exampleServer.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.02
+ */
+
+#include <pv/standardPVField.h>
+#include <pv/exampleServer.h>
+
+namespace epics { namespace exampleServer { 
+using namespace epics::pvData;
+using namespace epics::pvDatabase;
+using std::tr1::static_pointer_cast;
+
+
+ExampleServerPtr ExampleServer::create(
+    String const & recordName)
+{
+    StandardPVFieldPtr standardPVField = getStandardPVField();
+    PVDataCreatePtr pvDataCreate = getPVDataCreate();
+    PVStructurePtr pvArgument = standardPVField->scalar(pvString,"");
+    PVStructurePtr pvResult = standardPVField->scalar(pvString,"timeStamp");
+    StringArray names;
+    names.reserve(2);
+    PVFieldPtrArray fields;
+    fields.reserve(2);
+    names.push_back("argument");
+    fields.push_back(pvArgument);
+    names.push_back("result");
+    fields.push_back(pvResult);
+    PVStructurePtr pvStructure = pvDataCreate->createPVStructure(names,fields);
+    ExampleServerPtr pvRecord(
+        new ExampleServer(recordName,pvStructure));
+    if(!pvRecord->init()) pvRecord.reset();
+    return pvRecord;
+}
+
+ExampleServer::ExampleServer(
+    String const & recordName,
+    PVStructurePtr const & pvStructure)
+: PVRecord(recordName,pvStructure)
+{
+}
+
+ExampleServer::~ExampleServer()
+{
+}
+
+void ExampleServer::destroy()
+{
+    PVRecord::destroy();
+}
+
+bool ExampleServer::init()
+{
+    
+    initPVRecord();
+    PVFieldPtr pvField;
+    pvArgumentValue = getPVStructure()->getStringField("argument.value");
+    if(pvArgumentValue.get()==NULL) return false;
+    pvResultValue = getPVStructure()->getStringField("result.value");
+    if(pvResultValue.get()==NULL) return false;
+    pvTimeStamp.attach(getPVStructure()->getSubField("result.timeStamp"));
+    return true;
+}
+
+void ExampleServer::process()
+{
+    pvResultValue->put(String("Hello ") + pvArgumentValue->get());
+    timeStamp.getCurrent();
+    pvTimeStamp.set(timeStamp);
+}
+
+}}

exampleServer/src/exampleServer.h

@@ -0,0 +1,49 @@
+/* exampleServer.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.02
+ */
+#ifndef EXAMPLECOUNTER_H
+#define EXAMPLECOUNTER_H
+
+
+#include <pv/pvDatabase.h>
+#include <pv/timeStamp.h>
+#include <pv/pvTimeStamp.h>
+
+namespace epics { namespace exampleServer { 
+
+
+class ExampleServer;
+typedef std::tr1::shared_ptr<ExampleServer> ExampleServerPtr;
+
+class ExampleServer :
+    public epics::pvDatabase::PVRecord
+{
+public:
+    POINTER_DEFINITIONS(ExampleServer);
+    static ExampleServerPtr create(
+        epics::pvData::String const & recordName);
+    virtual ~ExampleServer();
+    virtual void destroy();
+    virtual bool init();
+    virtual void process();
+private:
+    ExampleServer(epics::pvData::String const & recordName,
+        epics::pvData::PVStructurePtr const & pvStructure);
+
+    epics::pvData::PVStringPtr pvArgumentValue;
+    epics::pvData::PVStringPtr pvResultValue;
+    epics::pvData::PVTimeStamp pvTimeStamp;
+    epics::pvData::TimeStamp timeStamp;
+};
+
+
+}}
+
+#endif  /* EXAMPLECOUNTER_H */

exampleServer/src/exampleServerInclude.dbd

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

exampleServer/src/exampleServerRegister.cpp

@@ -1,4 +1,4 @@
-/*exampleCounter.cpp */
+/*exampleServerRegister.cpp */
 /**
  * Copyright - See the COPYRIGHT that is included with this distribution.
  * EPICS pvData is distributed subject to a Software License Agreement found
@@ -33,11 +33,12 @@
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-#include <pv/exampleCounter.h>
+#include <pv/exampleServer.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;
 using namespace epics::pvDatabase;
+using namespace epics::exampleServer;
 using std::cout;
 using std::endl;
 
@@ -45,22 +46,22 @@ static const iocshArg testArg0 = { "recordName", iocshArgString };
 static const iocshArg *testArgs[] = {
     &testArg0};
 
-static const iocshFuncDef exampleCounterFuncDef = {
+static const iocshFuncDef exampleServerFuncDef = {
-    "exampleCounterCreateRecord", 1, testArgs};
+    "exampleServerCreateRecord", 1, testArgs};
-static void exampleCounterCallFunc(const iocshArgBuf *args)
+static void exampleServerCallFunc(const iocshArgBuf *args)
 {
     char *recordName = args[0].sval;
-    ExampleCounterPtr record = ExampleCounter::create(recordName);
+    ExampleServerPtr record = ExampleServer::create(recordName);
     bool result = PVDatabase::getMaster()->addRecord(record);
     if(!result) cout << "recordname" << " not added" << endl;
 }
 
-static void exampleCounterRegister(void)
+static void exampleServerRegister(void)
 {
     static int firstTime = 1;
     if (firstTime) {
         firstTime = 0;
-        iocshRegister(&exampleCounterFuncDef, exampleCounterCallFunc);
+        iocshRegister(&exampleServerFuncDef, exampleServerCallFunc);
     }
 }
-epicsExportRegistrar(exampleCounterRegister);
+epicsExportRegistrar(exampleServerRegister);