Merge lp:~bhill/epics-base/pcas-deadlock-fix-3.14 into lp:~epics-core/epics-base/3.14
Proposed by
Bruce Hill
Status: | Merged |
---|---|
Approved by: | Andrew Johnson |
Approved revision: | 12683 |
Merged at revision: | 12686 |
Proposed branch: | lp:~bhill/epics-base/pcas-deadlock-fix-3.14 |
Merge into: | lp:~epics-core/epics-base/3.14 |
Diff against target: |
83 lines (+12/-4) 3 files modified
src/cas/generic/casChannelI.cc (+1/-0) src/cas/generic/casChannelI.h (+7/-0) src/cas/generic/casStrmClient.cc (+4/-4) |
To merge this branch: | bzr merge lp:~bhill/epics-base/pcas-deadlock-fix-3.14 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Johnson | Approve | ||
Review via email: mp+312638@code.launchpad.net |
Description of the change
Avoid deadlock when by moving call to casPVI:
out of the casEventSys processing to the casPVI constructor.
The nativeCount (max array size) doesn't change for a casPVI
instance so no need to lock the casPVI mutex each time we need
to test it's size.
To post a comment you must log in.
Thanks Bruce, much appreciated!