Changeset 7509ddc in mainline for generic/include

Timestamp:

2006-06-04T21:54:49Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

34dcd3f

Parents:

2cb5e64

Message:

Framework for task_kill().
Some pieces (e.g. implementation of ktask_cleanup() kernel thread and
task_destroy() function) are missing.
Changed locking order for task lock, threads_lock and thread lock from
threads_lock, thread lock, task lock to task lock, threads_lock, thread lock.

Location:

generic/include/proc

Files:

• task.h (modified) (2 diffs)
• thread.h (modified) (2 diffs)

generic/include/proc/task.h

@@ -41 +41 @@
 /** Task structure. */
 struct task {
+        /** Task lock.
+         *
+         * Must be acquired before threads_lock and thread lock of any of its threads.
+         */
         SPINLOCK_DECLARE(lock);
+        
         char *name;
         link_t th_head;         /**< List of threads contained in this task. */
         as_t *as;               /**< Address space. */
         task_id_t taskid;       /**< Unique identity of task */
+
+        /** If this is true, new threads can become part of the task. */
+        bool accept_new_threads;
+
+        count_t refcount;       /**< Number of references (i.e. threads). */
 
         cap_t capabilities;     /**< Task capabilities. */
@@ -71 +81 @@
 extern void task_init(void);
 extern task_t *task_create(as_t *as, char *name);
+extern void task_destroy(task_t *t);
 extern task_t *task_run_program(void *program_addr, char *name);
 extern task_t *task_find_by_id(task_id_t id);
+extern int task_kill(task_id_t id);
+
 
 #ifndef task_create_arch

generic/include/proc/thread.h

@@ -73 +73 @@
          *
          * Protects the whole thread structure except list links above.
-         * Must be acquired before T.lock for each T of type task_t.
-         * 
          */
         SPINLOCK_DECLARE(lock);
@@ -99 +97 @@
         /** True if this thread is executing copy_to_uspace(). False otherwise. */
         bool in_copy_to_uspace;
-
+        
+        /**
+         * If true, the thread will not go to sleep at all and will
+         * call thread_exit() before returning to userspace.
+         */
+        bool interrupted;                       
+        
         bool detached;                          /**< If true, thread_join_timeout() cannot be used on this thread. */
         waitq_t join_wq;                        /**< Waitq for thread_join_timeout(). */