cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

Make TRX rf locking more visible 

* log administrative state transitions
* log what's caused it
* while at it, mark boolean variable as such

Change-Id: I3e25a19fac4d0b4886d825c9876771b1f66efe58
Related: SYS#3864
This commit is contained in:
Max 2017-09-06 12:04:46 +02:00
parent 630df7d608
commit 48bb4fa10f
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/openbsc/gsm_data.h
View File

@ -662,7 +662,7 @@ struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net,
void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr, void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr,
uint8_t e1_ts, uint8_t e1_ts_ss); uint8_t e1_ts, uint8_t e1_ts_ss);
void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked); void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason);
bool gsm_btsmodel_has_feature(struct gsm_bts_model *model, enum gsm_bts_features feat); bool gsm_btsmodel_has_feature(struct gsm_bts_model *model, enum gsm_bts_features feat);
struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr); struct gsm_bts_trx *gsm_bts_trx_by_nr(struct gsm_bts *bts, int nr);
int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx);

8
src/libbsc/abis_nm.c
View File

@ -2791,9 +2791,13 @@ void abis_nm_ipaccess_cgi(uint8_t *buf, struct gsm_bts *bts)
*((uint16_t *)(buf + 5)) = htons(bts->cell_identity); *((uint16_t *)(buf + 5)) = htons(bts->cell_identity);
} }
void gsm_trx_lock_rf(struct gsm_bts_trx *trx, int locked) void gsm_trx_lock_rf(struct gsm_bts_trx *trx, bool locked, const char *reason)
{ {
int new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED; uint8_t new_state = locked ? NM_STATE_LOCKED : NM_STATE_UNLOCKED;
LOGP(DNM, LOGL_NOTICE, "(bts=%d,trx=%d) Changing adm. state %s -> %s [%s]\n", trx->bts->nr, trx->nr,
get_value_string(abis_nm_adm_state_names, trx->mo.nm_state.administrative),
get_value_string(abis_nm_adm_state_names, new_state), reason);
trx->mo.nm_state.administrative = new_state; trx->mo.nm_state.administrative = new_state;
if (!trx->bts || !trx->bts->oml_link) if (!trx->bts || !trx->bts->oml_link)

8
src/libbsc/bsc_rf_ctrl.c
View File

@ -123,7 +123,7 @@ enum osmo_bsc_rf_policy osmo_bsc_rf_get_policy_by_bts(struct gsm_bts *bts)
} }
} }
static int lock_each_trx(struct gsm_network *net, int lock) static int lock_each_trx(struct gsm_network *net, bool lock)
{ {
struct gsm_bts *bts; struct gsm_bts *bts;
@ -138,7 +138,7 @@ static int lock_each_trx(struct gsm_network *net, int lock)
} }
llist_for_each_entry(trx, &bts->trx_list, list) { llist_for_each_entry(trx, &bts->trx_list, list) {
gsm_trx_lock_rf(trx, lock); gsm_trx_lock_rf(trx, lock, "ctrl");
} }
} }
@ -245,7 +245,7 @@ static void send_signal(struct osmo_bsc_rf *rf, int val)
static int switch_rf_off(struct osmo_bsc_rf *rf) static int switch_rf_off(struct osmo_bsc_rf *rf)
{ {
lock_each_trx(rf->gsm_network, 1); lock_each_trx(rf->gsm_network, true);
send_signal(rf, S_RF_OFF); send_signal(rf, S_RF_OFF);
return 0; return 0;
@ -289,7 +289,7 @@ static void rf_delay_cmd_cb(void *data)
case RF_CMD_ON: case RF_CMD_ON:
rf->last_state_command = "RF Direct On"; rf->last_state_command = "RF Direct On";
osmo_timer_del(&rf->grace_timeout); osmo_timer_del(&rf->grace_timeout);
lock_each_trx(rf->gsm_network, 0); lock_each_trx(rf->gsm_network, false);
send_signal(rf, S_RF_ON); send_signal(rf, S_RF_ON);
osmo_timer_schedule(&rf->rf_check, 3, 0); osmo_timer_schedule(&rf->rf_check, 3, 0);
break; break;

2
src/libbsc/bsc_vty.c
View File

@ -3575,7 +3575,7 @@ DEFUN(cfg_trx_rf_locked,
int locked = atoi(argv[0]); int locked = atoi(argv[0]);
struct gsm_bts_trx *trx = vty->index; struct gsm_bts_trx *trx = vty->index;
gsm_trx_lock_rf(trx, locked); gsm_trx_lock_rf(trx, locked, "vty");
return CMD_SUCCESS; return CMD_SUCCESS;
} }