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

File:

• kernel/generic/src/proc/task.c (modified) (5 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;
         
-        int rc = copy_from_uspace(namebuf, uspace_name, name_len);
+        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;
 }
@@ -384 +370 @@
 {
         task_id_t taskid;
-        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
+        int rc;
+
+        rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(taskid));
         if (rc != 0)
                 return (sysarg_t) rc;
-        
+
         return (sysarg_t) task_kill(taskid);
 }
@@ -461 +449 @@
 static void task_kill_internal(task_t *task)
 {
+        link_t *cur;
+        
+        /*
+         * Interrupt all threads.
+         */
         irq_spinlock_lock(&task->lock, false);
-        irq_spinlock_lock(&threads_lock, false);
-        
-        /*
-         * Interrupt all threads.
-         */
-        
-        link_t *cur;
         for (cur = task->th_head.next; cur != &task->th_head; cur = cur->next) {
                 thread_t *thread = list_get_instance(cur, thread_t, th_link);
@@ -485 +471 @@
         }
         
-        irq_spinlock_unlock(&threads_lock, false);
         irq_spinlock_unlock(&task->lock, false);
 }
@@ -515 +500 @@
         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;
 }