Skip to content
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

Jump to bottom

Fix capture for big segments. #308

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Fix capture for big segments. #308

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b75bfd
Fix capture for big segments.
jmichelp Feb 15, 2021
395f14f
Fix missing config on segments.
jmichelp Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 13 additions & 12 deletions software/chipwhisperer/common/api/ProjectFormat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class Project(Parameterized):
"""
untitledFileName = os.path.normpath(os.path.join(Settings().value("project-home-dir"), "tmp", "default.cwp"))

def __init__(self, prog_name="ChipWhisperer", prog_ver=""):
def __init__(self, prog_name="ChipWhisperer", prog_ver="", segment_length=10000):
self.valid_traces = None
self._trace_format = None

Expand Down Expand Up @@ -154,7 +154,7 @@ def __init__(self, prog_name="ChipWhisperer", prog_ver=""):
self.setProgramVersion(prog_ver)

self._segments = Segments(self)
self._traces = Traces(self)
self._traces = Traces(self, segment_length)
self._keys = IndividualIterable(self._traceManager.get_known_key, self._traceManager.num_traces)
self._textins = IndividualIterable(self._traceManager.get_textin, self._traceManager.num_traces)
self._textouts = IndividualIterable(self._traceManager.get_textout, self._traceManager.num_traces)
Expand Down Expand Up @@ -653,17 +653,16 @@ def __init__(self, project, segment_length=10000):
self.tm = project._traceManager

# segment management
self.cur_seg = self.project.segments.new()
self.cur_seg = self.project.get_new_trace_segment()
self.project.segments.append(self.cur_seg)
self.cur_trace_num = 0
self.seg_len = segment_length
self.seg_ind_max = self.seg_len - 1

@property
def max(self):
"""Max index during iteration."""
return self.tm.num_traces() - 1

@property
def keys(self):
return self._keys
Expand All @@ -680,9 +679,11 @@ def append(self, trace):
if not isinstance(trace, Trace):
raise TypeError("Expected Trace object, got {}.".format(trace))

if self.cur_trace_num > self.seg_ind_max:
self.cur_seg = self.project.segments.new()
self.project.segments.append(self.cur_seg)
if self.cur_trace_num >= self.seg_len:
new_seg = self.project.get_new_trace_segment()
self.project.segments.append(new_seg)
self.cur_seg.saveAll()
self.cur_seg = new_seg
self.cur_trace_num = 0
self.cur_seg.add_trace(*trace)
self.cur_trace_num += 1
Expand Down Expand Up @@ -797,7 +798,7 @@ def __len__(self):

def new(self):
"""Used to get a new empty trace container (segment).

Returns:
(TraceContainer) A new empty instance of a trace container.
"""
Expand Down Expand Up @@ -830,7 +831,7 @@ def __repr__(self):


class IndividualIterable:

def __init__(self, getter_func, trace_num_func):
self.getter = getter_func
self.trace_num_func = trace_num_func
Expand All @@ -849,7 +850,7 @@ def __next__(self):

self.n += 1
return self.getter(self.n - 1)

def __len__(self):
return self.trace_num_func()

Expand Down Expand Up @@ -883,4 +884,4 @@ def __array__(self):
len_trace = len(self.getter(0))
arr = np.zeros((num_traces, len_trace), dtype=dtype)
arr[:,:] = np.array([self.getter(i) for i in range(num_traces)])[:,:]
return arr
return arr