Changeset b22b0a94 in mainline for uspace/app

Timestamp:

2019-08-07T05:39:54Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

b8341bc

Parents:

5cd2290

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-19 21:34:52)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-07 05:39:54)

Message:

task: Inoperative API for passing kernel task events to uspace

• Based on user-provided callback function.
• Includes slight refactoring of tester application code.

Conflicts:

uspace/lib/c/include/task.h

Location:

uspace/app/tester

Files:

• Makefile (modified) (1 diff)
• proc/common.h (modified) (1 diff)
• proc/task_anywait.c (added)
• proc/task_anywait.def (added)
• proc/task_wait.c (modified) (1 diff)
• tester.c (modified) (1 diff)
• tester.h (modified) (2 diffs)

uspace/app/tester/Makefile

@@ -68 +68 @@
         chardev/chardev1.c \
         proc/dummy_task.c \
+        proc/task_anywait.c \
         proc/task_wait.c
 

uspace/app/tester/proc/common.h

@@ -44 +44 @@
 #define STR_JOB_OK      "job-ok"
 
+#define DUMMY_TASK     "/root/app/tester"
+#define DUMMY_TASK_ARG "proc_dummy_task"
+
+static inline int dummy_task_spawn(task_id_t *task_id, task_wait_t *wait,
+    const char *behavior)
+{
+        return task_spawnl(task_id, wait,
+            DUMMY_TASK, DUMMY_TASK, DUMMY_TASK_ARG, behavior,
+            NULL);
+}
+
 #endif

uspace/app/tester/proc/task_wait.c

@@ -36 +36 @@
 #include "common.h"
 
-#define DUMMY_TASK     "/root/app/tester"
-#define DUMMY_TASK_ARG "proc_dummy_task"
-
-#define S(x) #x
-#define S_(x) S(x)
-#define S__LINE__ S_(__LINE__)
-
-#define TASSERT(expr) \
-        do { \
-                if (!(expr)) \
-                        return "Failed " #expr " " __FILE__ ":" S__LINE__ ; \
-        } while (0)
-
-static int dummy_task_spawn(task_id_t *task_id, task_wait_t *wait,
-    const char *behavior)
-{
-        return task_spawnl(task_id, wait,
-            DUMMY_TASK, DUMMY_TASK, DUMMY_TASK_ARG, behavior,
-            NULL);
-}
 
 const char *test_proc_task_wait(void)

uspace/app/tester/tester.c

@@ -79 +79 @@
 #include "chardev/chardev1.def"
 #include "proc/dummy_task.def"
+#include "proc/task_anywait.def"
 #include "proc/task_wait.def"
         {NULL, NULL, NULL, false}

uspace/app/tester/tester.h

@@ -70 +70 @@
         } while (0)
 
+#define S(x) #x
+#define S_(x) S(x)
+#define S__LINE__ S_(__LINE__)
+
+#define TASSERT(expr) \
+        do { \
+                if (!(expr)) \
+                        return "Failed " #expr " " __FILE__ ":" S__LINE__ ; \
+        } while (0)
+
+
 typedef const char *(*test_entry_t)(void);
 
@@ -112 +123 @@
 extern const char *test_chardev1(void);
 extern const char *test_proc_dummy_task(void);
+extern const char *test_proc_task_anywait(void);
 extern const char *test_proc_task_wait(void);