Changeset 13318d1 in mainline

Timestamp:

2013-03-24T03:44:11Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7294b5b

Parents:

fd7c98b

Message:

libhound: Implement client side connection controls

Location:

uspace/lib/hound

Files:

• include/hound/protocol.h (modified) (3 diffs)
• src/protocol.c (modified) (2 diffs)

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

@@ -42 +42 @@
 const char *HOUND_SERVICE;
 
+enum {
+        HOUND_SINK_APPS = 0x1,
+        HOUND_SINK_DEVS = 0x2,
+        HOUND_SOURCE_APPS = 0x4,
+        HOUND_SOURCE_DEVS = 0x8,
+        HOUND_CONNECTED = 0x10,
+
+        HOUND_STREAM_DRAIN_ON_EXIT = 0x1,
+        HOUND_STREAM_IGNORE_UNDERFLOW = 0x2,
+        HOUND_STREAM_IGNORE_OVERFLOW = 0x4,
+};
+
 typedef async_sess_t hound_sess_t;
 typedef int hound_context_id_t;
+
+static inline int hound_context_id_err(hound_context_id_t id)
+{
+        return id > 0 ? EOK : (id == 0 ? ENOENT : id);
+}
 
 hound_sess_t *hound_service_connect(const char *service);
@@ -51 +68 @@
     const char *name, bool record);
 int hound_service_unregister_context(hound_sess_t *sess, hound_context_id_t id);
+
+int hound_service_get_list(hound_sess_t *sess, const char ***ids, size_t *count,
+    int flags, const char *connection);
+static inline int hound_service_get_list_all(hound_sess_t *sess,
+    const char ***ids, size_t *count, int flags)
+{
+        return hound_service_get_list(sess, ids, count, flags, NULL);
+}
+
+int hound_service_connect_source_sink(hound_sess_t *sess, const char *source,
+    const char *sink);
+int hound_service_disconnect_source_sink(hound_sess_t *sess, const char *source,
+    const char *sink);
 
 int hound_service_stream_enter(async_exch_t *exch, hound_context_id_t id,
@@ -65 +95 @@
         int (*rem_context)(void *, hound_context_id_t);
         bool (*is_record_context)(void *, hound_context_id_t);
+        int (*connect)(void *, const char *, const char *);
+        int (*disconnect)(void *, const char *, const char *);
         int (*add_stream)(void *, hound_context_id_t, int, pcm_format_t, size_t,
             void **);

uspace/lib/hound/src/protocol.c

@@ -49 +49 @@
         IPC_M_HOUND_CONTEXT_REGISTER = IPC_FIRST_USER_METHOD,
         IPC_M_HOUND_CONTEXT_UNREGISTER,
+        IPC_M_HOUND_GET_LIST,
+        IPC_M_HOUND_CONNECT,
+        IPC_M_HOUND_DISCONNECT,
         IPC_M_HOUND_STREAM_ENTER,
         IPC_M_HOUND_STREAM_EXIT,
@@ -99 +102 @@
         async_exchange_end(exch);
         return ret;
+}
+
+int hound_service_get_list(hound_sess_t *sess, const char ***ids, size_t *count,
+    int flags, const char *connection)
+{
+        assert(sess);
+        assert(ids);
+        assert(count);
+
+        if (connection && !(flags & HOUND_CONNECTED))
+                return EINVAL;
+
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (!exch)
+                return ENOMEM;
+
+        ipc_call_t res_call;
+        aid_t mid = async_send_3(exch, IPC_M_HOUND_GET_LIST, flags, *count,
+            (bool)connection, &res_call);
+
+        int ret = EOK;
+        if (mid && connection)
+                ret = async_data_write_start(exch, connection,
+                    str_size(connection));
+
+        if (ret == EOK)
+                async_wait_for(mid, (sysarg_t*)&ret);
+
+        if (ret != EOK) {
+                async_exchange_end(exch);
+                return ret;
+        }
+        unsigned name_count = IPC_GET_ARG1(res_call);
+        size_t max_length = IPC_GET_ARG2(res_call);
+
+        /* Start receiving names */
+        const char ** names = NULL;
+        if (name_count) {
+                names = calloc(name_count, sizeof(char *));
+                char *tmp_name = malloc(max_length + 1);
+                if (!names || !tmp_name) {
+                        async_exchange_end(exch);
+                        return ENOMEM;
+                }
+                for (unsigned i = 0; i < name_count; ++i) {
+                        bzero(tmp_name, max_length + 1);
+                        ret = async_data_read_start(exch, tmp_name, max_length);
+                        if (ret == EOK) {
+                                names[i] = str_dup(tmp_name);
+                                ret = names[i] ? EOK : ENOMEM;
+                        }
+                        if (ret != EOK)
+                                break;
+                }
+                free(tmp_name);
+        }
+        async_exchange_end(exch);
+        if (ret != EOK) {
+                for (unsigned i = 0; i < name_count; ++i)
+                        free(names[i]);
+                free(names);
+        } else {
+                *ids = names;
+                *count = name_count;
+        }
+        return ret;
+}
+
+int hound_service_connect_source_sink(hound_sess_t *sess, const char *source,
+    const char *sink)
+{
+        assert(sess);
+        assert(source);
+        assert(sink);
+
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (!exch)
+                return ENOMEM;
+        int ret = async_req_0_0(exch, IPC_M_HOUND_CONNECT);
+        if (ret == EOK)
+                ret = async_data_write_start(exch, source, str_size(source));
+        if (ret == EOK)
+                ret = async_data_write_start(exch, sink, str_size(sink));
+        async_exchange_end(exch);
+        return ret;
+}
+
+int hound_service_disconnect_source_sink(hound_sess_t *sess, const char *source,
+    const char *sink)
+{
+        assert(sess);
+        async_exch_t *exch = async_exchange_begin(sess);
+        if (!exch)
+                return ENOMEM;
+        int ret = async_req_0_0(exch, IPC_M_HOUND_DISCONNECT);
+        if (ret == EOK)
+                ret = async_data_write_start(exch, source, str_size(source));
+        if (ret == EOK)
+                ret = async_data_write_start(exch, sink, str_size(sink));
+        async_exchange_end(exch);
+        return ENOTSUP;
 }