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

Add new management function to struct timer_list 

Make sure that del_timer succeeds and removes an entry from the list. Currently
sending the LOCATION UPDATING REJECT from within the timer will not remove the
list element as ->active gets set to 0 in the timer updating before calling the
callback. Fix the segfault and allow the timer to be removed from within its
own callback.
This commit is contained in:
Harald Welte 2009-01-02 23:57:22 +00:00
parent 219518d064
commit b8f04ea5a9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/openbsc/timer.h
View File

@ -1,5 +1,5 @@
/*
* (C) 2008 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2008, 2009 by Holger Hans Peter Freyther <zecke@selfish.org>
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@ -46,6 +46,7 @@ struct timer_list {
struct timeval timeout;
int active : 1;
int handled : 1;
int in_list : 1;
void (*cb)(void*);
void *data;

6
src/timer.c
View File

@ -1,5 +1,5 @@
/*
* (C) 2008 by Holger Hans Peter Freyther <zecke@selfish.org>
* (C) 2008,2009 by Holger Hans Peter Freyther <zecke@selfish.org>
* All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@ -43,6 +43,7 @@ void add_timer(struct timer_list *timer)
if (timer == list_timer)
return;
timer->in_list = 1;
llist_add(&timer->entry, &timer_list);
}
@ -60,8 +61,9 @@ void schedule_timer(struct timer_list *timer, int seconds, int microseconds)
void del_timer(struct timer_list *timer)
{
if (timer_pending(timer)) {
if (timer->in_list) {
timer->active = 0;
timer->in_list = 0;
llist_del(&timer->entry);
}
}