Skip to content

client/thread: fix multi-PV get()/put() reporting timeout against wrong PV #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacquelinegarrahan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

client/thread: fix multi-PV get()/put() reporting timeout against wrong PV #223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions src/p4p/client/thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,22 @@ def cb(value, i=i):
_log.debug('get %s w/ %s', N, req)
ops[i] = raw_get(N, cb, request=req)

pending = set(range(len(name)))
for _n in range(len(name)):
try:
value, i = done.get(timeout=timeout)
except Empty:
result[i] = TimeoutError(name[i])
# 'done' is a shared queue, so we can't know which PV timed
# out; mark every still-pending PV as timed out rather than
# reusing the loop's stale 'i' (which points at the wrong PV).
for j in pending:
result[j] = TimeoutError(name[j])
if throw:
_log.debug('timeout %s after %s', name[i], timeout)
raise result[i]
j = next(iter(pending))
_log.debug('timeout %s after %s', name[j], timeout)
raise result[j]
break
pending.discard(i)
_log.debug('got %s %r', name[i], value)
if throw and isinstance(value, Exception):
raise value
Expand Down Expand Up @@ -358,14 +365,20 @@ def cb(value, i=i):

ops[i] = raw_put(n, cb, builder=value, request=req, get=get)

pending = set(range(len(name)))
for _n in range(len(name)):
try:
value, i = done.get(timeout=timeout)
except Empty:
result[i] = TimeoutError(name[i])
# 'done' is a shared queue, so we can't know which PV timed
# out; mark every still-pending PV rather than reusing the
# loop's stale 'i' (which points at the wrong PV).
for j in pending:
result[j] = TimeoutError(name[j])
if throw:
raise result[i]
raise result[next(iter(pending))]
break
pending.discard(i)
if throw and isinstance(value, Exception):
raise value
result[i] = value
Expand Down