<p>Vasil Velichkov has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10784">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">grgsm_scanner: Add --debug option<br><br>When set the stdout and stderr won't be redirected to /dev/null which<br>will facilitate resolving issues<br><br>Change-Id: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523<br>---<br>M apps/grgsm_scanner<br>1 file changed, 21 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/84/10784/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/grgsm_scanner b/apps/grgsm_scanner</span><br><span>index b57569d..32210ed 100755</span><br><span>--- a/apps/grgsm_scanner</span><br><span>+++ b/apps/grgsm_scanner</span><br><span>@@ -297,7 +297,7 @@</span><br><span> return "ARFCN: %4u, Freq: %6.1fM, CID: %5u, LAC: %5u, MCC: %3u, MNC: %3u, Pwr: %3i" % (</span><br><span> self.arfcn, self.freq / 1e6, self.cid, self.lac, self.mcc, self.mnc, self.power)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None):</span><br><span style="color: hsl(120, 100%, 40%);">+def do_scan(samp_rate, band, speed, ppm, gain, args, prn = None, debug = False):</span><br><span> signallist = []</span><br><span> channels_num = int(samp_rate / 0.2e6)</span><br><span> for arfcn_range in grgsm.arfcn.get_arfcn_ranges(band):</span><br><span>@@ -311,14 +311,15 @@</span><br><span> </span><br><span> while current_freq < stop_freq:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # silence rtl_sdr output:</span><br><span style="color: hsl(0, 100%, 40%);">- # open 2 fds</span><br><span style="color: hsl(0, 100%, 40%);">- null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)]</span><br><span style="color: hsl(0, 100%, 40%);">- # save the current file descriptors to a tuple</span><br><span style="color: hsl(0, 100%, 40%);">- save = os.dup(1), os.dup(2)</span><br><span style="color: hsl(0, 100%, 40%);">- # put /dev/null fds on 1 and 2</span><br><span style="color: hsl(0, 100%, 40%);">- os.dup2(null_fds[0], 1)</span><br><span style="color: hsl(0, 100%, 40%);">- os.dup2(null_fds[1], 2)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not debug:</span><br><span style="color: hsl(120, 100%, 40%);">+ # silence rtl_sdr output:</span><br><span style="color: hsl(120, 100%, 40%);">+ # open 2 fds</span><br><span style="color: hsl(120, 100%, 40%);">+ null_fds = [os.open(os.devnull, os.O_RDWR) for x in xrange(2)]</span><br><span style="color: hsl(120, 100%, 40%);">+ # save the current file descriptors to a tuple</span><br><span style="color: hsl(120, 100%, 40%);">+ save = os.dup(1), os.dup(2)</span><br><span style="color: hsl(120, 100%, 40%);">+ # put /dev/null fds on 1 and 2</span><br><span style="color: hsl(120, 100%, 40%);">+ os.dup2(null_fds[0], 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ os.dup2(null_fds[1], 2)</span><br><span> </span><br><span> # instantiate scanner and processor</span><br><span> scanner = wideband_scanner(rec_len=6 - speed,</span><br><span>@@ -359,12 +360,14 @@</span><br><span> </span><br><span> scanner = None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # restore file descriptors so we can print the results</span><br><span style="color: hsl(0, 100%, 40%);">- os.dup2(save[0], 1)</span><br><span style="color: hsl(0, 100%, 40%);">- os.dup2(save[1], 2)</span><br><span style="color: hsl(0, 100%, 40%);">- # close the temporary fds</span><br><span style="color: hsl(0, 100%, 40%);">- os.close(null_fds[0])</span><br><span style="color: hsl(0, 100%, 40%);">- os.close(null_fds[1])</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if not debug:</span><br><span style="color: hsl(120, 100%, 40%);">+ # restore file descriptors so we can print the results</span><br><span style="color: hsl(120, 100%, 40%);">+ os.dup2(save[0], 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ os.dup2(save[1], 2)</span><br><span style="color: hsl(120, 100%, 40%);">+ # close the temporary fds</span><br><span style="color: hsl(120, 100%, 40%);">+ os.close(null_fds[0])</span><br><span style="color: hsl(120, 100%, 40%);">+ os.close(null_fds[1])</span><br><span> if prn:</span><br><span> prn(found_list)</span><br><span> signallist.extend(found_list)</span><br><span>@@ -389,6 +392,8 @@</span><br><span> help="Scan speed [default=%default]. Value range 0-5.")</span><br><span> parser.add_option("-v", "--verbose", action="store_true",</span><br><span> help="If set, verbose information output is printed: ccch configuration, cell ARFCN's, neighbour ARFCN's")</span><br><span style="color: hsl(120, 100%, 40%);">+ parser.add_option("-d", "--debug", action="store_true",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="Print additional debug messages")</span><br><span> </span><br><span> """</span><br><span> Dont forget: sudo sysctl kernel.shmmni=32000</span><br><span>@@ -415,7 +420,7 @@</span><br><span> print info.get_verbose_info()</span><br><span> print ""</span><br><span> do_scan(options.samp_rate, options.band, options.speed,</span><br><span style="color: hsl(0, 100%, 40%);">- options.ppm, options.gain, options.args, prn = printfunc)</span><br><span style="color: hsl(120, 100%, 40%);">+ options.ppm, options.gain, options.args, prn = printfunc, debug = options.debug)</span><br><span> </span><br><span> if __name__ == '__main__':</span><br><span> main()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10784">change 10784</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10784"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: gr-gsm </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I11e99facb5a1ab9c9bfee3c314a91a74f98a2523 </div>
<div style="display:none"> Gerrit-Change-Number: 10784 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vasil Velichkov <vvvelichkov@gmail.com> </div>