<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12285">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Objections:
Max: I would prefer this is not merged as is
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add cmdline option parsing support<br><br>Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b<br>---<br>M src/osysmon_main.c<br>1 file changed, 95 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osysmon_main.c b/src/osysmon_main.c</span><br><span>index 5983212..486ee8f 100644</span><br><span>--- a/src/osysmon_main.c</span><br><span>+++ b/src/osysmon_main.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <stdlib.h></span><br><span> #include <string.h></span><br><span> #include <signal.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <getopt.h></span><br><span> </span><br><span> #include "config.h"</span><br><span> #include "osysmon.h"</span><br><span>@@ -69,8 +70,6 @@</span><br><span> .is_config_node = osysmon_is_config_node,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static const char *config_file = "osmo-sysmon.cfg";</span><br><span> struct osysmon_state *g_oss;</span><br><span> </span><br><span> </span><br><span>@@ -110,6 +109,88 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void print_usage()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("Usage: osmo-sysmon\n");</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 void print_help()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -h --help This text.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -c --config-file filename The config file to use.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -d option --debug=DRLL:DCC:DMM:DRR:DRSL:DNM Enable debugging.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -D --daemonize Fork the process into a background daemon.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -s --disable-color Do not print ANSI colors in the log\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -T --timestamp Prefix every log line with a timestamp.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -e --log-level number Set a global loglevel.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -V --version Print the version of OsmoHLR.\n");</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 struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *config_file;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool daemonize;</span><br><span style="color: hsl(120, 100%, 40%);">+} cmdline_opts = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .config_file = "osmo-sysmon.cfg",</span><br><span style="color: hsl(120, 100%, 40%);">+ .daemonize = false,</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 void handle_options(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int option_index = 0, c;</span><br><span style="color: hsl(120, 100%, 40%);">+ static struct option long_options[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {"help", 0, 0, 'h'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"config-file", 1, 0, 'c'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"debug", 1, 0, 'd'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"daemonize", 0, 0, 'D'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"disable-color", 0, 0, 's'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"log-level", 1, 0, 'e'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"timestamp", 0, 0, 'T'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"version", 0, 0, 'V' },</span><br><span style="color: hsl(120, 100%, 40%);">+ {0, 0, 0, 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%);">+ c = getopt_long(argc, argv, "hc:d:Dse:TV",</span><br><span style="color: hsl(120, 100%, 40%);">+ long_options, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (c) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'h':</span><br><span style="color: hsl(120, 100%, 40%);">+ print_usage();</span><br><span style="color: hsl(120, 100%, 40%);">+ print_help();</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'c':</span><br><span style="color: hsl(120, 100%, 40%);">+ cmdline_opts.config_file = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'd':</span><br><span style="color: hsl(120, 100%, 40%);">+ log_parse_category_mask(osmo_stderr_target, optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'D':</span><br><span style="color: hsl(120, 100%, 40%);">+ cmdline_opts.daemonize = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 's':</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_use_color(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'e':</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_log_level(osmo_stderr_target, atoi(optarg));</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'T':</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_timestamp(osmo_stderr_target, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'V':</span><br><span style="color: hsl(120, 100%, 40%);">+ print_version(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* catch unknown options *as well as* missing arguments. */</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Error in command line options. Exiting.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(-1);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -122,14 +203,16 @@</span><br><span> INIT_LLIST_HEAD(&g_oss->files);</span><br><span> </span><br><span> vty_init(&vty_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_options(argc, argv);</span><br><span> osysmon_sysinfo_init();</span><br><span> osysmon_ctrl_init();</span><br><span> osysmon_rtnl_init();</span><br><span> osysmon_file_init();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = vty_read_config_file(config_file, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = vty_read_config_file(cmdline_opts.config_file, NULL);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Failed to parse the config file %s\n", config_file);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Failed to parse the config file %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ cmdline_opts.config_file);</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span>@@ -137,6 +220,14 @@</span><br><span> signal(SIGUSR2, &signal_handler);</span><br><span> osmo_init_ignore_signals();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (cmdline_opts.daemonize) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_daemonize();</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("Error during daemonize");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</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%);">+</span><br><span> while (1) {</span><br><span> struct value_node *root = value_node_add(g_oss, NULL, "root", NULL);</span><br><span> osysmon_sysinfo_poll(root);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12285">change 12285</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/12285"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sysmon </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I742974bd1440b09b49d26703c13361dd1c41008b </div>
<div style="display:none"> Gerrit-Change-Number: 12285 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>