<p>Stefan Sperling <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9217">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">show all global counters of osmo-bsc in vty<br><br>The 'show statistics' VTY command was not showing all counters<br>maintained by osmo-bsc. Instead of printing just two counters<br>related to paging, print all available counters in a generic way.<br><br>Adjust descriptions of some counters for nicer display.<br><br>After startup (all counters are zero) is now looks like this:<br><br>OsmoBSC# show statistics<br> handover:attempted: 0 Received handover attempts.<br> handover:no_channel: 0 Sent no channel available responses.<br> handover:timeout: 0 Timeouts of timer T3103.<br> handover:completed: 0 Received handover completed.<br> handover:failed: 0 Received HO FAIL messages.<br> paging:attempted: 0 Paging attempts for a subscriber.<br> paging:detached: 0 Paging request send failures because no responsible BTS was found.<br> paging:responded: 0 Paging attempts with successful response.<br>OsmoBSC#<br><br>Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655<br>Related: OS#3245<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/libbsc/bsc_vty.c<br>2 files changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 29b97f0..6365938 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1133,12 +1133,12 @@</span><br><span> static const struct rate_ctr_desc bsc_ctr_description[] = {</span><br><span> [BSC_CTR_HANDOVER_ATTEMPTED] = {"handover:attempted", "Received handover attempts."},</span><br><span> [BSC_CTR_HANDOVER_NO_CHANNEL] = {"handover:no_channel", "Sent no channel available responses."},</span><br><span style="color: hsl(0, 100%, 40%);">- [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Count the amount of timeouts of timer T3103."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_HANDOVER_TIMEOUT] = {"handover:timeout", "Timeouts of timer T3103."},</span><br><span> [BSC_CTR_HANDOVER_COMPLETED] = {"handover:completed", "Received handover completed."},</span><br><span style="color: hsl(0, 100%, 40%);">- [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Receive HO FAIL messages."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_HANDOVER_FAILED] = {"handover:failed", "Received HO FAIL messages."},</span><br><span> </span><br><span> [BSC_CTR_PAGING_ATTEMPTED] = {"paging:attempted", "Paging attempts for a subscriber."},</span><br><span style="color: hsl(0, 100%, 40%);">- [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Counts the amount of paging attempts which couldn't sent out any paging request because no responsible bts found."},</span><br><span style="color: hsl(120, 100%, 40%);">+ [BSC_CTR_PAGING_DETACHED] = {"paging:detached", "Paging request send failures because no responsible BTS was found."},</span><br><span> [BSC_CTR_PAGING_RESPONDED] = {"paging:responded", "Paging attempts with successful response."},</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c</span><br><span>index ea4c8d0..e53a14f 100644</span><br><span>--- a/src/libbsc/bsc_vty.c</span><br><span>+++ b/src/libbsc/bsc_vty.c</span><br><span>@@ -4133,12 +4133,16 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int print_counter(struct rate_ctr_group *bsc_ctrs, struct rate_ctr *ctr, const struct rate_ctr_desc *desc, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vty *vty = data;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%25s: %10"PRIu64" %s%s", desc->name, ctr->current, desc->description, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void openbsc_vty_print_statistics(struct vty *vty, struct gsm_network *net)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Paging : %"PRIu64" attempted, %"PRIu64" responded%s",</span><br><span style="color: hsl(0, 100%, 40%);">- net->bsc_ctrs->ctr[BSC_CTR_PAGING_ATTEMPTED].current,</span><br><span style="color: hsl(0, 100%, 40%);">- net->bsc_ctrs->ctr[BSC_CTR_PAGING_RESPONDED].current,</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_for_each_counter(net->bsc_ctrs, print_counter, vty);</span><br><span> }</span><br><span> </span><br><span> DEFUN(drop_bts,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9217">change 9217</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/9217"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I58ae04e1960774d760e3ebb54a4f307c9f753655 </div>
<div style="display:none"> Gerrit-Change-Number: 9217 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>