Changeset 599034e in mainline

Timestamp:

2013-04-06T13:11:44Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

eca79ff

Parents:

5c98bb28

Message:

hound: user mutex to protect stream list

Location:

uspace/srv/audio/hound

Files:

• hound_ctx.c (modified) (9 diffs)
• hound_ctx.h (modified) (3 diffs)

uspace/srv/audio/hound/hound_ctx.c

@@ -56 +56 @@
                 link_initialize(&ctx->link);
                 list_initialize(&ctx->streams);
+                fibril_mutex_initialize(&ctx->guard);
                 ctx->sink = NULL;
                 ctx->source = malloc(sizeof(audio_source_t));
@@ -117 +118 @@
 }
 
+static inline void stream_append(hound_ctx_t *ctx, hound_ctx_stream_t *stream)
+{
+        assert(ctx);
+        assert(stream);
+        fibril_mutex_lock(&ctx->guard);
+        list_append(&stream->link, &ctx->streams);
+        fibril_mutex_unlock(&ctx->guard);
+}
+
+static inline void stream_remove(hound_ctx_t *ctx, hound_ctx_stream_t *stream)
+{
+        assert(ctx);
+        assert(stream);
+        fibril_mutex_lock(&ctx->guard);
+        list_remove(&stream->link);
+        fibril_mutex_unlock(&ctx->guard);
+}
+
 hound_ctx_stream_t *hound_ctx_create_stream(hound_ctx_t *ctx, int flags,
         pcm_format_t format, size_t buffer_size)
@@ -129 +148 @@
                 stream->format = format;
                 stream->allowed_size = buffer_size;
-                list_append(&stream->link, &ctx->streams);
+                stream_append(ctx, stream);
                 log_verbose("CTX: %p added stream; flags:%#x ch: %u r:%u f:%s",
                     ctx, flags, format.channels, format.sampling_rate,
@@ -140 +159 @@
 {
         if (stream) {
-                //TODO consider DRAIN FLAG
-                list_remove(&stream->link);
+                stream_remove(stream->ctx, stream);
                 if (audio_pipe_bytes(&stream->fifo))
                         log_warning("Destroying stream with non empty buffer");
@@ -177 +195 @@
 }
 
-int hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
+ssize_t hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
     size_t size, const pcm_format_t *f)
 {
@@ -185 +203 @@
         if (copied_size != (ssize_t)size)
                 log_warning("Not enough data in stream buffer");
-        return copied_size > 0 ? EOK : copied_size;
+        return copied_size;
 }
 
@@ -195 +213 @@
                 async_usleep(10000);
 }
-
-int hound_ctx_stream_add(hound_ctx_stream_t *stream, void *buffer, size_t size,
-    pcm_format_t format)
-{
-        return ENOTSUP;
-}
-
 
 int update_data(audio_source_t *source, size_t size)
@@ -219 +230 @@
             list_count(&ctx->streams));
         pcm_format_silence(buffer, size, &source->format);
+        fibril_mutex_lock(&ctx->guard);
         list_foreach(ctx->streams, it) {
                 hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it);
@@ -229 +241 @@
                 connection_push_data(conn, adata);
         }
+        fibril_mutex_unlock(&ctx->guard);
         return EOK;
 }

uspace/srv/audio/hound/hound_ctx.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <hound/protocol.h>
+#include <fibril_synch.h>
+
 #include "audio_source.h"
 #include "audio_sink.h"
@@ -47 +49 @@
         audio_source_t *source;
         audio_sink_t *sink;
+        fibril_mutex_t guard;
 } hound_ctx_t;
 
@@ -71 +74 @@
     size_t size);
 int hound_ctx_stream_read(hound_ctx_stream_t *stream, void *buffer, size_t size);
-int hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
+ssize_t hound_ctx_stream_add_self(hound_ctx_stream_t *stream, void *data,
     size_t size, const pcm_format_t *f);
 void hound_ctx_stream_drain(hound_ctx_stream_t *stream);
-int hound_ctx_stream_add(hound_ctx_stream_t *stream, void *buffer, size_t size,
-    pcm_format_t format);
 
 #endif