Changeset 78aca91b in mainline

Timestamp:

2013-04-06T18:02:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

98af9cc

Parents:

2c0b348

Message:

hound: Use synchronization primitives instead of sleep waiting

Location:

uspace/srv/audio/hound

Files:

• hound_ctx.c (modified) (6 diffs)
• iface.c (modified) (2 diffs)

uspace/srv/audio/hound/hound_ctx.c

@@ -111 +111 @@
         int flags;
         size_t allowed_size;
+        fibril_mutex_t guard;
+        fibril_condvar_t change;
 } hound_ctx_stream_t;
 
@@ -144 +146 @@
                 audio_pipe_init(&stream->fifo);
                 link_initialize(&stream->link);
+                fibril_mutex_initialize(&stream->guard);
+                fibril_condvar_initialize(&stream->change);
                 stream->ctx = ctx;
                 stream->flags = flags;
@@ -182 +186 @@
                 return EINVAL;
 
-        if (stream->allowed_size &&
-            (audio_pipe_bytes(&stream->fifo) + size > stream->allowed_size))
-                return EBUSY;
-
-        return audio_pipe_push_data(&stream->fifo, data, size, stream->format);
+        fibril_mutex_lock(&stream->guard);
+        while (stream->allowed_size &&
+            (audio_pipe_bytes(&stream->fifo) + size > stream->allowed_size)) {
+            fibril_condvar_wait(&stream->change, &stream->guard);
+
+        }
+
+        const int ret =
+            audio_pipe_push_data(&stream->fifo, data, size, stream->format);
+        fibril_mutex_unlock(&stream->guard);
+        return ret;
 }
 
@@ -199 +209 @@
 {
         assert(stream);
-        const ssize_t copied_size =
-            audio_pipe_mix_data(&stream->fifo, data, size, f);
-        if (copied_size != (ssize_t)size)
-                log_warning("Not enough data in stream buffer");
-        return copied_size;
+        fibril_mutex_lock(&stream->guard);
+        const int ret = audio_pipe_mix_data(&stream->fifo, data, size, f);
+        fibril_condvar_signal(&stream->change);
+        fibril_mutex_unlock(&stream->guard);
+        return ret;
 }
 
@@ -210 +220 @@
         assert(stream);
         log_debug("Draining stream");
+        fibril_mutex_lock(&stream->guard);
         while (audio_pipe_bytes(&stream->fifo))
-                async_usleep(10000);
+                fibril_condvar_wait(&stream->change, &stream->guard);
+        fibril_mutex_unlock(&stream->guard);
 }
 
@@ -233 +245 @@
         list_foreach(ctx->streams, it) {
                 hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it);
-                hound_ctx_stream_add_self(stream, buffer, size, &source->format);
+                ssize_t copied = hound_ctx_stream_add_self(
+                    stream, buffer, size, &source->format);
+                if (copied != (ssize_t)size)
+                        log_warning("Not enough data in stream buffer");
         }
         log_verbose("CTX: %p. Pushing audio to %zu connections", ctx,

uspace/srv/audio/hound/iface.c

@@ -83 +83 @@
         if (!ctx)
                 return false;
-        log_info("%s: %p, %d", __FUNCTION__, server, id);
         return hound_ctx_is_record(ctx);
 }
@@ -150 +149 @@
 static int iface_stream_data_write(void *stream, const void *buffer, size_t size)
 {
-        int ret = EOK;
-        do {
-                ret = hound_ctx_stream_write(stream, buffer, size);
-        } while (ret == EBUSY && (async_usleep(100), 1));
-        return ret;
+        return hound_ctx_stream_write(stream, buffer, size);
 }