pvDatabaseCPP/src/V3IOC/* has been moved to pvAccessCPP; epicsShare has been added.

This commit is contained in:
Marty Kraimer
2014-02-13 07:06:14 -05:00
parent 51f4820c24
commit 53c3901099
15 changed files with 54 additions and 29 deletions

View File

@ -11,6 +11,8 @@
#ifndef ARRAYPERFORMANCE_H
#define ARRAYPERFORMANCE_H
#include <shareLib.h>
#include <epicsThread.h>
#include <pv/standardPVField.h>
#include <pv/timeStamp.h>
@ -25,7 +27,7 @@ typedef std::tr1::shared_ptr<ArrayPerformance> ArrayPerformancePtr;
class ArrayPerformanceThread;
typedef std::tr1::shared_ptr<ArrayPerformanceThread> ArrayPerformanceThreadPtr;
class ArrayPerformance :
class epicsShareClass ArrayPerformance :
public PVRecord
{
public:
@ -54,7 +56,7 @@ private:
friend class ArrayPerformanceThread;
};
class ArrayPerformanceThread :
class epicsShareClass ArrayPerformanceThread :
public epicsThreadRunable
{
public:

View File

@ -11,6 +11,8 @@
#ifndef LONGARRAYGET_H
#define LONGARRAYGET_H
#include <shareLib.h>
#include <pv/event.h>
#include <pv/lock.h>
#include <pv/standardPVField.h>
@ -28,7 +30,7 @@ typedef std::tr1::shared_ptr<LongArrayGet> LongArrayGetPtr;
class LongArrayChannelGet;
typedef std::tr1::shared_ptr<LongArrayChannelGet> LongArrayChannelGetPtr;
class LongArrayGet :
class epicsShareClass LongArrayGet :
public std::tr1::enable_shared_from_this<LongArrayGet>
{
public:

View File

@ -11,6 +11,8 @@
#ifndef LONGARRAYMONITOR_H
#define LONGARRAYMONITOR_H
#include <shareLib.h>
#include <pv/event.h>
#include <pv/lock.h>
#include <pv/standardPVField.h>
@ -30,7 +32,7 @@ typedef std::tr1::shared_ptr<LAMChannelRequester> LAMChannelRequesterPtr;
class LAMMonitorRequester;
typedef std::tr1::shared_ptr<LAMMonitorRequester> LAMMonitorRequesterPtr;
class LongArrayMonitor :
class epicsShareClass LongArrayMonitor :
public std::tr1::enable_shared_from_this<LongArrayMonitor>
{
public:

View File

@ -11,6 +11,8 @@
#ifndef LONGARRAYPUT_H
#define LONGARRAYPUT_H
#include <shareLib.h>
#include <pv/event.h>
#include <pv/lock.h>
#include <pv/standardPVField.h>
@ -28,7 +30,7 @@ typedef std::tr1::shared_ptr<LongArrayPut> LongArrayPutPtr;
class LongArrayChannelPut;
typedef std::tr1::shared_ptr<LongArrayChannelPut> LongArrayChannelPutPtr;
class LongArrayPut :
class epicsShareClass LongArrayPut :
public std::tr1::enable_shared_from_this<LongArrayPut>
{
public:

View File

@ -11,12 +11,13 @@
#ifndef EXAMPLEDATABASE_H
#define EXAMPLEDATABASE_H
#include <shareLib.h>
#include <pv/pvDatabase.h>
namespace epics { namespace pvDatabase {
class ExampleDatabase{
class epicsShareClass ExampleDatabase{
public:
static void create();
};

View File

@ -11,6 +11,7 @@
#ifndef EXAMPLEPVADOUBLEARRAYGET_H
#define EXAMPLEPVADOUBLEARRAYGET_H
#include <shareLib.h>
#include <pv/timeStamp.h>
#include <pv/pvTimeStamp.h>
@ -27,7 +28,7 @@ namespace epics { namespace pvDatabase {
class ExampleLink;
typedef std::tr1::shared_ptr<ExampleLink> ExampleLinkPtr;
class ExampleLink :
class epicsShareClass ExampleLink :
public PVRecord,
public epics::pvAccess::ChannelRequester,
public epics::pvAccess::ChannelGetRequester

View File

@ -11,6 +11,7 @@
#ifndef EXAMPLECOUNTER_H
#define EXAMPLECOUNTER_H
#include <shareLib.h>
#include <pv/pvDatabase.h>
#include <pv/timeStamp.h>
@ -22,7 +23,7 @@ namespace epics { namespace exampleServer {
class ExampleServer;
typedef std::tr1::shared_ptr<ExampleServer> ExampleServerPtr;
class ExampleServer :
class epicsShareClass ExampleServer :
public epics::pvDatabase::PVRecord
{
public:

View File

@ -15,6 +15,8 @@
#include <map>
#include <deque>
#include <shareLib.h>
#include <pv/pvData.h>
#include <pv/convert.h>
@ -45,7 +47,7 @@ typedef std::tr1::shared_ptr<PVDatabase> PVDatabasePtr;
* Base interface for a record.
* @author mrk
*/
class PVRecord :
class epicsShareClass PVRecord :
public std::tr1::enable_shared_from_this<PVRecord>
{
public:
@ -234,7 +236,7 @@ private:
* One exists for each field of the top level PVStructure.
* @author mrk
*/
class PVRecordField :
class epicsShareClass PVRecordField :
public virtual epics::pvData::PostHandler,
public std::tr1::enable_shared_from_this<PVRecordField>
{
@ -329,7 +331,7 @@ private:
* One exists for each structure field of the top level PVStructure.
* @author mrk
*/
class PVRecordStructure : public PVRecordField {
class epicsShareClass PVRecordStructure : public PVRecordField {
public:
POINTER_DEFINITIONS(PVRecordStructure);
/**
@ -384,7 +386,7 @@ private:
* An interface that must be implemented by any code that accesses the record.
* @author mrk
*/
class PVRecordClient {
class epicsShareClass PVRecordClient {
public:
POINTER_DEFINITIONS(PVRecordClient);
/**
@ -402,7 +404,7 @@ public:
* An interface that is implemented by code that traps calls to PVRecord::message.
* @author mrk
*/
class PVListener :
class epicsShareClass PVListener :
virtual public PVRecordClient
{
public:
@ -446,7 +448,7 @@ public:
* The interface to a database of PVRecords.
* @author mrk
*/
class PVDatabase {
class epicsShareClass PVDatabase {
public:
POINTER_DEFINITIONS(PVDatabase);
/**

View File

@ -16,6 +16,8 @@
#include <memory>
#include <set>
#include <shareLib.h>
#include <pv/lock.h>
#include <pv/pvType.h>
#include <pv/pvData.h>
@ -40,9 +42,9 @@ typedef std::tr1::shared_ptr<ChannelProviderLocal> ChannelProviderLocalPtr;
class ChannelLocal;
typedef std::tr1::shared_ptr<ChannelLocal> ChannelLocalPtr;
extern MonitorFactoryPtr getMonitorFactory();
epicsShareExtern MonitorFactoryPtr getMonitorFactory();
class MonitorFactory
class epicsShareClass MonitorFactory
{
public:
POINTER_DEFINITIONS(MonitorFactory);
@ -66,9 +68,9 @@ private:
};
extern ChannelProviderLocalPtr getChannelProviderLocal();
epicsShareExtern ChannelProviderLocalPtr getChannelProviderLocal();
class ChannelProviderLocal :
class epicsShareClass ChannelProviderLocal :
public epics::pvAccess::ChannelProvider,
public std::tr1::enable_shared_from_this<ChannelProviderLocal>
{
@ -103,7 +105,7 @@ private:
friend class ChannelProviderLocalRun;
};
class ChannelLocal :
class epicsShareClass ChannelLocal :
public epics::pvAccess::Channel,
public PVRecordClient,
public std::tr1::enable_shared_from_this<ChannelLocal>

View File

@ -11,6 +11,8 @@
#ifndef MONITORALGORITHM_H
#define MONITORALGORITHM_H
#include <shareLib.h>
#include <pv/pvCopy.h>
namespace epics { namespace pvDatabase {
@ -20,7 +22,7 @@ typedef std::tr1::shared_ptr<MonitorAlgorithm> MonitorAlgorithmPtr;
class MonitorAlgorithmCreate;
typedef std::tr1::shared_ptr<MonitorAlgorithmCreate> MonitorAlgorithmCreatePtr;
class MonitorAlgorithm
class epicsShareClass MonitorAlgorithm
{
public:
POINTER_DEFINITIONS(MonitorAlgorithm);
@ -35,7 +37,7 @@ protected:
epics::pvData::String algorithmName;
};
class MonitorAlgorithmCreate
class epicsShareClass MonitorAlgorithmCreate
{
public:
POINTER_DEFINITIONS(MonitorAlgorithmCreate);

View File

@ -14,6 +14,8 @@
#include <stdexcept>
#include <memory>
#include <shareLib.h>
#include <pv/pvAccess.h>
#include <pv/pvDatabase.h>
@ -34,7 +36,7 @@ struct CopyStructureNode;
typedef std::tr1::shared_ptr<CopyStructureNode> CopyStructureNodePtr;
class PVCopy :
class epicsShareClass PVCopy :
public std::tr1::enable_shared_from_this<PVCopy>
{
public:
@ -146,7 +148,7 @@ private:
};
class PVCopyMonitor :
class epicsShareClass PVCopyMonitor :
public PVListener,
public std::tr1::enable_shared_from_this<PVCopyMonitor>
{
@ -197,7 +199,7 @@ private:
epics::pvData::Mutex mutex;
};
class PVCopyMonitorRequester
class epicsShareClass PVCopyMonitorRequester
{
public:
POINTER_DEFINITIONS(PVCopyMonitorRequester);

View File

@ -25,6 +25,7 @@
#include <epicsEvent.h>
#include <epicsThread.h>
#include <iocsh.h>
#include <shareLib.h>
#include <epicsExport.h>
@ -41,7 +42,7 @@ using namespace epics::pvDatabase;
static const iocshFuncDef pvdblFuncDef = {
"pvdbl", 0, 0
};
extern "C" void pvdbl(const iocshArgBuf *args)
extern "C" void epicsShareAPI pvdbl(const iocshArgBuf *args)
{
PVDatabasePtr master = PVDatabase::getMaster();
PVStringArrayPtr pvNames = master->getRecordNames();

View File

@ -11,15 +11,16 @@
#ifndef RECORDLIST_H
#define RECORDLIST_H
#include <shareLib.h>
#include <pv/pvDatabase.h>
namespace epics { namespace pvDatabase {
class RecordListRecord;
typedef std::tr1::shared_ptr<RecordListRecord> RecordListRecordPtr;
class RecordListRecord :
class epicsShareClass RecordListRecord :
public PVRecord
{
public:

View File

@ -11,6 +11,8 @@
#ifndef TRACERECORD_H
#define TRACERECORD_H
#include <shareLib.h>
#include <pv/channelProviderLocal.h>
namespace epics { namespace pvDatabase {
@ -19,7 +21,7 @@ namespace epics { namespace pvDatabase {
class TraceRecord;
typedef std::tr1::shared_ptr<TraceRecord> TraceRecordPtr;
class TraceRecord :
class epicsShareClass TraceRecord :
public PVRecord
{
public:

View File

@ -11,6 +11,8 @@
#ifndef POWERSUPPLY_H
#define POWERSUPPLY_H
#include <shareLib.h>
#include <pv/pvDatabase.h>
#include <pv/timeStamp.h>
#include <pv/alarm.h>
@ -19,7 +21,7 @@
namespace epics { namespace pvDatabase {
extern epics::pvData::PVStructurePtr createPowerSupply();
epicsShareExtern epics::pvData::PVStructurePtr createPowerSupply();
class PowerSupply;
typedef std::tr1::shared_ptr<PowerSupply> PowerSupplyPtr;