diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-07-04 17:10:23 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-07-04 17:10:23 +0000 |
| commit | 708f6482fd0acb631f9c7db6b793f497cec665e1 (patch) | |
| tree | d4f4ada1cb624b807078fc2be0a7fadfcd7ce84d | |
| parent | 7214e263039f32a9f64c2c1db1a603f9a8135329 (diff) | |
Fix long standing hang when exiting due to blocking read in gr-pager.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5903 221aa14e-8319-0410-a670-987f0aec2ac5
| -rw-r--r-- | gr-pager/src/flex_demod.py | 2 | ||||
| -rwxr-xr-x | gr-pager/src/usrp_flex.py | 30 |
2 files changed, 28 insertions, 4 deletions
diff --git a/gr-pager/src/flex_demod.py b/gr-pager/src/flex_demod.py index a8c6f09b13..0d35cf3f42 100644 --- a/gr-pager/src/flex_demod.py +++ b/gr-pager/src/flex_demod.py @@ -1,5 +1,5 @@ # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # diff --git a/gr-pager/src/usrp_flex.py b/gr-pager/src/usrp_flex.py index 055583c995..a9d6593fda 100755 --- a/gr-pager/src/usrp_flex.py +++ b/gr-pager/src/usrp_flex.py @@ -1,5 +1,26 @@ #!/usr/bin/env python +# +# Copyright 2006,2007 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + from gnuradio import gr, gru, usrp, optfir, eng_notation, blks, pager from gnuradio.eng_option import eng_option from optparse import OptionParser @@ -127,9 +148,12 @@ def main(): try: fg.start() while 1: - msg = queue.delete_head() # Blocking read - fields = split(msg.to_string(), chr(128)) - print join(fields, '|') + if not queue.empty_p(): + msg = queue.delete_head() # Blocking read + fields = split(msg.to_string(), chr(128)) + print join(fields, '|') + else: + time.sleep(1) except KeyboardInterrupt: fg.stop() |