Skip to content

Fix a problem whereby array data may be corrupted #147

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
r-owen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix a problem whereby array data may be corrupted #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93bd2f3
Fix a bug whereby array data is sometimes corrupted in transmission.
r-owen Jun 24, 2020
4a1728e
Remove an unnecessary append and speed up the code
r-owen Jun 24, 2020
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
9 changes: 3 additions & 6 deletions src/api/dcps/python/code/ddsutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,7 @@ def _deserialize_array(mem_type, data):
'''
array_size = int(mem_type.attrib[_SIZE_ATTRIBUTE])
array_type = mem_type[0]
result = []
[result.append(_deserialize_data(array_type, data)) for _ in range(array_size)]
result = [_deserialize_data(array_type, data) for _ in range(array_size)]
return result

# Global variables
Expand Down Expand Up @@ -718,8 +717,7 @@ def _compute_packing_fmt(mem_type, fmt_args, align):
actual_key = mem_type.attrib[_NAME_ATTRIBUTE]
actual_type = _get_actual_type(actual_key)
if isinstance(actual_type, enum.EnumMeta):
size = struct.calcsize('i')
align = max(size, align)
align = _calcalign('i')
fmt_args.append('i')
return align
elif isinstance(actual_type, type):
Expand Down Expand Up @@ -752,8 +750,7 @@ def _compute_packing_fmt(mem_type, fmt_args, align):
else:
mem_type = mem_type.tag
fmt = _to_packing_fmt([mem_type])
size = struct.calcsize(fmt)
align = max(size, align)
align = _calcalign(fmt)
fmt_args.append(fmt)

fmt_args.append(' ')
Expand Down