Changeset 353f8cc in mainline

Timestamp:

2013-04-05T18:12:23Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fb14905

Parents:

2373ba7

Message:

hound: make sure all streams are gone before removing context

Location:

uspace/srv/audio/hound

Files:

• hound.c (modified) (1 diff)
• hound_ctx.c (modified) (1 diff)
• iface.c (modified) (1 diff)

uspace/srv/audio/hound/hound.c

@@ -148 +148 @@
         if (!ctx)
                 return EINVAL;
+        if (!list_empty(&ctx->streams))
+                return EBUSY;
         fibril_mutex_lock(&hound->list_guard);
         list_remove(&ctx->link);

uspace/srv/audio/hound/hound_ctx.c

@@ -77 +77 @@
         assert(ctx);
         assert(!link_in_use(&ctx->link));
+        assert(list_empty(&ctx->streams));
         if (ctx->source)
                 audio_source_fini(ctx->source);
         if (ctx->sink)
                 audio_sink_fini(ctx->sink);
-        //TODO remove streams
         free(ctx->source);
         free(ctx->sink);

uspace/srv/audio/hound/iface.c

@@ -69 +69 @@
         if (!ctx)
                 return EINVAL;
-        hound_remove_ctx(server, ctx);
+        int ret = hound_remove_ctx(server, ctx);
+        if (ret != EOK)
+                return ret;
         hound_ctx_destroy(ctx);
         log_info("%s: %p, %#x", __FUNCTION__, server, id);