<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17083] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17083">17083</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-03-23 12:40:04 -0500 (Tue, 23 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypopen: snd-dummy ALSA driver, hopefully lower cpu load</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypopenalsadummyc">freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypopenalsadummyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c (17082 => 17083)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c 2010-03-23 17:14:01 UTC (rev 17082)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c 2010-03-23 17:40:04 UTC (rev 17083)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#include <sound/driver.h> //giova
</del><ins>+//#include <sound/driver.h> //giova
</ins><span class="cx"> #include <linux/init.h>
</span><span class="cx"> #include <linux/err.h>
</span><span class="cx"> #include <linux/platform_device.h>
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> struct snd_pcm_substream *substream;
</span><span class="cx"> struct snd_dummy_pcm *dpcm;
</span><span class="cx"> int started;
</span><ins>+ int elapsed;
</ins><span class="cx"> };
</span><span class="cx"> static struct giovadpcm giovadpcms[MAX_PCM_SUBSTREAMS];
</span><span class="cx">
</span><span class="lines">@@ -127,8 +128,8 @@
</span><span class="cx">
</span><span class="cx"> struct snd_dummy_pcm {
</span><span class="cx"> struct snd_dummy *dummy;
</span><del>- spinlock_t lock;
- struct timer_list timer;
</del><ins>+ //spinlock_t lock;
+ //struct timer_list timer;
</ins><span class="cx"> unsigned int pcm_buffer_size;
</span><span class="cx"> unsigned int pcm_period_size;
</span><span class="cx"> unsigned int pcm_bps; /* bytes per second */
</span><span class="lines">@@ -171,6 +172,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (giovadpcms[i].dpcm == dpcm) {
</span><span class="cx"> giovadpcms[i].started = 0;
</span><ins>+ giovadpcms[i].elapsed = 0;
</ins><span class="cx"> found = 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -234,6 +236,7 @@
</span><span class="cx"> giovatimer.expires = 1 + jiffies;
</span><span class="cx"> add_timer(&giovatimer);
</span><span class="cx">
</span><ins>+ spin_lock_bh(&giovalock);
</ins><span class="cx"> for (i = 0; i < giovaindex + 1; i++) {
</span><span class="cx">
</span><span class="cx"> if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
</span><span class="lines">@@ -246,18 +249,38 @@
</span><span class="cx"> printk("giova: timer_func %d %d NULL: continue\n", __LINE__, i);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- spin_lock_bh(&dpcm->lock);
- dpcm->pcm_irq_pos += dpcm->pcm_bps;
- dpcm->pcm_buf_pos += dpcm->pcm_bps;
</del><ins>+ //spin_lock_bh(&dpcm->lock);
+ dpcm->pcm_irq_pos += dpcm->pcm_bps * 1;
+ dpcm->pcm_buf_pos += dpcm->pcm_bps * 1;
</ins><span class="cx"> dpcm->pcm_buf_pos %= dpcm->pcm_buffer_size * dpcm->pcm_hz;
</span><span class="cx"> if (dpcm->pcm_irq_pos >= dpcm->pcm_period_size * dpcm->pcm_hz) {
</span><span class="cx"> dpcm->pcm_irq_pos %= dpcm->pcm_period_size * dpcm->pcm_hz;
</span><del>- spin_unlock_bh(&dpcm->lock);
- snd_pcm_period_elapsed(dpcm->substream);
</del><ins>+ //spin_unlock_bh(&dpcm->lock);
+ //snd_pcm_period_elapsed(dpcm->substream);
+ giovadpcms[i].elapsed = 1;
</ins><span class="cx"> } else {
</span><del>- spin_unlock_bh(&dpcm->lock);
</del><ins>+ //spin_unlock_bh(&dpcm->lock);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ spin_unlock_bh(&giovalock);
+ for (i = 0; i < giovaindex + 1; i++) {
+
+ if (i > MAX_PCM_SUBSTREAMS || giovaindex > MAX_PCM_SUBSTREAMS) {
+ printk("giova, %s:%d, i=%d, giovaindex=%d dpcm=%p\n", __FILE__, __LINE__, i, giovaindex, dpcm);
+ }
+ if (giovadpcms[i].started != 1)
+ continue;
+ dpcm = giovadpcms[i].dpcm;
+ if (dpcm == NULL) {
+ printk("giova: timer_func %d %d NULL: continue\n", __LINE__, i);
+ continue;
+ }
+ if (giovadpcms[i].elapsed){
+ snd_pcm_period_elapsed(dpcm->substream);
+ giovadpcms[i].elapsed = 0;
+ }
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static snd_pcm_uframes_t snd_card_dummy_pcm_pointer(struct snd_pcm_substream *substream)
</span><span class="lines">@@ -265,7 +288,8 @@
</span><span class="cx"> struct snd_pcm_runtime *runtime = substream->runtime;
</span><span class="cx"> struct snd_dummy_pcm *dpcm = runtime->private_data;
</span><span class="cx">
</span><del>- return bytes_to_frames(runtime, dpcm->pcm_buf_pos / dpcm->pcm_hz);
</del><ins>+ //return bytes_to_frames(runtime, dpcm->pcm_buf_pos / dpcm->pcm_hz);
+ return (dpcm->pcm_buf_pos / dpcm->pcm_hz) / 2;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static struct snd_pcm_hardware snd_card_dummy_playback = {
</span><span class="lines">@@ -277,7 +301,7 @@
</span><span class="cx"> .channels_min = USE_CHANNELS_MIN,
</span><span class="cx"> .channels_max = USE_CHANNELS_MAX,
</span><span class="cx"> .buffer_bytes_max = MAX_BUFFER_SIZE,
</span><del>- .period_bytes_min = 64,
</del><ins>+ .period_bytes_min = 256,
</ins><span class="cx"> .period_bytes_max = MAX_PERIOD_SIZE,
</span><span class="cx"> .periods_min = USE_PERIODS_MIN,
</span><span class="cx"> .periods_max = USE_PERIODS_MAX,
</span><span class="lines">@@ -293,7 +317,7 @@
</span><span class="cx"> .channels_min = USE_CHANNELS_MIN,
</span><span class="cx"> .channels_max = USE_CHANNELS_MAX,
</span><span class="cx"> .buffer_bytes_max = MAX_BUFFER_SIZE,
</span><del>- .period_bytes_min = 64,
</del><ins>+ .period_bytes_min = 256,
</ins><span class="cx"> .period_bytes_max = MAX_PERIOD_SIZE,
</span><span class="cx"> .periods_min = USE_PERIODS_MIN,
</span><span class="cx"> .periods_max = USE_PERIODS_MAX,
</span><span class="lines">@@ -313,6 +337,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ((giovadpcms[i].dpcm == runtime->private_data)) {
</span><span class="cx"> giovadpcms[i].started = 0;
</span><ins>+ giovadpcms[i].elapsed = 0;
</ins><span class="cx"> } else {
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -342,8 +367,8 @@
</span><span class="cx"> printk("giova, %s:%d, giovaindex=%d NO MEMORY!!!!\n", __FILE__, __LINE__, giovaindex);
</span><span class="cx"> return dpcm;
</span><span class="cx"> }
</span><del>- init_timer(&dpcm->timer);
- spin_lock_init(&dpcm->lock);
</del><ins>+ //init_timer(&dpcm->timer);
+ //spin_lock_init(&dpcm->lock);
</ins><span class="cx"> dpcm->substream = substream;
</span><span class="cx">
</span><span class="cx"> spin_lock_bh(&giovalock);
</span><span class="lines">@@ -376,6 +401,7 @@
</span><span class="cx"> if (giovadpcms[i].substream == substream) {
</span><span class="cx"> giovadpcms[i].dpcm = dpcm;
</span><span class="cx"> giovadpcms[i].started = 0;
</span><ins>+ giovadpcms[i].elapsed = 0;
</ins><span class="cx"> found = 1;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -630,14 +656,14 @@
</span><span class="cx"> int idx, err;
</span><span class="cx"> int dev = devptr->id;
</span><span class="cx">
</span><del>- card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_dummy)); //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
- if (card == NULL) //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
- return -ENOMEM; //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
</del><ins>+ //card = snd_card_new(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_dummy)); //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
+ //if (card == NULL) //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
+ //return -ENOMEM; //giova if this gives you problems, comment it out and remove comment from the 4 lines commented below
</ins><span class="cx">
</span><del>- //giova err = snd_card_create(index[dev], id[dev], THIS_MODULE,
- //giova sizeof(struct snd_dummy), &card);
- //giova if (err < 0)
- //giova return err;
</del><ins>+ err = snd_card_create(index[dev], id[dev], THIS_MODULE,
+ sizeof(struct snd_dummy), &card);
+ if (err < 0)
+ return err;
</ins><span class="cx">
</span><span class="cx"> dummy = card->private_data;
</span><span class="cx"> dummy->card = card;
</span><span class="lines">@@ -741,13 +767,14 @@
</span><span class="cx"> giovadpcms[i].substream = NULL;
</span><span class="cx"> giovadpcms[i].dpcm = NULL;
</span><span class="cx"> giovadpcms[i].started = 0;
</span><ins>+ giovadpcms[i].elapsed = 0;
</ins><span class="cx"> }
</span><span class="cx"> init_timer(&giovatimer);
</span><span class="cx"> giovatimer.data = (unsigned long) &giovadpcms;
</span><span class="cx"> giovatimer.function = snd_card_dummy_pcm_timer_function;
</span><span class="cx"> giovatimer.expires = 1 + jiffies;
</span><span class="cx"> add_timer(&giovatimer);
</span><del>- printk("snd-dummy skypopen driver version: 3, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
</del><ins>+ printk("snd-dummy skypopen driver version: 5, %s:%d working on a machine with %dHZ kernel\n", __FILE__, __LINE__, HZ);
</ins><span class="cx"> spin_unlock_bh(&giovalock);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>