Changeset 1fb4a49 in mainline

Timestamp:

2019-08-07T05:34:50Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

5cd2290

Parents:

3ea98e8

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-10-18 10:51:05)

git-committer:

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

Message:

kernel: Add exit reason parameter to EVENT_EXIT

• So that own termination can be distinguished from kills by (typically) third party.
• Translation from exit_reason_t to task_exit_t is left to uspace (taskman).

Conflicts:

kernel/generic/include/proc/task.h
kernel/generic/src/proc/task.c

Files:

• abi/include/abi/proc/task.h (modified) (1 diff)
• kernel/generic/include/proc/task.h (modified) (1 diff)
• kernel/generic/src/proc/task.c (modified) (4 diffs)
• kernel/generic/src/proc/thread.c (modified) (1 diff)

abi/include/abi/proc/task.h

@@ -40 +40 @@
 typedef uint64_t task_id_t;
 
+typedef enum {
+        /** Task terminated synchronously on its own request. */
+        EXIT_REASON_SELF,
+        /** Task was killed by kill request (own or outer). */
+        EXIT_REASON_KILLED
+} exit_reason_t;
+
 #endif
 

kernel/generic/include/proc/task.h

@@ -97 +97 @@
         cap_info_t *cap_info;
 
+        /** Exit reason. */
+        exit_reason_t exit_reason;
+        
         /* IPC stuff */
 

kernel/generic/src/proc/task.c

@@ -83 +83 @@
 
 /* Forward declarations. */
-static void task_kill_internal(task_t *);
+static void task_kill_internal(task_t *, exit_reason_t);
 static errno_t tsk_constructor(void *, unsigned int);
 static size_t tsk_destructor(void *);
@@ -527 +527 @@
 }
 
-static void task_kill_internal(task_t *task)
+static void task_kill_internal(task_t *task, exit_reason_t exit_reason)
 {
         irq_spinlock_lock(&task->lock, false);
         irq_spinlock_lock(&threads_lock, false);
+
+        task->exit_reason = exit_reason;
 
         /*
@@ -578 +580 @@
         }
 
-        task_kill_internal(task);
+        task_kill_internal(task, EXIT_REASON_KILLED);
         irq_spinlock_unlock(&tasks_lock, true);
 
@@ -611 +613 @@
 
         irq_spinlock_lock(&tasks_lock, true);
-        task_kill_internal(TASK);
+        task_kill_internal(TASK, EXIT_REASON_SELF);
         irq_spinlock_unlock(&tasks_lock, true);
 

kernel/generic/src/proc/thread.c

@@ -527 +527 @@
                          * after any IPC cleanup operations. Ignore any errors.
                          */
-                        (void)event_notify_2(EVENT_EXIT, false,
-                            LOWER32(TASK->taskid), UPPER32(TASK->taskid));
+                        (void)event_notify_3(EVENT_EXIT, false,
+                            LOWER32(TASK->taskid), UPPER32(TASK->taskid),
+                            TASK->exit_reason);
                 }
         }