lp:~epics-core/epics-base/server-side-plugins
Rebased Ralph Lange's server side plugins branch to current 3.15 head.
lp:~ralph-lange/epics-base/server-side-plugins
The unit tests which attempt to load a database need to be fixed. I've fixed only dbChannelTest. The other tests in src/iocs/db/test and src/iocs/
- Get this branch:
- bzr branch lp:~epics-core/epics-base/server-side-plugins
Branch merges
- Ralph Lange: Pending requested
- EPICS Core Developers: Pending requested
-
Diff: 20253 lines (+11599/-2941) (has conflicts)101 files modified.bzrignore (+3/-0)
configure/RULES.Db (+2/-2)
src/Makefile (+4/-0)
src/ioc/as/asDbLib.c (+13/-21)
src/ioc/as/asDbLib.h (+6/-4)
src/ioc/db/Makefile (+11/-0)
src/ioc/db/chfPlugin.c (+649/-0)
src/ioc/db/chfPlugin.h (+280/-0)
src/ioc/db/dbAccess.c (+309/-705)
src/ioc/db/dbAccess.h (+2/-2)
src/ioc/db/dbAccessDefs.h (+8/-53)
src/ioc/db/dbAddr.h (+1/-4)
src/ioc/db/dbBkpt.c (+1/-0)
src/ioc/db/dbCAC.h (+34/-34)
src/ioc/db/dbCa.c (+8/-1)
src/ioc/db/dbCa.h (+1/-0)
src/ioc/db/dbChannel.c (+865/-0)
src/ioc/db/dbChannel.h (+181/-0)
src/ioc/db/dbChannelIO.cpp (+67/-59)
src/ioc/db/dbChannelIO.h (+33/-34)
src/ioc/db/dbContext.cpp (+72/-71)
src/ioc/db/dbContextReadNotifyCache.cpp (+19/-19)
src/ioc/db/dbEvent.c (+277/-235)
src/ioc/db/dbEvent.h (+18/-11)
src/ioc/db/dbExtractArray.c (+84/-0)
src/ioc/db/dbExtractArray.h (+34/-0)
src/ioc/db/dbIocRegister.c (+58/-0)
src/ioc/db/dbLink.c (+648/-0)
src/ioc/db/dbLink.h (+94/-0)
src/ioc/db/dbNotify.c (+197/-194)
src/ioc/db/dbNotify.h (+11/-11)
src/ioc/db/dbPutNotifyBlocker.cpp (+21/-21)
src/ioc/db/dbPutNotifyBlocker.h (+14/-14)
src/ioc/db/dbState.c (+108/-0)
src/ioc/db/dbState.h (+92/-0)
src/ioc/db/dbSubscriptionIO.cpp (+22/-22)
src/ioc/db/db_access.c (+131/-152)
src/ioc/db/db_access_routines.h (+11/-17)
src/ioc/db/db_field_log.h (+56/-13)
src/ioc/db/db_test.c (+191/-661)
src/ioc/db/recGbl.c (+9/-53)
src/ioc/db/test/Makefile (+24/-0)
src/ioc/db/test/arrShorthandTest.c (+139/-0)
src/ioc/db/test/chfPluginTest.c (+832/-0)
src/ioc/db/test/dbChannelTest.c (+261/-0)
src/ioc/db/test/dbChannelTest.db (+2/-0)
src/ioc/db/test/dbStateTest.c (+56/-0)
src/ioc/db/test/xRecord.dbd (+12/-0)
src/ioc/dbStatic/dbBase.h (+5/-4)
src/ioc/dbStatic/dbPvdLib.c (+1/-0)
src/ioc/dbStatic/dbStaticLib.c (+80/-79)
src/ioc/dbStatic/link.h (+23/-26)
src/ioc/misc/iocInit.c (+7/-36)
src/ioc/registry/registerRecordDeviceDriver.pl (+7/-1)
src/ioc/rsrv/camessage.c (+324/-280)
src/ioc/rsrv/caservertask.c (+66/-71)
src/ioc/rsrv/server.h (+15/-15)
src/libCom/Makefile (+1/-0)
src/libCom/ellLib/ellLib.c (+17/-2)
src/libCom/ellLib/ellLib.h (+6/-4)
src/libCom/gpHash/gpHash.h (+3/-1)
src/libCom/gpHash/gpHashLib.c (+15/-9)
src/libCom/yajl/Makefile (+26/-0)
src/libCom/yajl/yajl.c (+160/-0)
src/libCom/yajl/yajl_alloc.c (+67/-0)
src/libCom/yajl/yajl_alloc.h (+50/-0)
src/libCom/yajl/yajl_buf.c (+120/-0)
src/libCom/yajl/yajl_buf.h (+73/-0)
src/libCom/yajl/yajl_bytestack.h (+85/-0)
src/libCom/yajl/yajl_common.h (+76/-0)
src/libCom/yajl/yajl_encode.c (+189/-0)
src/libCom/yajl/yajl_encode.h (+50/-0)
src/libCom/yajl/yajl_gen.c (+317/-0)
src/libCom/yajl/yajl_gen.h (+159/-0)
src/libCom/yajl/yajl_lex.c (+738/-0)
src/libCom/yajl/yajl_lex.h (+133/-0)
src/libCom/yajl/yajl_parse.h (+193/-0)
src/libCom/yajl/yajl_parser.c (+449/-0)
src/libCom/yajl/yajl_parser.h (+82/-0)
src/std/Makefile (+1/-0)
src/std/dev/Makefile (+2/-0)
src/std/dev/devBiDbState.c (+92/-0)
src/std/dev/devBoDbState.c (+86/-0)
src/std/dev/devSoft.dbd (+3/-0)
src/std/filters/Makefile (+18/-0)
src/std/filters/arr.c (+207/-0)
src/std/filters/dbnd.c (+142/-0)
src/std/filters/filters.dbd (+4/-0)
src/std/filters/sync.c (+172/-0)
src/std/filters/test/Makefile (+45/-0)
src/std/filters/test/arrRecord.c (+135/-0)
src/std/filters/test/arrRecord.dbd (+33/-0)
src/std/filters/test/arrTest.cpp (+337/-0)
src/std/filters/test/arrTest.db (+15/-0)
src/std/filters/test/dbChannelTest.db (+2/-0)
src/std/filters/test/dbndTest.c (+235/-0)
src/std/filters/test/syncTest.c (+367/-0)
src/std/filters/test/tsTest.c (+113/-0)
src/std/filters/test/xRecord.dbd (+12/-0)
src/std/filters/ts.c (+67/-0)
src/std/softIoc/base.dbd (+3/-0)
Related bugs
Related blueprints
Branch information
Recent revisions
- 12360. By Andrew Johnson
-
Moved filter plugins, fixed portability issues.
The filter plugins are now in src/std/filters
and their tests in the test subdirectory.Various portability issues found and fixed:
* Variable declarations after statements in a block
* Code assuming that epicsInt32 = long
* // comments in C filesRemoved a number of tests that weren't really tests;
preconditions for future tests that don't actually check
the code being tested should call testAbort() if the
condition fails, which tells the test harness that you
meant to die at that point.Split up lots of very long source lines.
Probably made a few other changes that I forget about now.
- 12358. By mdavidsaver
-
fix arrTest
Don't use compiled in paths
include menuConvert as this is now required at runtime - 12357. By mdavidsaver
-
fix db plugin tests
Avoid installing xRecord.dbd. This would otherwise be installed
by the DBDINC.Also must split out recordtype definition from record instance
definition and run the registrar function between the two loads.
This is due to new sanity checks in the loading process
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~epics-core/epics-base/3.15