<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19336">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logging: Avoid printing OSMO_LOGCOLOR_END if no color was used<br><br>There's no point in printing that code if no color was used in first<br>place, and looks strange when using logging with color enabled but no<br>color assigned to the category printing lines.<br><br>Only affected unit test output by this fix is osmo-bts'x<br>tx_power_test.c, which has been fixed in osmo-bts.git Change-Id<br>I5aa95997c8df4ce5ba8271acae99c45f68b96e11.<br><br>Change-Id: Ie38cc639d7f4acd908f357e5bfb3ced07147583e<br>---<br>M src/logging.c<br>M tests/fsm/fsm_test.err<br>2 files changed, 45 insertions(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/19336/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index c14e696..1c3e5ce 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -500,7 +500,7 @@</span><br><span>            }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   if (target->use_color) {</span><br><span style="color: hsl(120, 100%, 40%);">+   if (target->use_color && c_subsys) {</span><br><span>              ret = snprintf(buf + offset, rem, OSMO_LOGCOLOR_END);</span><br><span>                if (ret < 0)</span><br><span>                      goto err;</span><br><span>diff --git a/tests/fsm/fsm_test.err b/tests/fsm/fsm_test.err</span><br><span>index 13cbacd..4cc5ca4 100644</span><br><span>--- a/tests/fsm/fsm_test.err</span><br><span>+++ b/tests/fsm/fsm_test.err</span><br><span>@@ -1,18 +1,18 @@</span><br><span> Checking FSM allocation</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){NULL}: Allocated</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){NULL}: Received Event EV_B</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){NULL}: Event EV_B not permitted</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){NULL}: Received Event EV_A</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){NULL}: State change to ONE (no timeout)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){ONE}: Received Event EV_B</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){TWO}: Timeout of T2342</span><br><span style="color: hsl(0, 100%, 40%);">-Timer</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(my_id){TWO}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){NULL}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){NULL}: Received Event EV_B</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){NULL}: Event EV_B not permitted</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){NULL}: Received Event EV_A</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){NULL}: State change to ONE (no timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){ONE}: Received Event EV_B</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){ONE}: State change to TWO (T2342, 1s)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){TWO}: Timeout of T2342</span><br><span style="color: hsl(120, 100%, 40%);">+Timer</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(my_id){TWO}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> --- test_id_api()</span><br><span> Test_FSM{NULL}: Allocated</span><br><span style="color: hsl(0, 100%, 40%);">-  osmo_fsm_inst_name() == "Test_FSM"</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_fsm_inst_name() == "Test_FSM"</span><br><span>   osmo_fsm_inst_find_by_name("Test_FSM") == fi</span><br><span> osmo_fsm_inst_update_id("my_id")</span><br><span>     rc == 0, ok</span><br><span>@@ -39,23 +39,23 @@</span><br><span>   osmo_fsm_inst_find_by_id("arbitrary_id") == fi</span><br><span> osmo_fsm_inst_update_id("")</span><br><span> Attempting to set illegal id for FSM instance of type 'Test_FSM': ""</span><br><span style="color: hsl(0, 100%, 40%);">-    rc == -22, ok</span><br><span style="color: hsl(120, 100%, 40%);">+    rc == -22, ok</span><br><span>   osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)"</span><br><span>   osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi</span><br><span> osmo_fsm_inst_update_id("invalid.id")</span><br><span> Attempting to set illegal id for FSM instance of type 'Test_FSM': "invalid.id"</span><br><span style="color: hsl(0, 100%, 40%);">-    rc == -22, ok</span><br><span style="color: hsl(120, 100%, 40%);">+    rc == -22, ok</span><br><span>   osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)"</span><br><span>   osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi</span><br><span> --- id format tests...</span><br><span> osmo_fsm_inst_update_id_f("format%cid", '.')</span><br><span> Attempting to set illegal id for FSM instance of type 'Test_FSM': "format.id"</span><br><span style="color: hsl(0, 100%, 40%);">-    rc == -22, ok</span><br><span style="color: hsl(120, 100%, 40%);">+    rc == -22, ok</span><br><span>   osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)"</span><br><span>   osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi</span><br><span> osmo_fsm_inst_update_id_f("%s", "")</span><br><span> Attempting to set illegal id for FSM instance of type 'Test_FSM': ""</span><br><span style="color: hsl(0, 100%, 40%);">-    rc == -22, ok</span><br><span style="color: hsl(120, 100%, 40%);">+    rc == -22, ok</span><br><span>   osmo_fsm_inst_name() == "Test_FSM(arbitrary_id)"</span><br><span>   osmo_fsm_inst_find_by_name("Test_FSM(arbitrary_id)") == fi</span><br><span> osmo_fsm_inst_update_id_f("format%xid%d", 0x23, 42)</span><br><span>@@ -78,41 +78,41 @@</span><br><span> --- test_id_api() done</span><br><span> </span><br><span> Test_FSM(arbitrary_id){NULL}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(arbitrary_id){NULL}: Freeing instance</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM(arbitrary_id){NULL}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(arbitrary_id){NULL}: Freeing instance</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM(arbitrary_id){NULL}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> --- test_state_chg_keep_timer()</span><br><span> Test_FSM{NULL}: Allocated</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{NULL}: State change to ONE (no timeout)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{ONE}: State change to TWO (no timeout)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">-Total time passed: 0.000000 s</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{NULL}: State change to ONE (no timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{ONE}: State change to TWO (no timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+Total time passed: 0.000000 s</span><br><span> Test_FSM{NULL}: Allocated</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{NULL}: State change to ONE (T10, 10s)</span><br><span style="color: hsl(0, 100%, 40%);">-Total time passed: 2.000342 s</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{NULL}: State change to ONE (T10, 10s)</span><br><span style="color: hsl(120, 100%, 40%);">+Total time passed: 2.000342 s</span><br><span> Test_FSM{ONE}: State change to TWO (keeping T10, 7.999s remaining)</span><br><span style="color: hsl(0, 100%, 40%);">-Total time passed: 2.000342 s</span><br><span style="color: hsl(120, 100%, 40%);">+Total time passed: 2.000342 s</span><br><span> Total time passed: 9.999999 s</span><br><span> Total time passed: 10.000000 s</span><br><span> Test_FSM{TWO}: Timeout of T10</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">---- test_state_chg_keep_timer() done</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+--- test_state_chg_keep_timer() done</span><br><span> </span><br><span> --- test_state_chg_T()</span><br><span> Test_FSM{NULL}: Allocated</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{NULL}: State change to ONE (T42, 23s)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{ONE}: State change to TWO (no timeout)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{NULL}: Allocated</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{NULL}: State change to ONE (T42, 23s)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{ONE}: State change to TWO (no timeout)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(0, 100%, 40%);">-Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(0, 100%, 40%);">---- test_state_chg_T() done</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{NULL}: State change to ONE (T42, 23s)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{ONE}: State change to TWO (no timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{NULL}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{NULL}: State change to ONE (T42, 23s)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{ONE}: State change to TWO (no timeout)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Terminating (cause = OSMO_FSM_TERM_REQUEST)</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Freeing instance</span><br><span style="color: hsl(120, 100%, 40%);">+Test_FSM{TWO}: Deallocated</span><br><span style="color: hsl(120, 100%, 40%);">+--- test_state_chg_T() done</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19336">change 19336</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/+/19336"/><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: Ie38cc639d7f4acd908f357e5bfb3ced07147583e </div>
<div style="display:none"> Gerrit-Change-Number: 19336 </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-MessageType: newchange </div>