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

dahdi: Change iteration through pseudo/real chans in process_masterspan.

Browse Source 
Since we have the pseudo channels on their own list, we don't need to
step through the chans array when we just want to find the pseudo
channels. Likewise, all the real channels will have be on a span.  Also
removes references to the global chans array in process_masterspan.

Review: https://reviewboard.asterisk.org/r/905/

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9384 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2010-09-20 20:34:36 +00:00
parent a017f39fc4
commit 08cfbeb03e
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8543,6 +8543,9 @@ static void process_masterspan(void)
unsigned long flags;
int x, y, z;
struct dahdi_chan *chan;
struct pseudo_chan *pseudo;
struct dahdi_span *s;
u_char *data;
#ifdef CONFIG_DAHDI_CORE_TIMER
/* We increment the calls since start here, so that if we switch over
@@ -8562,10 +8565,14 @@ static void process_masterspan(void)
if (dahdi_dynamic_ioctl)
dahdi_dynamic_ioctl(0, 0);
for (x = 1; x < maxchans; x++) {
chan = chans[x];
if (chan && chan->confmode && !is_pseudo_chan(chan)) {
u_char *data;
for (y = 1; y < maxspans; ++y) {
s = spans[y];
if (!s)
continue;
for (x = 0; x < s->channels; x++) {
chan = s->chans[x];
if (!chan->confmode)
continue;
spin_lock(&chan->lock);
data = __buf_peek(&chan->confin);
__dahdi_receive_chunk(chan, data);
@@ -8575,17 +8582,17 @@ static void process_masterspan(void)
spin_unlock(&chan->lock);
}
}
/* This is the master channel, so make things switch over */
rotate_sums();
/* do all the pseudo and/or conferenced channel receives (getbuf's) */
for (x = 1; x < maxchans; x++) {
chan = chans[x];
if (chan && is_pseudo_chan(chan)) {
spin_lock(&chan->lock);
__dahdi_transmit_chunk(chan, NULL);
spin_unlock(&chan->lock);
}
list_for_each_entry(pseudo, &pseudo_chans, node) {
spin_lock(&pseudo->chan.lock);
__dahdi_transmit_chunk(&pseudo->chan, NULL);
spin_unlock(&pseudo->chan.lock);
}
if (maxlinks) {
#ifdef CONFIG_DAHDI_MMX
dahdi_kernel_fpu_begin();
@@ -8604,21 +8611,24 @@ static void process_masterspan(void)
dahdi_kernel_fpu_end();
#endif
}
/* do all the pseudo/conferenced channel transmits (putbuf's) */
for (x = 1; x < maxchans; x++) {
chan = chans[x];
if (chan && is_pseudo_chan(chan)) {
unsigned char tmp[DAHDI_CHUNKSIZE];
spin_lock(&chan->lock);
__dahdi_getempty(chan, tmp);
__dahdi_receive_chunk(chan, tmp);
spin_unlock(&chan->lock);
}
list_for_each_entry(pseudo, &pseudo_chans, node) {
unsigned char tmp[DAHDI_CHUNKSIZE];
spin_lock(&pseudo->chan.lock);
__dahdi_getempty(&pseudo->chan, tmp);
__dahdi_receive_chunk(&pseudo->chan, tmp);
spin_unlock(&pseudo->chan.lock);
}
for (x = 1; x < maxchans; x++) {
chan = chans[x];
if (chan && chan->confmode && !is_pseudo_chan(chan)) {
u_char *data;
for (y = 1; y < maxspans; ++y) {
s = spans[y];
if (!s)
continue;
for (x = 0; x < s->channels; x++) {
chan = s->chans[x];
if (!chan->confmode)
continue;
spin_lock(&chan->lock);
data = __buf_pushpeek(&chan->confout);
__dahdi_transmit_chunk(chan, data);
@@ -8626,14 +8636,11 @@ static void process_masterspan(void)
__buf_push(&chan->confout, NULL);
spin_unlock(&chan->lock);
}
}
#ifdef DAHDI_SYNC_TICK
for (x = 0; x < maxspans; x++) {
struct dahdi_span *const s = spans[x];
if (s && s->ops->sync_tick)
if (s->ops->sync_tick)
s->ops->sync_tick(s, s == master);
}
#endif
}
read_unlock(&chan_lock);
spin_unlock_irqrestore(&bigzaplock, flags);
}