FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "dahdi: If a timer is not configured then we should block indefinitely."

Browse Source 
This reverts commit r9937 and is part of two commits to revert all the timer
changes.

Grouping the timer into rates did not allow a timers rate to be changed after
another thread is already blocked on the poll call

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9990 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2011-06-28 15:55:44 +00:00
parent ab15df5810
commit 6d4a47a6ef
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/dahdi/dahdi-base.c
View File

@@ -8751,40 +8751,14 @@ static void process_timers(void)
spin_unlock(&dahdi_timer_lock);
}
/**
* dahdi_timer_poll - Poll function for a dahdi_timer.
* @file: Open timer handle.
* @wait_table: Just passing through...
*
* Returns 0 if there isn't anything to wake us up, otherwise POLLPRI if there
* is an event waiting on the timer.
*
* Older versions of Asterisk depend on the behavior that this poll will block
* indefintely if the timer has not been configured, so if there is no rate
* attached to the timer, this function must return 0.
*
*/
static unsigned int
dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table)
static unsigned int dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table)
{
struct dahdi_timer *timer = file->private_data;
struct dahdi_timer_rate *rate;
struct dahdi_timer_rate *rate = timer->rate;
if (!timer)
if (!rate || !timer)
return -EINVAL;
rate = timer->rate;
if (!rate) {
static bool __once;
if (!__once) {
__once = true;
module_printk(KERN_NOTICE,
"Calling poll on unconfigured timer.\n");
}
return 0;
}
poll_wait(file, &rate->sel, wait_table);
if (atomic_read(&timer->tripped) || atomic_read(&timer->ping))
return POLLPRI;