tools/trace: don't raise an exception in a ctype callback

To exit the tool when the maximal number of event is reached (-M option), the tool currently call exit(), which raise a SystemExit exception. The handling of exception from ctype callback doesn't seem straightforward and dependent on python version. This patch avoid the issue altogether by using a global variable instead. Closes iovisor#3049 Signed-off-by: Jerome Marchand <[email protected]>
Ha-Dj · Nov 6, 2023 · 5e3bb28 · 5e3bb28
1 parent 58ce085
commit 5e3bb28
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tools/trace.py b/tools/trace.py
@@ -43,6 +43,7 @@ class Probe(object):
  build_id_enabled = False
  aggregate = False
  symcount = {}
+ done = False
 
  @classmethod
  def configure(cls, args):
@@ -635,7 +636,7 @@ def print_event(self, bpf, cpu, data, size):
  if self.aggregate:
  self.print_aggregate_events()
  sys.stdout.flush()
- exit()
+ Probe.done = True;
 
  def attach(self, bpf, verbose):
  if len(self.library) == 0:
@@ -895,7 +896,7 @@ def _main_loop(self):
  "-" if not all_probes_trivial else ""))
  sys.stdout.flush()
 
- while True:
+ while not Probe.done:
  self.bpf.perf_buffer_poll()
 
  def run(self):