Changes in kernel/generic/src/proc/task.c [5bcf1f9:5d0500c] in mainline

File:

• kernel/generic/src/proc/task.c (modified) (13 diffs)

kernel/generic/src/proc/task.c

@@ -50 +50 @@
 #include <ipc/ipc.h>
 #include <ipc/ipcrsc.h>
+#include <ipc/event.h>
 #include <print.h>
 #include <errno.h>
@@ -57 +58 @@
 #include <syscall/copy.h>
 #include <macros.h>
-#include <ipc/event.h>
 
 /** Spinlock protecting the tasks_tree AVL tree. */
@@ -155 +155 @@
         mutex_initialize(&task->futexes_lock, MUTEX_PASSIVE);
         
-        list_initialize(&task->th_head);
-        list_initialize(&task->sync_box_head);
+        list_initialize(&task->threads);
+        list_initialize(&task->sync_boxes);
         
         ipc_answerbox_init(&task->answerbox, task);
@@ -190 +190 @@
         str_cpy(task->name, TASK_NAME_BUFLEN, name);
         
-        task->context = CONTEXT;
+        task->container = CONTAINER;
         task->capabilities = 0;
         task->ucycles = 0;
@@ -201 +201 @@
         task->ipc_info.irq_notif_received = 0;
         task->ipc_info.forwarded = 0;
+
+        event_task_init(task);
         
 #ifdef CONFIG_UDEBUG
@@ -211 +213 @@
         
         if ((ipc_phone_0) &&
-            (context_check(ipc_phone_0->task->context, task->context)))
+            (container_check(ipc_phone_0->task->container, task->container)))
                 ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
@@ -435 +437 @@
         
         /* Current values of threads */
-        link_t *cur;
-        for (cur = task->th_head.next; cur != &task->th_head; cur = cur->next) {
+        list_foreach(task->threads, cur) {
                 thread_t *thread = list_get_instance(cur, thread_t, th_link);
                 
@@ -468 +469 @@
          */
         
-        link_t *cur;
-        for (cur = task->th_head.next; cur != &task->th_head; cur = cur->next) {
+        list_foreach(task->threads, cur) {
                 thread_t *thread = list_get_instance(cur, thread_t, th_link);
                 bool sleeping = false;
@@ -534 +534 @@
         */
         if (notify) {
-                if (event_is_subscribed(EVENT_FAULT)) {
-                        /* Notify the subscriber that a fault occurred. */
-                        event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
-                            UPPER32(TASK->taskid), (sysarg_t) THREAD);
-                
+                /* Notify the subscriber that a fault occurred. */
+                if (event_notify_3(EVENT_FAULT, false, LOWER32(TASK->taskid),
+                    UPPER32(TASK->taskid), (sysarg_t) THREAD) == EOK) {
 #ifdef CONFIG_UDEBUG
                         /* Wait for a debugging session. */
@@ -586 +584 @@
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
                     " %9" PRIu64 "%c %9" PRIu64 "%c\n", task->taskid,
-                    task->name, task->context, task, task->as,
+                    task->name, task->container, task, task->as,
                     ucycles, usuffix, kcycles, ksuffix);
 #endif
@@ -597 +595 @@
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",
-                    task->taskid, task->name, task->context, task, task->as);
+                    task->taskid, task->name, task->container, task, task->as);
 #endif
         
@@ -627 +625 @@
                 printf("[id    ] [threads] [calls] [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address ] [as      ]"
+                printf("[id    ] [name        ] [ctn] [address ] [as      ]"
                     " [ucycles ] [kcycles ]\n");
 #endif
@@ -636 +634 @@
                     " [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address         ]"
+                printf("[id    ] [name        ] [ctn] [address         ]"
                     " [as              ]\n");
 #endif