Skip to content

Multi reading needs to be mutex lock #250

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
erbilball wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Multi reading needs to be mutex lock #250

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
90 changes: 47 additions & 43 deletions pycomm3/logix_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,13 @@
ReadModifyWriteRequestPacket,
)
from .tag import Tag
from threading import Lock

AtomicValueType = Union[int, float, bool, str]
TagValueType = Union[AtomicValueType, List[AtomicValueType], Dict[str, "TagValueType"]]
ReadWriteReturnType = Union[Tag, List[Tag]]

# create a lock
lock = Lock()

class LogixDriver(CIPDriver):
"""
Expand Down Expand Up @@ -905,54 +907,56 @@ def read(self, *tags: str) -> ReadWriteReturnType:
:return: a single or list of ``Tag`` objects
"""

parsed_requests = self._parse_requested_tags(tags, "r")
requests = self._read_build_requests(parsed_requests)
read_results = self._send_requests(requests)

results = []
global lock
with lock: # acquire lock
parsed_requests = self._parse_requested_tags(tags, "r")
requests = self._read_build_requests(parsed_requests)
read_results = self._send_requests(requests)

for i, tag in enumerate(tags):
try:
request_data = parsed_requests[i]
if request_data.get("error"):
results.append(Tag(tag, None, None, request_data["error"]))
continue
results = []

result = read_results[i]
bool_elements = request_data["bool_elements"]
if result:
bit = request_data.get("bit")

if request_data["tag_info"]["data_type_name"] != "DWORD":
if bit is not None:
result = Tag(
request_data["user_tag"],
bool(result.value & 1 << bit),
"BOOL",
result.error,
)
else:
bit = bit or 0
if bool_elements is not None:
bools = result.value[bit : bit + bool_elements]
data_type = f"BOOL[{bool_elements}]"
result = Tag(request_data["user_tag"], bools, data_type, result.error)
for i, tag in enumerate(tags):
try:
request_data = parsed_requests[i]
if request_data.get("error"):
results.append(Tag(tag, None, None, request_data["error"]))
continue

result = read_results[i]
bool_elements = request_data["bool_elements"]
if result:
bit = request_data.get("bit")

if request_data["tag_info"]["data_type_name"] != "DWORD":
if bit is not None:
result = Tag(
request_data["user_tag"],
bool(result.value & 1 << bit),
"BOOL",
result.error,
)
else:
val = result.value[bit]
result = Tag(request_data["user_tag"], val, "BOOL", result.error)
else:
result = Tag(request_data["user_tag"], None, None, result.error)
bit = bit or 0
if bool_elements is not None:
bools = result.value[bit : bit + bool_elements]
data_type = f"BOOL[{bool_elements}]"
result = Tag(request_data["user_tag"], bools, data_type, result.error)
else:
val = result.value[bit]
result = Tag(request_data["user_tag"], val, "BOOL", result.error)
else:
result = Tag(request_data["user_tag"], None, None, result.error)

results.append(result)
results.append(result)

except Exception as err:
self.__log.exception("Invalid tag request")
results.append(Tag(tag, None, None, f"Invalid tag request - {err!r}"))
except Exception as err:
self.__log.exception("Invalid tag request")
results.append(Tag(tag, None, None, f"Invalid tag request - {err!r}"))

if len(tags) > 1:
return results
else:
return results[0]
if len(tags) > 1:
return results
else:
return results[0]

def _read_build_requests(self, parsed_tags):
if len(parsed_tags) != 1 and not self._micro800:
Expand Down