<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19296">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: Add stats commands related to testing<br><br>* Allow to set the reporting interval to 0 for manual reporting<br>* stats reset command to reset all statistics<br>* stats report command to manually trigger statistics reporting<br><br>Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a<br>Related: SYS#4877<br>---<br>M src/stats.c<br>M src/vty/stats_vty.c<br>2 files changed, 53 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/stats.c b/src/stats.c</span><br><span>index a5a4d4b..c91a978 100644</span><br><span>--- a/src/stats.c</span><br><span>+++ b/src/stats.c</span><br><span>@@ -181,12 +181,21 @@</span><br><span> if (rc < 0)</span><br><span> LOGP(DLSTATS, LOGL_ERROR, "Failed to setup the timer with error code %d (fd=%d)\n",</span><br><span> rc, osmo_stats_timer.fd);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_timerfd_schedule(&osmo_stats_timer, &ts_first, &ts_interval);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLSTATS, LOGL_ERROR, "Failed to schedule the timer with error code %d (fd=%d, interval %d sec)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rc, osmo_stats_timer.fd, interval);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLSTATS, LOGL_INFO, "Stats timer started with interval %d sec\n", interval);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (interval == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_timerfd_disable(&osmo_stats_timer);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSTATS, LOGL_ERROR, "Failed to disable the timer with error code %d (fd=%d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc, osmo_stats_timer.fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_timerfd_schedule(&osmo_stats_timer, &ts_first, &ts_interval);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSTATS, LOGL_ERROR, "Failed to schedule the timer with error code %d (fd=%d, interval %d sec)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc, osmo_stats_timer.fd, interval);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSTATS, LOGL_INFO, "Stats timer started with interval %d sec\n", interval);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -361,7 +370,7 @@</span><br><span> * \returns 0 on success; negative on error */</span><br><span> int osmo_stats_set_interval(int interval)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (interval <= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (interval < 0)</span><br><span> return -EINVAL;</span><br><span> </span><br><span> osmo_stats_config->interval = interval;</span><br><span>diff --git a/src/vty/stats_vty.c b/src/vty/stats_vty.c</span><br><span>index 4628281..1483eaa 100644</span><br><span>--- a/src/vty/stats_vty.c</span><br><span>+++ b/src/vty/stats_vty.c</span><br><span>@@ -43,6 +43,8 @@</span><br><span> </span><br><span> #define SHOW_STATS_STR "Show statistical values\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define STATS_STR "Stats related commands\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! \file stats_vty.c</span><br><span> * VTY interface for statsd / statistic items</span><br><span> *</span><br><span>@@ -351,9 +353,9 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_stats_interval, cfg_stats_interval_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "stats interval <1-65535>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "stats interval <0-65535>",</span><br><span> CFG_STATS_STR "Set the reporting interval\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Interval in seconds\n")</span><br><span style="color: hsl(120, 100%, 40%);">+ "Interval in seconds (0 disables the reporting interval)\n")</span><br><span> {</span><br><span> int rc;</span><br><span> int interval = atoi(argv[0]);</span><br><span>@@ -567,6 +569,37 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(stats_report,</span><br><span style="color: hsl(120, 100%, 40%);">+ stats_report_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "stats report",</span><br><span style="color: hsl(120, 100%, 40%);">+ STATS_STR "Manurally trigger reporting of stats\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stats_report();</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int reset_rate_ctr_group_handler(struct rate_ctr_group *ctrg, void *sctx_)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_group_reset(ctrg);</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 style="color: hsl(120, 100%, 40%);">+static int reset_osmo_stat_item_group_handler(struct osmo_stat_item_group *statg, void *sctx_)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_group_reset(statg);</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 style="color: hsl(120, 100%, 40%);">+DEFUN(stats_reset,</span><br><span style="color: hsl(120, 100%, 40%);">+ stats_reset_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "stats reset",</span><br><span style="color: hsl(120, 100%, 40%);">+ STATS_STR "Reset all stats\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_for_each_group(reset_rate_ctr_group_handler, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stat_item_for_each_group(reset_osmo_stat_item_group_handler, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int config_write_stats_reporter(struct vty *vty, struct osmo_stats_reporter *srep)</span><br><span> {</span><br><span> if (srep == NULL)</span><br><span>@@ -666,4 +699,7 @@</span><br><span> </span><br><span> install_element_ve(&show_stats_asciidoc_table_cmd);</span><br><span> install_element_ve(&show_rate_counters_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(ENABLE_NODE, &stats_report_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(ENABLE_NODE, &stats_reset_cmd);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19296">change 19296</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/c/libosmocore/+/19296"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9febcb65650abfd538caedfbca77a787e66d517a </div>
<div style="display:none"> Gerrit-Change-Number: 19296 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>