aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-07-11 19:53:39 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2018-07-16 16:24:26 +0200
commit5425fbdcd973acfa14fb1e15d41fa2907d8ff338 (patch)
tree24e1a54d89282c0beec423a2c7b5f790b2c7ea23
parent18775a2ec7c61f22637b2f0112157688d757c6be (diff)
create separate logging categories for lchan,ts,as FSMs
-rw-r--r--include/osmocom/bsc/debug.h3
-rw-r--r--src/osmo-bsc/assignment_fsm.c2
-rw-r--r--src/osmo-bsc/lchan_fsm.c2
-rw-r--r--src/osmo-bsc/osmo_bsc_main.c18
-rw-r--r--src/osmo-bsc/timeslot_fsm.c2
-rw-r--r--tests/handover/handover_test.c18
6 files changed, 42 insertions, 3 deletions
diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h
index ed6cbc3cc..0ff426999 100644
--- a/include/osmocom/bsc/debug.h
+++ b/include/osmocom/bsc/debug.h
@@ -26,5 +26,8 @@ enum {
DFILTER,
DPCU,
DLCLS,
+ DLCHAN,
+ DTS,
+ DAS,
Debug_LastEntry,
};
diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c
index c7d55d815..07fe851d1 100644
--- a/src/osmo-bsc/assignment_fsm.c
+++ b/src/osmo-bsc/assignment_fsm.c
@@ -644,7 +644,7 @@ static struct osmo_fsm assignment_fsm = {
.name = "assignment",
.states = assignment_fsm_states,
.num_states = ARRAY_SIZE(assignment_fsm_states),
- .log_subsys = DRSL,
+ .log_subsys = DAS,
.event_names = assignment_fsm_event_names,
.allstate_action = assignment_fsm_allstate_action,
.allstate_event_mask = 0
diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c
index d9eae9c99..41d096618 100644
--- a/src/osmo-bsc/lchan_fsm.c
+++ b/src/osmo-bsc/lchan_fsm.c
@@ -1545,7 +1545,7 @@ static struct osmo_fsm lchan_fsm = {
.name = "lchan",
.states = lchan_fsm_states,
.num_states = ARRAY_SIZE(lchan_fsm_states),
- .log_subsys = DRSL,
+ .log_subsys = DLCHAN,
.event_names = lchan_fsm_event_names,
.allstate_action = lchan_fsm_allstate_action,
.allstate_event_mask = 0
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 218ea15a2..5e4a38d04 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -679,6 +679,24 @@ static const struct log_info_cat osmo_bsc_categories[] = {
.color = "\033[1;35m",
.enabled = 1, .loglevel = LOGL_NOTICE,
},
+ [DLCHAN] = {
+ .name = "DLCHAN",
+ .description = "lchan FSM",
+ .color = "\033[1;32m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DTS] = {
+ .name = "DTS",
+ .description = "timeslot FSM",
+ .color = "\033[1;31m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
+ [DAS] = {
+ .name = "DAS",
+ .description = "assignment FSM",
+ .color = "\033[1;33m",
+ .enabled = 1, .loglevel = LOGL_NOTICE,
+ },
[DNM] = {
.name = "DNM",
.description = "A-bis Network Management / O&M (NM/OML)",
diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c
index 1e5def4a5..9c4e94f34 100644
--- a/src/osmo-bsc/timeslot_fsm.c
+++ b/src/osmo-bsc/timeslot_fsm.c
@@ -825,7 +825,7 @@ static struct osmo_fsm ts_fsm = {
.states = ts_fsm_states,
.num_states = ARRAY_SIZE(ts_fsm_states),
.timer_cb = ts_fsm_timer_cb,
- .log_subsys = DRSL,
+ .log_subsys = DTS,
.event_names = ts_fsm_event_names,
.allstate_event_mask = 0
| S(TS_EV_OML_DOWN)
diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c
index eeded6ef7..6eeb8d3fc 100644
--- a/tests/handover/handover_test.c
+++ b/tests/handover/handover_test.c
@@ -1355,6 +1355,24 @@ static const struct log_info_cat log_categories[] = {
.description = "Mobile Switching Center",
.enabled = 1, .loglevel = LOGL_DEBUG,
},
+ [DLCHAN] = {
+ .name = "DLCHAN",
+ .description = "lchan FSM",
+ .color = "\033[1;32m",
+ .enabled = 1, .loglevel = LOGL_DEBUG,
+ },
+ [DTS] = {
+ .name = "DTS",
+ .description = "timeslot FSM",
+ .color = "\033[1;31m",
+ .enabled = 1, .loglevel = LOGL_DEBUG,
+ },
+ [DAS] = {
+ .name = "DAS",
+ .description = "assignment FSM",
+ .color = "\033[1;33m",
+ .enabled = 1, .loglevel = LOGL_DEBUG,
+ },
};
const struct log_info log_info = {