Changeset 0a8f070 in mainline for uspace/srv

Timestamp:

2019-08-07T02:33:03Z (7 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

Location:

uspace/srv

Files:

• loader/main.c (modified) (7 diffs)
• ns/Makefile (modified) (1 diff)
• ns/clonable.c (deleted)
• ns/ns.c (modified) (5 diffs)
• taskman/Makefile (added)
• taskman/main.c (added)

uspace/srv/loader/main.c

@@ -34 +34 @@
  *
  * The program loader is a special init binary. Its image is used
- * to create a new task upon a @c task_spawn syscall. The syscall
- * returns the id of a phone connected to the newly created task.
- *
- * The caller uses this phone to send the pathname and various other
+ * to create a new task upon a @c task_spawn syscall. It has a phone connected
+ * to the caller of te syscall. The formal caller (taskman) performs a
+ * handshake with loader so that apparent caller can communicate with the
+ * loader.
+ *
+ * The apparent caller uses his phone to send the pathname and various other
  * information to the loader. This is normally done by the C library
  * and completely hidden from applications.
  */
+
 
 #include <stdio.h>
@@ -47 +50 @@
 #include <stddef.h>
 #include <ipc/services.h>
-#include <ipc/loader.h>
-#include <ns.h>
-#include <loader/pcb.h>
+#include <as.h>
+#include <async.h>
+#include <elf/elf.h>
+#include <elf/elf_load.h>
 #include <entry_point.h>
 #include <errno.h>
-#include <async.h>
+#include <fcntl.h>
+#include <fibril_synch.h>
+#include <ipc/loader.h>
+#include <loader/pcb.h>
 #include <str.h>
-#include <as.h>
-#include <elf/elf.h>
-#include <elf/elf_load.h>
+#include <sys/types.h>
+#include <taskman.h>
+#include <unistd.h>
 #include <vfs/vfs.h>
 #include <vfs/inbox.h>
@@ -73 +80 @@
 /** The Program control block */
 static pcb_t pcb;
+
+/** Primary IPC session */
+static async_sess_t *session_primary = NULL;
 
 /** Current working directory */
@@ -92 +102 @@
 /** Used to limit number of connections to one. */
 static bool connected = false;
+
+/** Ensure synchronization of handshake and connection fibrils. */
+static bool handshake_complete = false;
+FIBRIL_MUTEX_INITIALIZE(handshake_mtx);
+FIBRIL_CONDVAR_INITIALIZE(handshake_cv);
 
 static void ldr_get_taskid(ipc_call_t *req)
@@ -319 +334 @@
         DPRINTF("PCB set.\n");
 
+        pcb.session_primary = session_primary;
+
         pcb.cwd = cwd;
 
@@ -373 +390 @@
 static void ldr_connection(ipc_call_t *icall, void *arg)
 {
+        /* Wait for handshake */
+        fibril_mutex_lock(&handshake_mtx);
+        while (!handshake_complete) {
+                fibril_condvar_wait(&handshake_cv, &handshake_mtx);
+        }
+        fibril_mutex_unlock(&handshake_mtx);
+
         /* Already have a connection? */
         if (connected) {
@@ -428 +452 @@
 }
 
+static errno_t ldr_taskman_handshake(void)
+{
+        errno_t retval = EOK;
+
+        fibril_mutex_lock(&handshake_mtx);
+        session_primary = taskman_handshake();
+        if (session_primary == NULL) {
+                retval = errno;
+                goto finish;
+        }
+
+        async_sess_t *session_tm = async_session_primary_swap(session_primary);
+        (void)async_hangup(session_tm);
+
+        handshake_complete = true;
+
+finish:
+        fibril_condvar_signal(&handshake_cv);
+        fibril_mutex_unlock(&handshake_mtx);
+
+        return retval;
+}
+
 /** Program loader main function.
  */
 int main(int argc, char *argv[])
 {
-        /* Introduce this task to the NS (give it our task ID). */
-        task_id_t id = task_get_id();
-        errno_t rc = ns_intro(id);
-        if (rc != EOK)
+        /* Set a handler of incomming connections. */
+        async_set_fallback_port_handler(ldr_connection, NULL);
+        
+        /* Handshake with taskman */
+        int rc = ldr_taskman_handshake();
+        if (rc != EOK) {
+                DPRINTF("Failed taskman handshake (%i).\n", errno);
                 return rc;
-
-        /* Register at naming service. */
-        rc = service_register(SERVICE_LOADER, INTERFACE_LOADER,
-            ldr_connection, NULL);
-        if (rc != EOK)
-                return rc;
-
+        }
+
+        /* Handle client connections */
         async_manager();
-
+        //TODO retval?
+        
         /* Never reached */
         return 0;

uspace/srv/ns/Makefile

@@ -35 +35 @@
         ns.c \
         service.c \
-        clonable.c \
         task.c
 

uspace/srv/ns/ns.c

@@ -46 +46 @@
 #include "ns.h"
 #include "service.h"
-#include "clonable.h"
 #include "task.h"
 
@@ -61 +60 @@
                  * Client requests to be connected to a service.
                  */
-                if (ns_service_is_clonable(service, iface)) {
-                        ns_clonable_forward(service, iface, icall);
-                } else {
-                        ns_service_forward(service, iface, icall);
-                }
-
+                ns_service_forward(service, iface, icall);
                 return;
         }
@@ -92 +86 @@
                          * Server requests service registration.
                          */
-                        if (ns_service_is_clonable(service, iface)) {
-                                ns_clonable_register(&call);
-                                continue;
-                        } else {
-                                retval = ns_service_register(service, iface);
-                        }
+                        retval = ns_service_register(service, iface);
 
                         break;
@@ -116 +105 @@
                         break;
                 case NS_RETVAL:
-                        retval = ns_task_retval(&call);
+                        // TODO move to taskman
+                        retval = EOK;
+                        //retval = ns_task_retval(&call);
                         break;
                 default:
@@ -140 +131 @@
                 return rc;
 
-        rc = ns_clonable_init();
-        if (rc != EOK)
-                return rc;
-
         rc = task_init();
         if (rc != EOK)