lp:~epics-core/epics-base/lockopt

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~epics-core/epics-base/3.16 at revision 12684

Andrew Johnson: Approve on 2015-09-07

mdavidsaver: Approve on 2015-07-13

Ralph Lange: Pending requested 2015-04-02

Diff: 2923 lines (+1815/-572) (has conflicts)

20 files modified

src/ioc/db/callback.c (+0/-1)
src/ioc/db/dbAccess.c (+15/-8)
src/ioc/db/dbCaTest.c (+2/-2)
src/ioc/db/dbChannel.c (+0/-1)
src/ioc/db/dbCommon.dbd (+6/-0)
src/ioc/db/dbLink.c (+20/-12)
src/ioc/db/dbLink.h (+4/-2)
src/ioc/db/dbLock.c (+849/-513)
src/ioc/db/dbLock.h (+17/-7)
src/ioc/db/dbLockPvt.h (+110/-0)
src/ioc/db/dbNotify.c (+0/-1)
src/ioc/db/dbScan.c (+0/-1)
src/ioc/db/test/Makefile (+10/-0)
src/ioc/db/test/dbLockTest.c (+360/-13)
src/ioc/db/test/dbLockTest.db (+3/-0)
src/ioc/db/test/dbStressLock.c (+357/-0)
src/ioc/db/test/dbStressLock.db (+40/-0)
src/ioc/dbStatic/dbStaticRun.c (+6/-4)
src/ioc/dbStatic/link.h (+2/-0)
src/ioc/misc/iocInit.c (+14/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

12672. By Andrew Johnson on 2015-08-31

Undefine LOCKSET_DEBUG & LOCKSET_NOFREE

12671. By Andrew Johnson on 2015-08-31

Fix comment

12670. By mdavidsaver on 2015-08-31

dbLock: better error check when recursive locking attempted

12669. By mdavidsaver on 2015-08-31

dbLockTest: check additional recursive case

12668. By Andrew Johnson on 2015-08-28

db/test: Add missing dependency

12667. By mdavidsaver on 2015-08-25

db/test: dbStressTest conditional TIME_STATS

12666. By Andrew Johnson on 2015-08-24

Undo s/printf/errlogPrintf/ in iocsh commands

12665. By Andrew Johnson on 2015-08-24

Remove some unnecesary #includes

12664. By Andrew Johnson on 2015-08-24

Make dbLockTest work when LOCKSET_DEBUG undefined

12663. By mdavidsaver on 2015-08-20

dbLock: restore initialization of PV_LINK

PV_LINK -> DB_LINK must happen in doResolveLinks after add_record