Changeset 0a8f070 in mainline for uspace/lib/c/generic/async/client.c

Timestamp:

2019-08-07T02:33:03Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

fe86d9d

Parents:

103939e

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-08-16 16:04:14)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 02:33:03)

Message:

Create taskman server (extracts task-related operations from naming service)

• Exploits initial phones connected to spawn parent instead of NS.
• session_ns changed to session_primary (setup during taskman-loader handshake).
• Task creation moved from NS to taskman (no clonable services anymore).
• Other task-related operations implementation is to come (task_retval is temporarily dummy).
• Async framework: implicit connections — create fibrils for calls that arrived through initial phone.

Conflicts:

abi/include/abi/ipc/methods.h
boot/Makefile.common
uspace/Makefile
uspace/app/trace/ipcp.c
uspace/lib/c/generic/async.c
uspace/lib/c/generic/libc.c
uspace/lib/c/generic/loader.c
uspace/lib/c/generic/ns.c
uspace/lib/c/generic/private/async.h
uspace/lib/c/generic/private/ns.h
uspace/lib/c/generic/task.c
uspace/lib/c/include/async.h
uspace/lib/c/include/ipc/services.h
uspace/lib/c/include/ipc/taskman.h
uspace/lib/c/include/loader/pcb.h
uspace/lib/c/include/ns.h
uspace/srv/loader/main.c
uspace/srv/ns/clonable.c
uspace/srv/ns/ns.c

File:

• uspace/lib/c/generic/async/client.c (modified) (3 diffs)

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

@@ -124 +124 @@
 static fibril_rmutex_t message_mutex;
 
-/** Naming service session */
-async_sess_t session_ns;
+/** Primary session (spawn parent, later naming service) */
+async_sess_t *session_primary = NULL;
 
 /** Message data */
@@ -168 +168 @@
 static FIBRIL_CONDVAR_INITIALIZE(avail_phone_cv);
 
+
+static async_sess_t *create_session_primary(void)
+{
+        async_sess_t *session = (async_sess_t *) malloc(sizeof(async_sess_t));
+
+        if (session != NULL) {
+                session_ns->iface = 0;
+                session->mgmt = EXCHANGE_ATOMIC;
+                session->phone = PHONE_INITIAL;
+                session->arg1 = 0;
+                session->arg2 = 0;
+                session->arg3 = 0;
+                
+                fibril_mutex_initialize(&session->remote_state_mtx);
+                session->remote_state_data = NULL;
+                
+                list_initialize(&session->exch_list);
+                fibril_mutex_initialize(&session->mutex);
+                atomic_set(&session->refcnt, 0);
+                &session.exchanges = 0;
+        }
+
+        return session;
+}
+
+
 /** Initialize the async framework.
  *
  */
-void __async_client_init(void)
+void __async_client_init(async_sess_t *session)
 {
         if (fibril_rmutex_initialize(&message_mutex) != EOK)
                 abort();
 
-        session_ns.iface = 0;
-        session_ns.mgmt = EXCHANGE_ATOMIC;
-        session_ns.phone = PHONE_NS;
-        session_ns.arg1 = 0;
-        session_ns.arg2 = 0;
-        session_ns.arg3 = 0;
-
-        fibril_mutex_initialize(&session_ns.remote_state_mtx);
-        session_ns.remote_state_data = NULL;
-
-        list_initialize(&session_ns.exch_list);
-        fibril_mutex_initialize(&session_ns.mutex);
-        session_ns.exchanges = 0;
+        if (session == NULL) {
+                session_primary = create_session_primary();
+        } else {
+                session_primary = session;
+        }
+
+        if (session_primary == NULL)
+                abort();
 }
 
@@ -807 +828 @@
         *out_phone = (cap_phone_handle_t) ipc_get_arg5(&result);
         return EOK;
+}
+
+/** Injects another session instead of original primary session
+ *
+ * @param  session  Session to naming service.
+ *
+ * @return old primary session (to spawn parent)
+ */
+async_sess_t *async_session_primary_swap(async_sess_t *session)
+{
+        assert(session_primary->phone == PHONE_INITIAL);
+
+        async_sess_t *old_primary = session_primary;
+        session_primary = session;
+        return old_primary;
 }