Changeset 0a8f070 in mainline for uspace/lib/c/include

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

Location:

uspace/lib/c/include

Files:

• async.h (modified) (2 diffs)
• ipc/services.h (modified) (1 diff)
• ipc/taskman.h (moved) (moved from uspace/srv/ns/clonable.h ) (2 diffs)
• loader/pcb.h (modified) (2 diffs)
• ns.h (modified) (1 diff)
• taskman.h (added)

uspace/lib/c/include/async.h

@@ -131 +131 @@
 extern void *async_get_client_data_by_id(task_id_t);
 extern void async_put_client_data_by_id(task_id_t);
+
+extern void async_set_implicit_connection(async_client_conn_t);
 
 extern errno_t async_create_port(iface_t, async_port_handler_t, void *,
@@ -274 +276 @@
 extern sysarg_t async_get_label(void);
 
+extern async_sess_t *async_session_primary_swap(async_sess_t *);
 extern async_sess_t *async_connect_me_to(async_exch_t *, iface_t, sysarg_t,
     sysarg_t);

uspace/lib/c/include/ipc/services.h

@@ -43 +43 @@
 typedef enum {
         SERVICE_NONE       = 0,
-        SERVICE_LOADER     = FOURCC('l', 'o', 'a', 'd'),
         SERVICE_VFS        = FOURCC('v', 'f', 's', ' '),
         SERVICE_LOC        = FOURCC('l', 'o', 'c', ' '),
         SERVICE_SYSMAN     = FOURCC('s', 'y', 's', 'm'),
+        SERVICE_TASKMAN    = FOURCC('t', 's', 'k', 'm'),
         SERVICE_LOGGER     = FOURCC('l', 'o', 'g', 'g'),
         SERVICE_DEVMAN     = FOURCC('d', 'e', 'v', 'n'),

uspace/lib/c/include/ipc/taskman.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Martin Decky
+ * Copyright (c) 2015 Michal Koutny
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup ns
+/** @addtogroup libcipc
  * @{
  */
+/** @file
+ */
 
-#ifndef NS_CLONABLE_H__
-#define NS_CLONABLE_H__
+#ifndef LIBC_IPC_TASKMAN_H_
+#define LIBC_IPC_TASKMAN_H_
 
 #include <ipc/common.h>
-#include <ipc/services.h>
-#include <abi/ipc/interfaces.h>
-#include <stdbool.h>
 
-extern errno_t ns_clonable_init(void);
 
-extern bool ns_service_is_clonable(service_t, iface_t);
-extern void ns_clonable_register(ipc_call_t *);
-extern void ns_clonable_forward(service_t, iface_t, ipc_call_t *);
+typedef enum {
+        TASKMAN_HELLO = IPC_FIRST_USER_METHOD,
+} taskman_request_t;
+
+typedef enum {
+        TASKMAN_CONNECT_TO_LOADER = 0,
+        TASKMAN_LOADER_TO_NS,
+        TASKMAN_LOADER_CALLBACK,
+        TASKMAN_CONTROL
+} taskman_interface_t;
 
 #endif
 
-/**
- * @}
+/** @}
  */

uspace/lib/c/include/loader/pcb.h

@@ -46 +46 @@
 };
 
+/* Forward declaration */
+struct async_sess;
+typedef struct async_sess async_sess_t;
+
 /** Program Control Block.
  *
@@ -57 +61 @@
         entry_point_t entry;
 
+        /** Primary session to broker. */
+        async_sess_t *session_primary;
+        
         /** Current working directory. */
         char *cwd;

uspace/lib/c/include/ns.h

@@ -47 +47 @@
 
 extern errno_t ns_ping(void);
-extern errno_t ns_intro(task_id_t);
 extern async_sess_t *ns_session_get(void);