Changeset 0a8f070 in mainline for uspace/srv/ns/ns.c

Timestamp:

2019-08-07T02:33:03Z (5 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/srv/ns/ns.c (modified) (5 diffs)

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)