Changeset ad7a6c9 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2011-03-30T13:10:24Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

kernel/generic/src/proc/task.c

@@ -342 +342 @@
 sysarg_t sys_task_set_name(const char *uspace_name, size_t name_len)
 {
-        int rc;
         char namebuf[TASK_NAME_BUFLEN];
         
         /* Cap length of name and copy it from userspace. */
-        
         if (name_len > TASK_NAME_BUFLEN - 1)
                 name_len = TASK_NAME_BUFLEN - 1;
         
-        rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        int rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
                 return (sysarg_t) rc;
         
         namebuf[name_len] = '\0';
+        
+        /*
+         * As the task name is referenced also from the
+         * threads, lock the threads' lock for the course
+         * of the update.
+         */
+        
+        irq_spinlock_lock(&tasks_lock, true);
+        irq_spinlock_lock(&TASK->lock, false);
+        irq_spinlock_lock(&threads_lock, false);
+        
+        /* Set task name */
         str_cpy(TASK->name, TASK_NAME_BUFLEN, namebuf);
         
+        irq_spinlock_unlock(&threads_lock, false);
+        irq_spinlock_unlock(&TASK->lock, false);
+        irq_spinlock_unlock(&tasks_lock, true);
+        
         return EOK;
+}
+
+/** Syscall to forcefully terminate a task
+ *
+ * @param uspace_taskid Pointer to task ID in user space.
+ *
+ * @return 0 on success or an error code from @ref errno.h.
+ *
+ */
+sysarg_t sys_task_kill(task_id_t *uspace_taskid)
+{
+        task_id_t taskid;
+        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
+        if (rc != 0)
+                return (sysarg_t) rc;
+        
+        return (sysarg_t) task_kill(taskid);
 }
 
@@ -430 +461 @@
 static void task_kill_internal(task_t *task)
 {
+        irq_spinlock_lock(&task->lock, false);
+        irq_spinlock_lock(&threads_lock, false);
+        
+        /*
+         * Interrupt all threads.
+         */
+        
         link_t *cur;
-        
-        /*
-         * Interrupt all threads.
-         */
-        irq_spinlock_lock(&task->lock, false);
         for (cur = task->th_head.next; cur != &task->th_head; cur = cur->next) {
                 thread_t *thread = list_get_instance(cur, thread_t, th_link);
@@ -452 +485 @@
         }
         
+        irq_spinlock_unlock(&threads_lock, false);
         irq_spinlock_unlock(&task->lock, false);
 }
@@ -481 +515 @@
         irq_spinlock_unlock(&tasks_lock, true);
         
+        return EOK;
+}
+
+/** Kill the currently running task.
+ *
+ * @param notify Send out fault notifications.
+ *
+ * @return Zero on success or an error code from errno.h.
+ *
+ */
+void task_kill_self(bool notify)
+{
+        /*
+         * User space can subscribe for FAULT events to take action
+         * whenever a task faults (to take a dump, run a debugger, etc.).
+         * The notification is always available, but unless udebug is enabled,
+         * that's all you get.
+        */
+        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);
+                
+#ifdef CONFIG_UDEBUG
+                        /* Wait for a debugging session. */
+                        udebug_thread_fault();
+#endif
+                }
+        }
+        
+        irq_spinlock_lock(&tasks_lock, true);
+        task_kill_internal(TASK);
+        irq_spinlock_unlock(&tasks_lock, true);
+        
+        thread_exit();
+}
+
+/** Process syscall to terminate the current task.
+ *
+ * @param notify Send out fault notifications.
+ *
+ */
+sysarg_t sys_task_exit(sysarg_t notify)
+{
+        task_kill_self(notify);
+        
+        /* Unreachable */
         return EOK;
 }