Changeset 37ea333 in mainline

Timestamp:

2013-03-23T13:56:35Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fd7c98b

Parents:

d768d4c8

Message:

libhoud: Handle recording requests.

Location:

uspace/lib/hound

Files:

• include/hound/protocol.h (modified) (1 diff)
• src/protocol.c (modified) (4 diffs)

uspace/lib/hound/include/hound/protocol.h

@@ -64 +64 @@
         int (*add_context)(void *, hound_context_id_t *, const char *, bool);
         int (*rem_context)(void *, hound_context_id_t);
+        bool (*is_record_context)(void *, hound_context_id_t);
         int (*add_stream)(void *, hound_context_id_t, int, pcm_format_t, size_t,
             void **);

uspace/lib/hound/src/protocol.c

@@ -139 +139 @@
 
 static int hound_server_read_data(void *stream);
+static int hound_server_write_data(void *stream);
 static const hound_server_iface_t *server_iface;
 
@@ -194 +195 @@
                 }
                 case IPC_M_HOUND_STREAM_ENTER: {
-                        if (!server_iface || !server_iface->add_stream) {
+                        if (!server_iface || !server_iface->add_stream
+                            || !server_iface->is_record_context) {
                                 async_answer_0(callid, ENOTSUP);
                                 break;
@@ -213 +215 @@
                                 break;
                         }
-                        //TODO consider record context
-                        hound_server_read_data(stream);
+                        const bool rec = server_iface->is_record_context(
+                            server_iface->server, id);
+                        if (rec) {
+                                hound_server_write_data(stream);
+                        } else {
+                                hound_server_read_data(stream);
+                        }
                         break;
                 }
@@ -245 +252 @@
                 int ret = async_data_write_finalize(callid, buffer, size);
                 if (ret == EOK) {
-                        server_iface->stream_data_write(stream, buffer, size);
-                } else {
-                        async_answer_0(callid, ret);
-                }
+                        ret = server_iface->stream_data_write(stream, buffer, size);
+                }
+                async_answer_0(callid, ret);
         }
         //TODO drain?
+        const int ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
+            ? EOK : EINVAL;
+
+        async_answer_0(callid, ret);
+        return ret;
+}
+
+static int hound_server_write_data(void *stream)
+{
+        if (!server_iface || !server_iface->stream_data_read)
+                return ENOTSUP;
+
+        ipc_callid_t callid;
+        ipc_call_t call;
+        size_t size = 0;
+        while (async_data_read_receive_call(&callid, &call, &size)) {
+                char *buffer = malloc(size);
+                if (!buffer) {
+                        async_answer_0(callid, ENOMEM);
+                        continue;
+                }
+                int ret = server_iface->stream_data_read(stream, buffer, size);
+                if (ret == EOK) {
+                        ret = async_data_read_finalize(callid, buffer, size);
+                }
+                async_answer_0(callid, ret);
+        }
         const int ret = IPC_GET_IMETHOD(call) == IPC_M_HOUND_STREAM_EXIT
             ? EOK : EINVAL;