[dahdi-commits] fjoe: freebsd/trunk r10605 - in /freebsd/trunk: drivers/dahdi/ include/dahdi/
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Wed Mar 28 13:12:30 CDT 2012
Author: fjoe
Date: Wed Mar 28 13:12:26 2012
New Revision: 10605
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10605
Log:
Reduce diffs to dahdi-linux:
- kref_put() can now be called with spinlocks held
- redefine wake_up_interruptible() so that it also does selwakeup()
- drain poll queue on chan unregistration
Modified:
freebsd/trunk/drivers/dahdi/dahdi-base.c
freebsd/trunk/include/dahdi/kernel.h
Modified: freebsd/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=10605&r1=10604&r2=10605
==============================================================================
--- freebsd/trunk/drivers/dahdi/dahdi-base.c (original)
+++ freebsd/trunk/drivers/dahdi/dahdi-base.c Wed Mar 28 13:12:26 2012
@@ -38,9 +38,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#if defined(__FreeBSD__)
-#include <linux/slab.h> /* linux/proc_fs.h */
-#else
+#ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#endif
@@ -198,6 +196,36 @@
spin_unlock_irqrestore(&pseudo_free_list_lock, flags);
}
+static void
+dahdi_poll_wait(struct file *fp, struct selinfo *sel, poll_table *p)
+{
+ poll_wait(fp, (wait_queue_head_t *)sel, p);
+}
+
+static void
+dahdi_poll_drain(struct selinfo *sel)
+{
+ seldrain(sel);
+}
+
+static void
+dahdi_init_waitqueue_head(struct selinfo *sel)
+{
+ init_waitqueue_head((wait_queue_head_t *) sel);
+}
+
+static void
+dahdi_wake_up_interruptible(struct selinfo *sel)
+{
+ wake_up_interruptible((wait_queue_head_t *) sel);
+ selwakeup(sel);
+}
+
+#ifdef wake_up_interruptible
+#undef wake_up_interruptible
+#endif
+#define wake_up_interruptible(waitq) dahdi_wake_up_interruptible(waitq)
+
static int dahdi_span_register_chardev(struct dahdi_span *span);
static void dahdi_span_unregister_chardev(struct dahdi_span *span);
#else /* !__FreeBSD__ */
@@ -225,6 +253,30 @@
dahdi_copy_from_user(void *to, const void __user *from, int n)
{
return copy_from_user(to, from, n);
+}
+
+static void
+dahdi_poll_wait(struct file *fp, wait_queue_head_t *waitq, poll_table *p)
+{
+ poll_wait(fp, waitq, p);
+}
+
+static void
+dahdi_poll_drain(wait_queue_head_t *waitq)
+{
+ // nothing to do
+}
+
+static void
+dahdi_init_waitqueue_head(wait_queue_head_t *waitq)
+{
+ init_waitqueue_head(waitq);
+}
+
+static void
+dahdi_wake_up_interruptible(wait_queue_head_t *waitq)
+{
+ wake_up_interruptible(waitq);
}
EXPORT_SYMBOL(dahdi_transcode_fops);
@@ -419,9 +471,10 @@
int ping; /* Whether we've been ping'd */
int tripped; /* Whether we're tripped */
struct list_head list;
+#if defined(__FreeBSD__)
+ struct selinfo sel;
+#else
wait_queue_head_t sel;
-#if defined(__FreeBSD__)
- struct selinfo selinfo;
#endif
};
@@ -602,16 +655,6 @@
{
return (file->private_data) ?
file->private_data : chan_from_num(UNIT(file));
-}
-
-static void
-dahdi_wake_up_chan(struct dahdi_chan *chan)
-{
- wake_up_interruptible(&chan->waitq);
-#if defined(__FreeBSD__)
- if (chan->file)
- selwakeup(&chan->file->selinfo);
-#endif
}
/**
@@ -1155,7 +1198,7 @@
chan->eventinidx = 0;
/* wake em all up */
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
return;
}
@@ -1578,13 +1621,7 @@
if (chan->curzone) {
struct dahdi_zone *zone = chan->curzone;
chan->curzone = NULL;
-#if defined(__FreeBSD__)
- spin_unlock_irqrestore(&chan->lock, flags);
-#endif
tone_zone_put(zone);
-#if defined(__FreeBSD__)
- spin_lock_irqsave(&chan->lock, flags);
-#endif
}
chan->cadencepos = 0;
chan->pdialcount = 0;
@@ -1844,13 +1881,7 @@
if (chan->curzone) {
struct dahdi_zone *zone = chan->curzone;
chan->curzone = NULL;
-#if defined(__FreeBSD__)
- spin_unlock_irqrestore(&chan->lock, flags);
-#endif
tone_zone_put(zone);
-#if defined(__FreeBSD__)
- spin_lock_irqsave(&chan->lock, flags);
-#endif
}
chan->curzone = z;
memcpy(chan->ringcadence, z->ringcadence, sizeof(chan->ringcadence));
@@ -1895,7 +1926,7 @@
might_sleep();
spin_lock_init(&chan->lock);
- init_waitqueue_head(&chan->waitq);
+ dahdi_init_waitqueue_head(&chan->waitq);
if (!chan->master)
chan->master = chan;
if (!chan->readchunk)
@@ -2338,9 +2369,6 @@
* From now on, any file_operations for this device
* would call the nodev_fops methods.
*/
-#if defined(__FreeBSD__)
- seldrain(&chan->file->selinfo);
-#endif
}
release_echocan(chan->ec_factory);
@@ -2375,6 +2403,7 @@
/* Let processeses out of their poll_wait() */
wake_up_interruptible(&chan->waitq);
+ dahdi_poll_drain(&chan->waitq);
/* release tone_zone */
close_channel(chan);
@@ -2406,6 +2435,7 @@
if (chan->span)
put_span(chan->span);
}
+ spin_lock_destroy(&chan->lock);
}
static ssize_t dahdi_chan_read(FOP_READ_ARGS_DECL)
@@ -3068,7 +3098,7 @@
if (!(t = kzalloc(sizeof(*t), GFP_KERNEL)))
return -ENOMEM;
- init_waitqueue_head(&t->sel);
+ dahdi_init_waitqueue_head(&t->sel);
INIT_LIST_HEAD(&t->list);
file->private_data = t;
@@ -3103,9 +3133,7 @@
return 0;
}
-#if defined(__FreeBSD__)
- seldrain(&cur->selinfo);
-#endif
+ dahdi_poll_drain(&cur->sel);
kfree(cur);
return 0;
@@ -4043,9 +4071,6 @@
spin_lock_irqsave(&dahdi_timer_lock, flags);
timer->ping = 1;
wake_up_interruptible(&timer->sel);
-#if defined(__FreeBSD__)
- selwakeup(&timer->selinfo);
-#endif
spin_unlock_irqrestore(&dahdi_timer_lock, flags);
break;
case DAHDI_TIMERPONG:
@@ -5950,7 +5975,7 @@
chan->readn[j] = 0;
chan->readidx[j] = 0;
}
- dahdi_wake_up_chan(chan); /* wake_up_interruptible waiting on read */
+ wake_up_interruptible(&chan->waitq); /* wake_up_interruptible waiting on read */
}
if (i & DAHDI_FLUSH_WRITE) /* if for write (output) */
{
@@ -5962,7 +5987,7 @@
chan->writen[j] = 0;
chan->writeidx[j] = 0;
}
- dahdi_wake_up_chan(chan); /* wake_up_interruptible waiting on write */
+ wake_up_interruptible(&chan->waitq); /* wake_up_interruptible waiting on write */
}
if (i & DAHDI_FLUSH_EVENT) /* if for events */
{
@@ -7935,7 +7960,7 @@
there is something to write */
ms->outwritebuf = -1;
if (ms->iomask & (DAHDI_IOMUX_WRITE | DAHDI_IOMUX_WRITEEMPTY))
- dahdi_wake_up_chan(ms);
+ wake_up_interruptible(&ms->waitq);
/* If we're only supposed to start when full, disable the transmitter */
if ((ms->txbufpolicy == DAHDI_POLICY_WHEN_FULL) ||
(ms->txbufpolicy == DAHDI_POLICY_HALF_FULL))
@@ -7945,7 +7970,7 @@
if (ms->outwritebuf == ms->inwritebuf) {
ms->outwritebuf = oldbuf;
if (ms->iomask & (DAHDI_IOMUX_WRITE | DAHDI_IOMUX_WRITEEMPTY))
- dahdi_wake_up_chan(ms);
+ wake_up_interruptible(&ms->waitq);
/* If we're only supposed to start when full, disable the transmitter */
if ((ms->txbufpolicy == DAHDI_POLICY_WHEN_FULL) ||
(ms->txbufpolicy == DAHDI_POLICY_HALF_FULL))
@@ -7969,7 +7994,7 @@
out in the later versions, and is put back now. */
if (!(ms->flags & DAHDI_FLAG_PPP) ||
!dahdi_have_netdev(ms)) {
- dahdi_wake_up_chan(ms);
+ wake_up_interruptible(&ms->waitq);
}
/* Transmit a flag if this is an HDLC channel */
if (ms->flags & DAHDI_FLAG_HDLC)
@@ -8144,7 +8169,7 @@
case DAHDI_TXSTATE_START:
/* If we were starting, go off hook now ready to debounce */
dahdi_rbs_sethook(chan, DAHDI_TXSIG_OFFHOOK, DAHDI_TXSTATE_AFTERSTART, DAHDI_AFTERSTART_TIME);
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_PREWINK:
@@ -8157,7 +8182,7 @@
dahdi_rbs_sethook(chan, DAHDI_TXSIG_ONHOOK, DAHDI_TXSTATE_ONHOOK, 0);
if (chan->file && (chan->file->f_flags & O_NONBLOCK))
__qevent(chan, DAHDI_EVENT_HOOKCOMPLETE);
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_PREFLASH:
@@ -8169,7 +8194,7 @@
dahdi_rbs_sethook(chan, DAHDI_TXSIG_OFFHOOK, DAHDI_TXSTATE_OFFHOOK, 0);
if (chan->file && (chan->file->f_flags & O_NONBLOCK))
__qevent(chan, DAHDI_EVENT_HOOKCOMPLETE);
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_DEBOUNCE:
@@ -8177,21 +8202,21 @@
/* See if we've gone back on hook */
if ((chan->rxhooksig == DAHDI_RXSIG_ONHOOK) && (chan->rxflashtime > 2))
chan->itimerset = chan->itimer = chan->rxflashtime * DAHDI_CHUNKSIZE;
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_AFTERSTART:
dahdi_rbs_sethook(chan, DAHDI_TXSIG_OFFHOOK, DAHDI_TXSTATE_OFFHOOK, 0);
if (chan->file && (chan->file->f_flags & O_NONBLOCK))
__qevent(chan, DAHDI_EVENT_HOOKCOMPLETE);
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_KEWL:
dahdi_rbs_sethook(chan, DAHDI_TXSIG_ONHOOK, DAHDI_TXSTATE_AFTERKEWL, DAHDI_AFTERKEWLTIME);
if (chan->file && (chan->file->f_flags & O_NONBLOCK))
__qevent(chan, DAHDI_EVENT_HOOKCOMPLETE);
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_AFTERKEWL:
@@ -8205,7 +8230,7 @@
case DAHDI_TXSTATE_PULSEBREAK:
dahdi_rbs_sethook(chan, DAHDI_TXSIG_OFFHOOK, DAHDI_TXSTATE_PULSEMAKE,
chan->pulsemaketime);
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_PULSEMAKE:
@@ -8219,13 +8244,13 @@
}
chan->txstate = DAHDI_TXSTATE_PULSEAFTER;
chan->otimer = chan->pulseaftertime * DAHDI_CHUNKSIZE;
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
case DAHDI_TXSTATE_PULSEAFTER:
chan->txstate = DAHDI_TXSTATE_OFFHOOK;
__do_dtmf(chan);
- dahdi_wake_up_chan(chan);
+ wake_up_interruptible(&chan->waitq);
break;
default:
@@ -9137,7 +9162,7 @@
/* if there are processes waiting in poll() on this channel,
wake them up */
if (!ms->rxdisable) {
- dahdi_wake_up_chan(ms);
+ wake_up_interruptible(&ms->waitq);
}
}
/* In the very orignal driver, it was quite well known to me (Jim) that there
@@ -9159,7 +9184,7 @@
#ifdef CONFIG_DAHDI_DEBUG
module_printk(KERN_NOTICE, "Notifying reader data in block %d\n", oldbuf);
#endif
- dahdi_wake_up_chan(ms);
+ wake_up_interruptible(&ms->waitq);
}
}
}
@@ -9345,7 +9370,7 @@
}
if (!ss->rxdisable)
- dahdi_wake_up_chan(ss);
+ wake_up_interruptible(&ss->waitq);
spin_unlock_irqrestore(&ss->lock, flags);
}
@@ -9382,7 +9407,7 @@
if (ss->outwritebuf == ss->inwritebuf) {
ss->outwritebuf = -1;
if (ss->iomask & (DAHDI_IOMUX_WRITE | DAHDI_IOMUX_WRITEEMPTY))
- dahdi_wake_up_chan(ss);
+ wake_up_interruptible(&ss->waitq);
/* If we're only supposed to start when full, disable the transmitter */
if ((ss->txbufpolicy == DAHDI_POLICY_WHEN_FULL) || (ss->txbufpolicy == DAHDI_POLICY_HALF_FULL))
ss->txdisable = 1;
@@ -9394,7 +9419,7 @@
if (!(ss->flags & DAHDI_FLAG_PPP) ||
!dahdi_have_netdev(ss)) {
- dahdi_wake_up_chan(ss);
+ wake_up_interruptible(&ss->waitq);
}
}
} else {
@@ -9422,9 +9447,6 @@
cur->tripped++;
cur->pos = cur->ms;
wake_up_interruptible(&cur->sel);
-#if defined(__FreeBSD__)
- selwakeup(&cur->selinfo);
-#endif
}
}
}
@@ -9437,7 +9459,7 @@
unsigned long flags;
int ret = 0;
if (timer) {
- poll_wait(file, &timer->sel, wait_table);
+ dahdi_poll_wait(file, &timer->sel, wait_table);
spin_lock_irqsave(&dahdi_timer_lock, flags);
if (timer->tripped || timer->ping)
ret |= POLLPRI;
@@ -9472,7 +9494,7 @@
return POLLERR | POLLHUP | POLLRDHUP | POLLNVAL | POLLPRI;
}
- poll_wait(file, &c->waitq, wait_table);
+ dahdi_poll_wait(file, &c->waitq, wait_table);
spin_lock_irqsave(&c->lock, flags);
ret |= (c->inwritebuf > -1) ? POLLOUT|POLLWRNORM : 0;
@@ -10639,17 +10661,11 @@
while (!list_empty(&tone_zones)) {
z = list_entry(tone_zones.next, struct dahdi_zone, node);
list_del(&z->node);
-#if defined(__FreeBSD__)
- spin_unlock(&zone_lock);
-#endif
if (!tone_zone_put(z)) {
module_printk(KERN_WARNING,
"Potential memory leak detected in %s\n",
__func__);
}
-#if defined(__FreeBSD__)
- spin_lock(&zone_lock);
-#endif
}
spin_unlock(&zone_lock);
Modified: freebsd/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/freebsd/trunk/include/dahdi/kernel.h?view=diff&rev=10605&r1=10604&r2=10605
==============================================================================
--- freebsd/trunk/include/dahdi/kernel.h (original)
+++ freebsd/trunk/include/dahdi/kernel.h Wed Mar 28 13:12:26 2012
@@ -521,7 +521,11 @@
int sigcap; /*!< Capability for signalling */
__u32 chan_alarms; /*!< alarms status */
+#if defined(__FreeBSD__)
+ struct selinfo waitq;
+#else
wait_queue_head_t waitq;
+#endif
/* Used only by DAHDI -- NO DRIVER SERVICEABLE PARTS BELOW */
/* Buffer declarations */
More information about the dahdi-commits
mailing list