<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10106">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">create separate logging categories for lchan,ts,as FSMs<br><br>Change-Id: Ie889b8860a4a63c7c22ef65025f690d64cd7330c<br>---<br>M include/osmocom/bsc/debug.h<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>M src/osmo-bsc/osmo_bsc_main.c<br>M src/osmo-bsc/timeslot_fsm.c<br>M tests/handover/handover_test.c<br>7 files changed, 43 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h</span><br><span>index 1133bf6..e78ba59 100644</span><br><span>--- a/include/osmocom/bsc/debug.h</span><br><span>+++ b/include/osmocom/bsc/debug.h</span><br><span>@@ -24,5 +24,8 @@</span><br><span> DFILTER,</span><br><span> DPCU,</span><br><span> DLCLS,</span><br><span style="color: hsl(120, 100%, 40%);">+ DCHAN,</span><br><span style="color: hsl(120, 100%, 40%);">+ DTS,</span><br><span style="color: hsl(120, 100%, 40%);">+ DAS,</span><br><span> Debug_LastEntry,</span><br><span> };</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index a2b1746..e37ec9c 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -642,7 +642,7 @@</span><br><span> .name = "assignment",</span><br><span> .states = assignment_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(assignment_fsm_states),</span><br><span style="color: hsl(0, 100%, 40%);">- .log_subsys = DRSL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DAS,</span><br><span> .event_names = assignment_fsm_event_names,</span><br><span> .allstate_action = assignment_fsm_allstate_action,</span><br><span> .allstate_event_mask = 0</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 940afe8..9c22bde 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -1275,7 +1275,7 @@</span><br><span> .name = "lchan",</span><br><span> .states = lchan_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(lchan_fsm_states),</span><br><span style="color: hsl(0, 100%, 40%);">- .log_subsys = DRSL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DCHAN,</span><br><span> .event_names = lchan_fsm_event_names,</span><br><span> .allstate_action = lchan_fsm_allstate_action,</span><br><span> .allstate_event_mask = 0</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index 3530b8a..f7efc1b 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -736,7 +736,7 @@</span><br><span> .name = "lchan_rtp",</span><br><span> .states = lchan_rtp_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(lchan_rtp_fsm_states),</span><br><span style="color: hsl(0, 100%, 40%);">- .log_subsys = DRSL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DCHAN,</span><br><span> .event_names = lchan_rtp_fsm_event_names,</span><br><span> .timer_cb = lchan_rtp_fsm_timer_cb,</span><br><span> .cleanup = lchan_rtp_fsm_cleanup,</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 8dc9098..37e8665 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -679,6 +679,24 @@</span><br><span> .color = "\033[1;35m",</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DCHAN] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DCHAN",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "lchan FSM",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;32m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DTS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DTS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "timeslot FSM",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;31m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DAS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DAS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "assignment FSM",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;33m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> [DNM] = {</span><br><span> .name = "DNM",</span><br><span> .description = "A-bis Network Management / O&M (NM/OML)",</span><br><span>diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c</span><br><span>index 21de2fa..56b3357 100644</span><br><span>--- a/src/osmo-bsc/timeslot_fsm.c</span><br><span>+++ b/src/osmo-bsc/timeslot_fsm.c</span><br><span>@@ -834,7 +834,7 @@</span><br><span> .states = ts_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(ts_fsm_states),</span><br><span> .timer_cb = ts_fsm_timer_cb,</span><br><span style="color: hsl(0, 100%, 40%);">- .log_subsys = DRSL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .log_subsys = DTS,</span><br><span> .event_names = ts_fsm_event_names,</span><br><span> .allstate_event_mask = 0</span><br><span> | S(TS_EV_OML_DOWN)</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 92c002d..a962777 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -1357,6 +1357,24 @@</span><br><span> .description = "Mobile Switching Center",</span><br><span> .enabled = 1, .loglevel = LOGL_DEBUG,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DCHAN] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DCHAN",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "lchan FSM",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;32m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DTS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DTS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "timeslot FSM",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;31m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ [DAS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "DAS",</span><br><span style="color: hsl(120, 100%, 40%);">+ .description = "assignment FSM",</span><br><span style="color: hsl(120, 100%, 40%);">+ .color = "\033[1;33m",</span><br><span style="color: hsl(120, 100%, 40%);">+ .enabled = 1, .loglevel = LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> const struct log_info log_info = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10106">change 10106</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/10106"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie889b8860a4a63c7c22ef65025f690d64cd7330c </div>
<div style="display:none"> Gerrit-Change-Number: 10106 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>