From c3b7829b023b6d51f00d01a6708527cbd6d2567d Mon Sep 17 00:00:00 2001
From: Alexandre Ratchov <alex@caoua.org>
Date: Tue, 16 Oct 2012 09:45:53 +0200
Subject: [PATCH] better debug traces

---
 sndiod/dev.c     |  3 +--
 sndiod/siofile.c | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/sndiod/dev.c b/sndiod/dev.c
index 5424dfc..ff3349b 100644
--- a/sndiod/dev.c
+++ b/sndiod/dev.c
@@ -61,7 +61,6 @@ struct midiops dev_midiops = {
 	dev_midi_exit
 };
 
-
 struct slotops zomb_slotops = {
 	zomb_onmove,
 	zomb_onvol,
@@ -99,7 +98,7 @@ slot_log(struct slot *s)
 	log_putu(s->unit);
 #ifdef DEBUG
 	if (log_level >= 3) {
-		log_puts(",vol=");
+		log_puts(" vol=");
 		log_putu(s->vol);
 		if (s->ops) {
 			log_puts(",pst=");
diff --git a/sndiod/siofile.c b/sndiod/siofile.c
index 786461a..e1f3542 100644
--- a/sndiod/siofile.c
+++ b/sndiod/siofile.c
@@ -14,7 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -88,10 +87,6 @@ siofile_onmove(void *arg, int delta)
 		siofile_log(f);
 		log_puts(": tick, delta = ");
 		log_puti(delta);
-		log_puts(", load = ");
-		log_puti((file_utime - f->utime) / 1000);
-		log_puts(" + ");
-		log_puti((file_wtime - f->wtime) / 1000);
 		log_puts("\n");
 	}
 	f->sum_utime += file_utime - f->utime;
@@ -420,7 +415,16 @@ siofile_run(void *arg)
 				return;
 #ifdef DEBUG
 			f->pused += d->round;
+			if (d->prime == 0 && f->pused < d->bufsz - d->round) {
+				siofile_log(f);
+				log_puts(": play hw xrun, pused = ");
+				log_puti(f->pused);
+				log_puts("/");
+				log_puti(d->bufsz);
+				log_puts("\n");
+			}
 			if (f->pused < 0 || f->pused > d->bufsz) {
+				/* this is a device drivers or libsndio bug */
 				siofile_log(f);
 				log_puts(": out of bounds pused = ");
 				log_puti(f->pused);
@@ -429,14 +433,6 @@ siofile_run(void *arg)
 				log_puts("\n");
 				panic();
 			}
-			if (f->pused <= d->bufsz - 2 * d->round) {
-				siofile_log(f);
-				log_puts(": play hw xrun, pused = ");
-				log_puti(f->pused);
-				log_puts("/");
-				log_puti(d->bufsz);
-				log_puts("\n");
-			}
 #endif
 			d->poffs += d->round;
 			if (d->poffs == d->bufsz)