radisys
/
osmo-pcu
forked from cellular-infrastructure/osmo-pcu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc: Remove if (timer_pending) stop_timer idiom from the code 

osmo_timer_del is an idempotent operation. There is no requirement
to check if it is running. If you don't want a timer to run, delete
it. Maybe one should have called the method _unschedule, _cancel to
make this more clear.
This commit is contained in:
Holger Hans Peter Freyther 2013-07-13 11:52:50 +02:00
parent a004e6a823
commit 51c57045e5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gprs_bssgp_pcu.cpp
View File

@ -515,8 +515,7 @@ static int nsvc_signal_cb(unsigned int subsys, unsigned int signal,
case S_NS_BLOCK:
if (nsvc_unblocked) {
nsvc_unblocked = 0;
if (osmo_timer_pending(&bvc_timer))
osmo_timer_del(&bvc_timer);
osmo_timer_del(&bvc_timer);
bvc_sig_reset = 0;
bvc_reset = 0;
bvc_unblocked = 0;
@ -646,8 +645,7 @@ void gprs_bssgp_destroy(void)
if (!bssgp_nsi)
return;
if (osmo_timer_pending(&bvc_timer))
osmo_timer_del(&bvc_timer);
osmo_timer_del(&bvc_timer);
osmo_signal_unregister_handler(SS_L_NS, nsvc_signal_cb, NULL);

3
src/sysmo_sock.cpp
View File

@ -304,8 +304,7 @@ void pcu_l1if_close(void)
if (!state)
return;
if (osmo_timer_pending(&state->timer))
osmo_timer_del(&state->timer);
osmo_timer_del(&state->timer);
bfd = &state->conn_bfd;
if (bfd->fd > 0)