Changeset 87a31ef2 in mainline

Timestamp:

2019-08-07T11:47:00Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

d5cca04

Parents:

4ff66ae

git-author:

Michal Koutny <xm.koutny+hos@…> (2015-11-15 11:47:07)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 11:47:00)

Message:

ns: Created simplified taskman API using low-level IPC API only

Conflicts:

uspace/lib/c/generic/async.c
uspace/lib/c/generic/private/async.h
uspace/lib/c/include/task.h
uspace/srv/ns/ns.c

Location:

uspace

Files:

• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/async/client.c (modified) (1 diff)
• lib/c/generic/private/async.h (modified) (1 diff)
• lib/c/generic/taskman_noasync.c (added)
• lib/c/include/task.h (modified) (2 diffs)
• lib/c/include/taskman.h (modified) (1 diff)
• lib/c/include/taskman_noasync.h (added)
• lib/c/include/types/task.h (modified) (1 diff)
• srv/ns/ns.c (modified) (2 diffs)

uspace/lib/c/Makefile

@@ -167 +167 @@
         generic/stats.c \
         generic/taskman.c \
+        generic/taskman_noasync.c \
         generic/assert.c \
         generic/bsearch.c \

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

@@ -198 +198 @@
 }
 
+int async_session_phone(async_sess_t *sess)
+{
+        return sess->phone;
+}
 
 /** Initialize the async framework.

uspace/lib/c/generic/private/async.h

@@ -108 +108 @@
 extern async_sess_t *create_session(int, exch_mgmt_t,
         sysarg_t, sysarg_t, sysarg_t);
+extern int async_session_phone(async_sess_t *);
 
 #endif

uspace/lib/c/include/task.h

@@ -39 +39 @@
 #include <stdarg.h>
 #include <abi/proc/task.h>
-#include <async.h>
 #include <types/task.h>
 
@@ -77 +76 @@
 
 /* Implemented in task_event.c */
-extern int task_register_event_handler(task_event_handler_t);
+extern int task_register_event_handler(task_event_handler_t, bool);
 
 #endif

uspace/lib/c/include/taskman.h

@@ -36 +36 @@
 #define LIBC_TASKMAN_H_
 
-#ifndef TASKMAN_DISABLE_ASYNC
 #include <async.h>
-#endif
 
 /* Internal functions to be used by loader only */
-#ifndef TASKMAN_DISABLE_ASYNC
 extern async_sess_t *taskman_get_session(void);
-#endif
 extern int taskman_intro_loader(void);
 

uspace/lib/c/include/types/task.h

@@ -36 +36 @@
 #define _LIBC_TYPES_TASK_H_
 
+#include <async.h>
+
 typedef enum {
         TASK_EXIT_RUNNING,   /**< Internal taskman value. */

uspace/srv/ns/ns.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <errno.h>
-#define TASKMAN_DISABLE_ASYNC
-#include <taskman.h>
-#undef TASKMAN_DISABLE_ASYNC
+#include <ipc/taskman.h>
+#include <taskman_noasync.h>
 
 #include "ns.h"
@@ -121 +120 @@
                 return rc;
         
-        rc = taskman_intro_ns();
+        rc = taskman_intro_ns_noasync();
         if (rc != EOK) {
                 printf("%s: not accepted by taskman (%i)\n", NAME, rc);
                 return rc;
         }
-
+        task_retval_noasync(0);
+        
         async_set_fallback_port_handler(ns_connection, NULL);
 
         printf("%s: Accepting connections\n", NAME);
-        // TODO enable NS to use task_retval(0)
+        
         async_manager();