mirror of https://gerrit.osmocom.org/libosmocore
src: use namespace prefix osmo_timer* for timer functions
Summary of changes: s/struct timer_list/struct osmo_timer_list/g s/bsc_add_timer/osmo_timer_add/g s/bsc_schedule_timer/osmo_timer_schedule/g s/bsc_del_timer/osmo_timer_del/g s/bsc_timer_pending/osmo_timer_pending/g s/bsc_nearest_timer/osmo_timers_nearest/g s/bsc_prepare_timers/osmo_timers_prepare/g s/bsc_update_timers/osmo_timers_update/g s/bsc_timer_check/osmo_timers_check/g
This commit is contained in:
parent
128e25cc27
commit
2b15952a37
|
@ -163,7 +163,7 @@ struct gprs_nsvc {
|
||||||
uint32_t state;
|
uint32_t state;
|
||||||
uint32_t remote_state;
|
uint32_t remote_state;
|
||||||
|
|
||||||
struct timer_list timer;
|
struct osmo_timer_list timer;
|
||||||
enum nsvc_timer_mode timer_mode;
|
enum nsvc_timer_mode timer_mode;
|
||||||
int alive_retries;
|
int alive_retries;
|
||||||
|
|
||||||
|
|
|
@ -166,8 +166,8 @@ struct gprs_nsvc *nsvc_create(struct gprs_ns_inst *nsi, uint16_t nsvci)
|
||||||
|
|
||||||
void nsvc_delete(struct gprs_nsvc *nsvc)
|
void nsvc_delete(struct gprs_nsvc *nsvc)
|
||||||
{
|
{
|
||||||
if (bsc_timer_pending(&nsvc->timer))
|
if (osmo_timer_pending(&nsvc->timer))
|
||||||
bsc_del_timer(&nsvc->timer);
|
osmo_timer_del(&nsvc->timer);
|
||||||
llist_del(&nsvc->list);
|
llist_del(&nsvc->list);
|
||||||
talloc_free(nsvc);
|
talloc_free(nsvc);
|
||||||
}
|
}
|
||||||
|
@ -405,11 +405,11 @@ static void nsvc_start_timer(struct gprs_nsvc *nsvc, enum nsvc_timer_mode mode)
|
||||||
nsvc->nsei, get_value_string(timer_mode_strs, mode),
|
nsvc->nsei, get_value_string(timer_mode_strs, mode),
|
||||||
seconds);
|
seconds);
|
||||||
|
|
||||||
if (bsc_timer_pending(&nsvc->timer))
|
if (osmo_timer_pending(&nsvc->timer))
|
||||||
bsc_del_timer(&nsvc->timer);
|
osmo_timer_del(&nsvc->timer);
|
||||||
|
|
||||||
nsvc->timer_mode = mode;
|
nsvc->timer_mode = mode;
|
||||||
bsc_schedule_timer(&nsvc->timer, seconds, 0);
|
osmo_timer_schedule(&nsvc->timer, seconds, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gprs_ns_timer_cb(void *data)
|
static void gprs_ns_timer_cb(void *data)
|
||||||
|
@ -786,7 +786,7 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg,
|
||||||
rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_BLOCKED]);
|
rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_BLOCKED]);
|
||||||
if (nsvc->persistent || nsvc->remote_end_is_sgsn) {
|
if (nsvc->persistent || nsvc->remote_end_is_sgsn) {
|
||||||
/* stop RESET timer */
|
/* stop RESET timer */
|
||||||
bsc_del_timer(&nsvc->timer);
|
osmo_timer_del(&nsvc->timer);
|
||||||
}
|
}
|
||||||
/* Initiate TEST proc.: Send ALIVE and start timer */
|
/* Initiate TEST proc.: Send ALIVE and start timer */
|
||||||
rc = gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE);
|
rc = gprs_ns_tx_simple(nsvc, NS_PDUT_ALIVE);
|
||||||
|
|
Loading…
Reference in New Issue