EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

reorganize build

Browse Source
This commit is contained in:
Michael Davidsaver
2017-11-27 16:45:29 -06:00
parent b05f6040f6
commit e69f99c57e
10 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
testApp/utilities.cpp → common/utilities.cpp
View File

20
testApp/utilities.h → common/utilities.h
View File

@ -56,7 +56,7 @@ struct ScalarAccessor {
}
};
struct epicsShareClass TestChannelRequester : public epics::pvAccess::ChannelRequester
struct TestChannelRequester : public epics::pvAccess::ChannelRequester
{
POINTER_DEFINITIONS(TestChannelRequester);
DUMBREQUESTER(TestChannelRequester)
@ -74,7 +74,7 @@ struct epicsShareClass TestChannelRequester : public epics::pvAccess::ChannelReq
bool waitForConnect();
};
struct epicsShareClass TestChannelFieldRequester : public epics::pvAccess::GetFieldRequester
struct TestChannelFieldRequester : public epics::pvAccess::GetFieldRequester
{
POINTER_DEFINITIONS(TestChannelFieldRequester);
DUMBREQUESTER(TestChannelFieldRequester)
@ -96,7 +96,7 @@ struct epicsShareClass TestChannelFieldRequester : public epics::pvAccess::GetFi
}
};
struct epicsShareClass TestChannelGetRequester : public epics::pvAccess::ChannelGetRequester
struct TestChannelGetRequester : public epics::pvAccess::ChannelGetRequester
{
POINTER_DEFINITIONS(TestChannelGetRequester);
DUMBREQUESTER(TestChannelGetRequester)
@ -123,7 +123,7 @@ struct epicsShareClass TestChannelGetRequester : public epics::pvAccess::Channel
epics::pvData::BitSet::shared_pointer const & bitSet);
};
struct epicsShareClass TestChannelPutRequester : public epics::pvAccess::ChannelPutRequester
struct TestChannelPutRequester : public epics::pvAccess::ChannelPutRequester
{
POINTER_DEFINITIONS(TestChannelPutRequester);
DUMBREQUESTER(TestChannelPutRequester)
@ -154,7 +154,7 @@ struct epicsShareClass TestChannelPutRequester : public epics::pvAccess::Channel
epics::pvData::BitSet::shared_pointer const & bitSet);
};
struct epicsShareClass TestChannelMonitorRequester : public epics::pvData::MonitorRequester
struct TestChannelMonitorRequester : public epics::pvData::MonitorRequester
{
POINTER_DEFINITIONS(TestChannelMonitorRequester);
DUMBREQUESTER(TestChannelMonitorRequester)
@ -181,7 +181,7 @@ struct epicsShareClass TestChannelMonitorRequester : public epics::pvData::Monit
bool waitForEvent();
};
struct epicsShareClass TestPVChannel : public BaseChannel
struct TestPVChannel : public BaseChannel
{
POINTER_DEFINITIONS(TestPVChannel);
DUMBREQUESTER(TestPVChannel)
@ -207,7 +207,7 @@ struct epicsShareClass TestPVChannel : public BaseChannel
epics::pvData::PVStructure::shared_pointer const & pvRequest);
};
struct epicsShareClass TestPVMonitor : public epics::pvData::Monitor
struct TestPVMonitor : public epics::pvData::Monitor
{
POINTER_DEFINITIONS(TestPVMonitor);
std::tr1::weak_ptr<TestPVMonitor> weakself;
@ -236,7 +236,7 @@ struct epicsShareClass TestPVMonitor : public epics::pvData::Monitor
epics::pvData::MonitorElementPtr overflow;
};
struct epicsShareClass TestPV
struct TestPV
{
POINTER_DEFINITIONS(TestPV);
std::tr1::weak_ptr<TestPV> weakself;
@ -266,7 +266,7 @@ struct epicsShareClass TestPV
friend struct TestProvider;
};
struct epicsShareClass TestProvider : public epics::pvAccess::ChannelProvider, std::tr1::enable_shared_from_this<TestProvider>
struct TestProvider : public epics::pvAccess::ChannelProvider, std::tr1::enable_shared_from_this<TestProvider>
{
POINTER_DEFINITIONS(TestProvider);
@ -296,7 +296,7 @@ struct epicsShareClass TestProvider : public epics::pvAccess::ChannelProvider, s
static void testCounts();
};
struct epicsShareClass TestIOC {
struct TestIOC {
bool hasInit;
TestIOC() : hasInit(false) {
testdbPrepare();

17
p2pApp/Makefile
View File

@ -5,19 +5,22 @@ include $(TOP)/configure/CONFIG
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
USR_CPPFLAGS += -I$(TOP)/common
PROD_HOST = p2p
p2p_SRCS += gwmain.cpp
p2p_LIBS += p2pcore pvAccessIOC pvAccess pvData Com
LIBRARY_HOST += p2pcore
PROD_SRCS += server.cpp
PROD_SRCS += chancache.cpp
PROD_SRCS += moncache.cpp
PROD_SRCS += channel.cpp
p2pcore_SRCS += server.cpp
p2pcore_SRCS += chancache.cpp
p2pcore_SRCS += moncache.cpp
p2pcore_SRCS += channel.cpp
PROD_LIBS += pvAccessIOC pvAccess pvData Com
p2pcore_LIBS += pvAccess pvData Com
TESTPROD += testmon
testmon_SRCS += testmon.cpp
testmon_SRCS += utilitiesx.cpp
#===========================

8
p2pApp/chancache.h
View File

@ -21,7 +21,7 @@ struct ChannelCacheEntry;
struct MonitorUser;
struct GWChannel;
struct epicsShareClass MonitorCacheEntry : public epics::pvData::MonitorRequester
struct MonitorCacheEntry : public epics::pvData::MonitorRequester
{
POINTER_DEFINITIONS(MonitorCacheEntry);
static size_t num_instances;
@ -64,7 +64,7 @@ struct epicsShareClass MonitorCacheEntry : public epics::pvData::MonitorRequeste
virtual std::string getRequesterName();
};
struct epicsShareClass MonitorUser : public epics::pvData::Monitor
struct MonitorUser : public epics::pvData::Monitor
{
POINTER_DEFINITIONS(MonitorUser);
static size_t num_instances;
@ -102,7 +102,7 @@ struct epicsShareClass MonitorUser : public epics::pvData::Monitor
virtual std::string getRequesterName();
};
struct epicsShareClass ChannelCacheEntry
struct ChannelCacheEntry
{
POINTER_DEFINITIONS(ChannelCacheEntry);
static size_t num_instances;
@ -131,7 +131,7 @@ struct epicsShareClass ChannelCacheEntry
// this exists as a seperate object to prevent a reference loop
// ChannelCacheEntry -> pva::Channel -> CRequester
struct epicsShareClass CRequester : public epics::pvAccess::ChannelRequester
struct CRequester : public epics::pvAccess::ChannelRequester
{
static size_t num_instances;

2
p2pApp/channel.h
View File

@ -7,7 +7,7 @@
#include "chancache.h"
struct epicsShareClass GWChannel : public epics::pvAccess::Channel
struct GWChannel : public epics::pvAccess::Channel
{
POINTER_DEFINITIONS(GWChannel);
static size_t num_instances;

4
p2pApp/server.h
View File

@ -8,7 +8,7 @@
#include <shareLib.h>
struct epicsShareClass GWServerChannelProvider :
struct GWServerChannelProvider :
public epics::pvAccess::ChannelProvider,
public epics::pvAccess::ChannelFind,
public std::tr1::enable_shared_from_this<GWServerChannelProvider>
@ -37,7 +37,7 @@ struct epicsShareClass GWServerChannelProvider :
virtual ~GWServerChannelProvider();
};
struct epicsShareClass ServerConfig {
struct ServerConfig {
int debug;
bool interactive;
epics::pvData::PVStructure::shared_pointer conf;

0
testApp/testmon.cpp → p2pApp/testmon.cpp
View File

2
p2pApp/utilitiesx.cpp Normal file
View File

@ -0,0 +1,2 @@
// hack to avoid a convienence library
#include "utilities.cpp"

29
testApp/Makefile
View File

@ -5,8 +5,8 @@ include $(TOP)/configure/CONFIG
# ADD MACRO DEFINITIONS AFTER THIS LINE
#=============================
USR_CPPFLAGS += -I$(TOP)/p2pApp
USR_CPPFLAGS += -I$(TOP)/pdbApp
USR_CPPFLAGS += -I$(TOP)/p2pApp
USR_CPPFLAGS += -I$(TOP)/common
TARGETS += $(COMMON_DIR)/p2pTestIoc.dbd
@ -14,11 +14,9 @@ p2pTestIoc_DBD += base.dbd
# Tests explicitly create/destory PDB provider
#p2pTestIoc_DBD += qsrv.dbd
TESTLIBRARY += testutils
testutils_SRCS += utilities.cpp
testutils_LIBS += pvAccess pvData
testutils_LIBS += $(EPICS_BASE_IOC_LIBS)
PROD_SRCS += utilitiesx.cpp
PROD_LIBS += pvAccess pvData
PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
TESTPROD_HOST += testweak
testweak_SRCS += testweak.cpp
@ -27,41 +25,28 @@ TESTS += testweak
TESTPROD_HOST += testtest
testtest_SRCS += testtest.cpp
testtest_LIBS += testutils p2pcore pvAccess pvData
testtest_LIBS += $(EPICS_BASE_IOC_LIBS)
TESTS += testtest
TESTPROD_HOST += testmon
testmon_SRCS += testmon.cpp
testmon_LIBS += testutils p2pcore pvAccess pvData
testmon_LIBS += $(EPICS_BASE_IOC_LIBS)
TESTS += testmon
TESTPROD_HOST += testpvif
testpvif_SRCS += testpvif.cpp
testpvif_SRCS += p2pTestIoc_registerRecordDeviceDriver.cpp
testpvif_LIBS += testutils qsrv pvAccess pvData
testpvif_LIBS += $(EPICS_BASE_IOC_LIBS)
testpvif_LIBS += qsrv
TESTS += testpvif
TESTPROD_HOST += testpdb
testpdb_SRCS += testpdb.cpp
testpdb_SRCS += p2pTestIoc_registerRecordDeviceDriver.cpp
testpdb_LIBS += testutils qsrv pvAccess pvData
testpdb_LIBS += $(EPICS_BASE_IOC_LIBS)
testpdb_LIBS += qsrv
TESTS += testpdb
PROD_HOST += check_consist
check_consist_SRCS += check_consist.cpp
check_consist_LIBS += testutils pvAccess pvData
check_consist_LIBS += $(EPICS_BASE_IOC_LIBS)
#TESTPROD_HOST += testpvalink
testpvalink_SRCS += testpvalink.cpp
testpvalink_SRCS += p2pTestIoc_registerRecordDeviceDriver.cpp
testpvalink_LIBS += testutils qsrv pvAccess pvData
testpvalink_LIBS += $(EPICS_BASE_IOC_LIBS)
testpvalink_LIBS += qsrv
#TESTS += testpvalink
ifdef BASE_3_16

2
testApp/utilitiesx.cpp Normal file
View File

@ -0,0 +1,2 @@
// hack to avoid a convienence library
#include "utilities.cpp"