<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24924">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: add "show uptime"<br><br>Related: OS#4609<br>Change-Id: Ic7d9d5d3c8a9abd06a7e626aed7679f68406040c<br>---<br>M src/vty/command.c<br>1 file changed, 27 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/command.c b/src/vty/command.c</span><br><span>index de89337..67b4001 100644</span><br><span>--- a/src/vty/command.c</span><br><span>+++ b/src/vty/command.c</span><br><span>@@ -46,6 +46,7 @@</span><br><span> #include <osmocom/vty/command.h></span><br><span> </span><br><span> #include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> </span><br><span> #ifndef MAXPATHLEN</span><br><span>@@ -63,6 +64,9 @@</span><br><span> </span><br><span> void *tall_vty_cmd_ctx;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Set by on_dso_load_starttime() for "show uptime". */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct timespec starttime;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Command vector which includes some level of command lists. Normally</span><br><span> each daemon maintains each own cmdvec. */</span><br><span> vector cmdvec;</span><br><span>@@ -3037,6 +3041,23 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_uptime,</span><br><span style="color: hsl(120, 100%, 40%);">+ show_uptime_cmd, "show uptime", SHOW_STR "Displays how long the program has been running\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timespec now;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_gettime(CLOCK_MONOTONIC, &now);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ time_t uptime = now.tv_sec - starttime.tv_sec;</span><br><span style="color: hsl(120, 100%, 40%);">+ int d = uptime / (3600 * 24);</span><br><span style="color: hsl(120, 100%, 40%);">+ int h = uptime / 3600 % 24;</span><br><span style="color: hsl(120, 100%, 40%);">+ int m = uptime / 60 % 60;</span><br><span style="color: hsl(120, 100%, 40%);">+ int s = uptime % 60;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s has been running for %dd %dh %dm %ds%s", host.app_info->name, d, h, m, s, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</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> /* Help display function for all node. */</span><br><span> gDEFUN(config_help,</span><br><span> config_help_cmd, "help", "Description of the interactive help system\n")</span><br><span>@@ -4346,6 +4367,7 @@</span><br><span> install_node(&config_node, config_write_host);</span><br><span> </span><br><span> /* Each node's basic commands. */</span><br><span style="color: hsl(120, 100%, 40%);">+ install_lib_element(VIEW_NODE, &show_uptime_cmd);</span><br><span> install_lib_element(VIEW_NODE, &show_version_cmd);</span><br><span> install_lib_element(VIEW_NODE, &show_online_help_cmd);</span><br><span> if (terminal) {</span><br><span>@@ -4399,6 +4421,11 @@</span><br><span> srand(time(NULL));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static __attribute__((constructor)) void on_dso_load_starttime(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_clock_gettime(CLOCK_MONOTONIC, &starttime);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: execute this section in the unit test instead */</span><br><span> static __attribute__((constructor)) void on_dso_load(void)</span><br><span> {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24924">change 24924</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/+/24924"/><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: Ic7d9d5d3c8a9abd06a7e626aed7679f68406040c </div>
<div style="display:none"> Gerrit-Change-Number: 24924 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>