* int64b/master: (25 commits)
std/rec: streamline variable names in int64in/int64out
std/rec/test: recMiscTest check in64in/out
ioc/db: dbUnitTest helps support int64
std/rec: ioc64in/outRecord typed rset
minor
std/rec: fix copyright in int64in sources
std: remove SCM keywords from int64in and int64out sources
std/rec: fix promptgroups in dbd.pod files
std/rec: add and improve pod for int64in and int64out
std/rec: add pod documentation content for int64out
std/rec: add pod documentation for int64out record
dbStatic: dbPutStringNum() overflow handling
dbStatic: more informative error for bad field value
dbStatic: dbPutStringNum(, "") not an error
Release Notes
cvtFastPerform: Rename reserved member names, fix for vxWorks
Simplify epicsConvertDoubleToFloat()
More cvtFastPerform changes
Collate and report by precision
Restructure cvtFastPerform, fix VxWorks build
...
* linksup/master: (112 commits)
ioc/dbStatic: rename link debugging info tags
jlif future proof for 64-bit json parser
Demonstrate and use numeric literals in calc args
separate jlink and lset debug flags
std/link: runtime conditional debugging in calc/const
std/rec/test: extend linkRetargetLink w/ jlink
ioc/db: dbUnitTest add testdbPutArrFieldOk()
ioc/db: cleanup dbEvent freeLists
ioc/db: dbUnitTest testMonitor leaks dbChannel
std/link: all calc example
jlink conditional debug print
ioc/as: dbCore needs ca
Additional linkInitTest checks
Minimize work done in readLocked routine
Minimize work done in readLocked() routine
Cosmetic changes to various soft device supports
Enhancements to subArray record & soft device support
Fix bug in eventRecord::init_record
Updates to Release Notes and links.html
Make dbLinkIs{Constant|Volatile}() return only true/false
...
Conflicts:
documentation/RELEASE_NOTES.html
src/ioc/db/dbAccess.c
* master: (226 commits)
ioc/db: testdbGetFieldEqual() detect zero size
Cleanup in asLib
Allow whitespace before comments in AS config files
Supress MS warning C4251
Add a plan to std/filters/test/syncTest.c
Fix dbUnitTest.c
avoid void* +=
Fix and test for macLib losing error status
update notes
libCom/test: ipAddrToAsciiTest skip cleanup unless valgrind is possible
libCom/test: add ipAddrToAsciiTest to testHarness
db/test: dbPutGetTest check dbGet() of long string field
db: dbGet() ensure long string nil and actual string length
db/test: dbPutGetTest check for dbGet() attribute crash
db: fix dbGet() for attributes as long string
db/test: dbPutGetTest add test for lp:1678494
db: fix dbGet() of link fields as DBF_CHAR
dbUnitTest: add testdbGetArrFieldEqual()
db/test: add dbPutGetTest
Update release notes as per Michael's review comment
...
Conflicts:
src/ioc/db/dbLink.c
src/ioc/db/test/Makefile
src/std/dev/devSoSoftCallback.c
src/std/rec/boRecord.c
src/std/rec/dfanoutRecord.c
src/std/rec/longinRecord.c
src/std/rec/longoutRecord.c
Default to accepting over-size integers in DB fields, truncate to field size.
E.g. permits setting DBF_LONG fields to 0xffffffff.
Adds dbConvertStrict config variable to disable this.
The lnkConst.c implementation is not yet complete, no support for arrays of
strings (JMOP).
Link error messages should display their record & field name, which is not yet
possible.
The ability to embed links as parameters to other link types is not complete
yet; this will be required for the calc link type.
This code currently passes all existing tests, but additional tests are needed
for the new functionality.
These are set at the same time as the ARCH variable.
Had to add EPICS_VERSION_SHORT and EPICS_VERSION_FULL to epicsVersion.h.
This uses more uniform names, should we change epicsVersion.h names?
We would continue to support the old names in parallel for some time.
This is being done to free the link private struct,
but dbDbRemoveLink() is not used to avoid the overhead
of splitting every lockset just before the PDB
is free'd.
No reason to do this for non-isolated until scans threads
are stopped.
All link types now have a plink->precord pointer.
Add link support entry tables for const, DB and CA link types.
Route all link I/O options through the new plink->lset.
The main reason for this merge proposal is the change to "public" API functions.
Use atomic counter to resolve data race on threadsRunning in callback.
Split up callbackShutdown() and scanShutdown() into two phases *Stop() and
*Cleanup(). The *Stop() functions signal worker threads, and wait for them to
exit. The *Cleanup() functions actually reclaim global resources.
These two mechanisms have couplings which are quite complex. I/O Intr scans
involve both scan lists and callbacks.