<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/15032">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Get rid of osmo_str_tolower() use inside libosmocore code<br><br>There's no real good reason for using that function (static buffer)<br>instead of osmo_str_tolower_buf(local buffer), so let's use the later.<br>In any case, we get rid of TLS variables in those places, which is a<br>performance improvement.<br>It will also allow later shrinking of those buffers if we decide to<br>define maximum logging category and level name length.<br><br>Change-Id: I2e99de1142020e4d80ef0a094e4e751f7903f5f9<br>---<br>M src/vty/logging_vty.c<br>1 file changed, 13 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c</span><br><span>index 9911c6f..b785be4 100644</span><br><span>--- a/src/vty/logging_vty.c</span><br><span>+++ b/src/vty/logging_vty.c</span><br><span>@@ -289,14 +289,15 @@</span><br><span> static void add_category_strings(char **cmd_str_p, char **doc_str_p,</span><br><span> const struct log_info *categories)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[128];</span><br><span> int i;</span><br><span> for (i = 0; i < categories->num_cat; i++) {</span><br><span> if (categories->cat[i].name == NULL)</span><br><span> continue;</span><br><span> /* skip the leading 'D' in each category name, hence '+ 1' */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_str_tolower_buf(buf, sizeof(buf), categories->cat[i].name + 1);</span><br><span> osmo_talloc_asprintf(tall_log_ctx, *cmd_str_p, "%s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- i ? "|" : "",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_str_tolower(categories->cat[i].name + 1));</span><br><span style="color: hsl(120, 100%, 40%);">+ i ? "|" : "", buf);</span><br><span> osmo_talloc_asprintf(tall_log_ctx, *doc_str_p, "%s\n",</span><br><span> categories->cat[i].description);</span><br><span> }</span><br><span>@@ -868,6 +869,7 @@</span><br><span> </span><br><span> static int config_write_log_single(struct vty *vty, struct log_target *tgt)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ char level_buf[128];</span><br><span> int i;</span><br><span> </span><br><span> switch (tgt->type) {</span><br><span>@@ -923,26 +925,25 @@</span><br><span> </span><br><span> if (tgt->loglevel) {</span><br><span> const char *level_str = get_value_string_or_null(loglevel_strs, tgt->loglevel);</span><br><span style="color: hsl(0, 100%, 40%);">- level_str = osmo_str_tolower(level_str);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!level_str)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!level_str) {</span><br><span> vty_out(vty, "%% Invalid log level %u for 'force-all'%s",</span><br><span> tgt->loglevel, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " logging level force-all %s%s", level_str, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_str_tolower_buf(level_buf, sizeof(level_buf), level_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " logging level force-all %s%s", level_buf, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> for (i = 0; i < osmo_log_info->num_cat; i++) {</span><br><span> const struct log_category *cat = &tgt->categories[i];</span><br><span style="color: hsl(0, 100%, 40%);">- const char *cat_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ char cat_name[128];</span><br><span> const char *level_str;</span><br><span> </span><br><span> /* skip empty entries in the array */</span><br><span> if (!osmo_log_info->cat[i].name)</span><br><span> continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Note: cat_name references the static buffer returned by osmo_str_tolower(), will</span><br><span style="color: hsl(0, 100%, 40%);">- * become invalid after next osmo_str_tolower() invocation. */</span><br><span style="color: hsl(0, 100%, 40%);">- cat_name = osmo_str_tolower(osmo_log_info->cat[i].name+1);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_str_tolower_buf(cat_name, sizeof(cat_name), osmo_log_info->cat[i].name + 1);</span><br><span> </span><br><span> level_str = get_value_string_or_null(loglevel_strs, cat->loglevel);</span><br><span> if (!level_str) {</span><br><span>@@ -951,8 +952,9 @@</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_str_tolower_buf(level_buf, sizeof(level_buf), level_str);</span><br><span> vty_out(vty, " logging level %s", cat_name);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %s%s", osmo_str_tolower(level_str), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s%s", level_buf, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> return 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/15032">change 15032</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/+/15032"/><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: I2e99de1142020e4d80ef0a094e4e751f7903f5f9 </div>
<div style="display:none"> Gerrit-Change-Number: 15032 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>