diff options
| author | Bastian Bloessl <mail@bastibl.net> | 2019-06-18 09:24:35 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-06-19 13:00:00 -0700 |
| commit | cb044a4c4b2c6657876f996617a24a44d1ac3b5d (patch) | |
| tree | dd6815d0eb2fc9173f726dc602e994a01e94e418 /gnuradio-runtime/python/gnuradio/ctrlport/monitor.py | |
| parent | 3750f748501ec83d60c489dfa700522f3be21b00 (diff) | |
ctrport-monitor: fix error handling
Diffstat (limited to 'gnuradio-runtime/python/gnuradio/ctrlport/monitor.py')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/monitor.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py index 3215fa5b26..f8e5882e59 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py +++ b/gnuradio-runtime/python/gnuradio/ctrlport/monitor.py @@ -34,15 +34,11 @@ class monitor(object): atexit.register(self.shutdown) # setup export prefs - gr.prefs().singleton().set_bool("ControlPort","on",True); + gr.prefs().singleton().set_bool("ControlPort","on",True) if(tool == "gr-perf-monitorx"): - gr.prefs().singleton().set_bool("ControlPort","edges_list",True); - gr.prefs().singleton().set_bool("PerfCounters","on",True); - gr.prefs().singleton().set_bool("PerfCounters","export",True); - - def __del__(self): - if(self.started): - self.stop() + gr.prefs().singleton().set_bool("ControlPort","edges_list",True) + gr.prefs().singleton().set_bool("PerfCounters","on",True) + gr.prefs().singleton().set_bool("PerfCounters","export",True) def start(self): print("monitor::endpoints() = %s" % (gr.rpcmanager_get().endpoints())) @@ -50,7 +46,7 @@ class monitor(object): ep = gr.rpcmanager_get().endpoints()[0] cmd = [self.tool, re.search(r"-h (\S+|\d+\.\d+\.\d+\.\d+)", ep).group(1), re.search(r"-p (\d+)", ep).group(1)] print("running: %s"%(str(cmd))) - self.proc = subprocess.Popen(cmd); + self.proc = subprocess.Popen(cmd) self.started = True except (ValueError, OSError): self.proc = None @@ -65,6 +61,6 @@ class monitor(object): print("\tno proc to shut down, exiting") def shutdown(self): - print("ctrlport.monitor received shutdown signal") + print("ctrlport monitor received shutdown signal") if(self.started): self.stop() |