Changeset 241f1985 in mainline for uspace/lib/c/generic/async

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

Location:

uspace/lib/c/generic/async

Files:

• client.c (modified) (7 diffs)
• server.c (modified) (3 diffs)

uspace/lib/c/generic/async/client.c

@@ -99 +99 @@
 #include <async.h>
 #include "../private/async.h"
-#include "../private/ns.h"
 #undef _LIBC_ASYNC_C_
 
@@ -114 +113 @@
 #include <stdbool.h>
 #include <stdlib.h>
+#include <stdatomic.h>
 #include <mem.h>
-#include <stdlib.h>
 #include <macros.h>
 #include <as.h>
@@ -174 +173 @@
     sysarg_t arg1, sysarg_t arg2, sysarg_t arg3)
 {
-        async_sess_t *session = (async_sess_t *) malloc(sizeof(async_sess_t));
+        async_sess_t *session = (async_sess_t *) calloc(1, sizeof(async_sess_t));
 
         if (session != NULL) {
-                session->iface = 0;
                 session->mgmt = mgmt;
                 session->phone = phone;
@@ -189 +187 @@
                 list_initialize(&session->exch_list);
                 fibril_mutex_initialize(&session->mutex);
-                atomic_set(&session->refcnt, 0);
-                &session.exchanges = 0;
         } else {
                 errno = ENOMEM;
@@ -198 +194 @@
 }
 
-int async_session_phone(async_sess_t *sess)
+cap_phone_handle_t async_session_phone(async_sess_t *sess)
 {
         return sess->phone;
@@ -859 +855 @@
         }
 
-        async_sess_t *sess = create_session(phone, mgmt, iface, arg2, arg3);
+        async_sess_t *sess = create_session(phone, iface & IFACE_EXCHANGE_MASK, iface, arg2, arg3);
         if (sess == NULL) {
                 ipc_hangup(phone);
         }
+        sess->iface = iface;
 
         return sess;
@@ -912 +909 @@
         if (rc != EOK) {
                 errno = rc;
-                free(sess);
                 return NULL;
         }
 
-        async_sess_t *sess = create_session(phone, mgmt, iface, arg2, arg3);
+        async_sess_t *sess = create_session(phone, iface & IFACE_EXCHANGE_MASK, iface, arg2, arg3);
         if (sess == NULL) {
                 ipc_hangup(phone);
         }
+        sess->iface = iface;
 
         return sess;

uspace/lib/c/generic/async/server.c

@@ -216 +216 @@
 }
 
-static async_client_conn_t implicit_connection = NULL;
+static async_port_handler_t implicit_connection = NULL;
+
+/** Setter for implicit_connection function pointer.
+ *
+ * @param conn Function that will implement a new connection fibril for
+ *             unrouted calls.
+ *
+ */
+void async_set_implicit_connection(async_port_handler_t conn)
+{
+        assert(implicit_connection == NULL);
+        implicit_connection = conn;
+}
+
+
 static fibril_rmutex_t client_mutex;
 static hash_table_t client_hash_table;
@@ -969 +983 @@
                 return;
         } else if (implicit_connection != NULL) {
-                async_new_connection(call->in_task_id, call->in_phone_hash,
-                    callid, call, implicit_connection, NULL);
+                connection_t *conn = calloc(1, sizeof(connection_t));
+                if (!conn) {
+                        ipc_answer_0(call->cap_handle, ENOMEM);
+                        return;
+                }
+
+                async_new_connection(conn, call->task_id, call, implicit_connection, NULL);
                 return;
         }
@@ -1749 +1768 @@
         async_sess_t *sess = create_session(phandle, mgmt, 0, 0, 0);
         if (sess == NULL) {
-                ipc_hangup(phone);
+                ipc_hangup(phandle);
                 async_answer_0(&call, errno);
         } else {