paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-02 21:13:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

rf: Delay execution of commands

Browse Source 
Delay executing RF commands up to a second. If many commands
arrive within a second then just execute the last command.
This commit is contained in:
Holger Hans Peter Freyther
2011-02-14 23:41:42 +01:00
parent 00c805f213
commit 11762459e8
2 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openbsc/include/openbsc/osmo_bsc_rf.h
View File

@@ -14,6 +14,10 @@ struct osmo_bsc_rf {
const char *last_state_command; const char *last_state_command;
/* delay the command */
char last_request;
struct timer_list delay_cmd;
/* verify that RF is up as it should be */ /* verify that RF is up as it should be */
struct timer_list rf_check; struct timer_list rf_check;

53
openbsc/src/bsc/osmo_bsc_rf.c
View File

@@ -155,20 +155,44 @@ static void grace_timeout(void *_data)
switch_rf_off(rf); switch_rf_off(rf);
} }
static int enter_grace(struct osmo_bsc_rf_conn *conn) static int enter_grace(struct osmo_bsc_rf *rf)
{ {
struct osmo_bsc_rf *rf = conn->rf;
rf->grace_timeout.cb = grace_timeout; rf->grace_timeout.cb = grace_timeout;
rf->grace_timeout.data = rf; rf->grace_timeout.data = rf;
bsc_schedule_timer(&rf->grace_timeout, rf->gsm_network->msc_data->mid_call_timeout, 0); bsc_schedule_timer(&rf->grace_timeout, rf->gsm_network->msc_data->mid_call_timeout, 0);
LOGP(DINP, LOGL_NOTICE, "Going to switch RF off in %d seconds.\n", LOGP(DINP, LOGL_NOTICE, "Going to switch RF off in %d seconds.\n",
rf->gsm_network->msc_data->mid_call_timeout); rf->gsm_network->msc_data->mid_call_timeout);
send_signal(conn->rf, S_RF_GRACE); send_signal(rf, S_RF_GRACE);
return 0; return 0;
} }
static void rf_delay_cmd_cb(void *data)
{
struct osmo_bsc_rf *rf = data;
switch (rf->last_request) {
case RF_CMD_D_OFF:
rf->last_state_command = "RF Direct Off";
bsc_del_timer(&rf->rf_check);
bsc_del_timer(&rf->grace_timeout);
switch_rf_off(rf);
break;
case RF_CMD_ON:
rf->last_state_command = "RF Direct On";
bsc_del_timer(&rf->grace_timeout);
lock_each_trx(rf->gsm_network, 0);
send_signal(rf, S_RF_ON);
bsc_schedule_timer(&rf->rf_check, 3, 0);
break;
case RF_CMD_OFF:
rf->last_state_command = "RF Scheduled Off";
bsc_del_timer(&rf->rf_check);
enter_grace(rf);
break;
}
}
static int rf_read_cmd(struct bsc_fd *fd) static int rf_read_cmd(struct bsc_fd *fd)
{ {
struct osmo_bsc_rf_conn *conn = fd->data; struct osmo_bsc_rf_conn *conn = fd->data;
@@ -190,22 +214,11 @@ static int rf_read_cmd(struct bsc_fd *fd)
handle_query(conn); handle_query(conn);
break; break;
case RF_CMD_D_OFF: case RF_CMD_D_OFF:
conn->rf->last_state_command = "RF Direct Off";
bsc_del_timer(&conn->rf->rf_check);
bsc_del_timer(&conn->rf->grace_timeout);
switch_rf_off(conn->rf);
break;
case RF_CMD_ON: case RF_CMD_ON:
conn->rf->last_state_command = "RF Direct On";
bsc_del_timer(&conn->rf->grace_timeout);
lock_each_trx(conn->rf->gsm_network, 0);
send_signal(conn->rf, S_RF_ON);
bsc_schedule_timer(&conn->rf->rf_check, 3, 0);
break;
case RF_CMD_OFF: case RF_CMD_OFF:
conn->rf->last_state_command = "RF Scheduled Off"; conn->rf->last_request = buf[0];
bsc_del_timer(&conn->rf->rf_check); if (!bsc_timer_pending(&conn->rf->delay_cmd))
enter_grace(conn); bsc_schedule_timer(&conn->rf->delay_cmd, 1, 0);
break; break;
default: default:
conn->rf->last_state_command = "Unknown command"; conn->rf->last_state_command = "Unknown command";
@@ -342,6 +355,10 @@ struct osmo_bsc_rf *osmo_bsc_rf_create(const char *path, struct gsm_network *net
rf->rf_check.data = rf; rf->rf_check.data = rf;
rf->rf_check.cb = rf_check_cb; rf->rf_check.cb = rf_check_cb;
/* delay cmd handling */
rf->delay_cmd.data = rf;
rf->delay_cmd.cb = rf_delay_cmd_cb;
return rf; return rf;
} }