Changes in kernel/generic/include/proc/thread.h [d23712e:0f4f1b2] in mainline

File:

• kernel/generic/include/proc/thread.h (modified) (3 diffs)

kernel/generic/include/proc/thread.h

@@ -95 +95 @@
         waitq_t join_wq;
 
-        /** Thread accounting. */
-        atomic_time_stat_t ucycles;
-        atomic_time_stat_t kcycles;
-
-        /** Architecture-specific data. */
-        thread_arch_t arch;
-
-#ifdef CONFIG_UDEBUG
-        /**
-         * If true, the scheduler will print a stack trace
-         * to the kernel console upon scheduling this thread.
-         */
-        atomic_int_fast8_t btrace;
-
-        /** Debugging stuff */
-        udebug_thread_t udebug;
-#endif /* CONFIG_UDEBUG */
-
-        /*
-         * Immutable fields.
+        /** Lock protecting thread structure.
          *
-         * These fields are only modified during initialization, and are not
-         * changed at any time between initialization and destruction.
-         * Can be accessed without synchronization in most places.
-         */
-
-        /** Thread ID. */
-        thread_id_t tid;
+         * Protects the whole thread structure except fields listed above.
+         */
+        IRQ_SPINLOCK_DECLARE(lock);
+
+        char name[THREAD_NAME_BUFLEN];
 
         /** Function implementing the thread. */
@@ -129 +108 @@
         void *thread_arg;
 
-        char name[THREAD_NAME_BUFLEN];
-
+        /**
+         * From here, the stored context is restored
+         * when the thread is scheduled.
+         */
+        context_t saved_context;
+
+        /**
+         * True if this thread is executing copy_from_uspace().
+         * False otherwise.
+         */
+        bool in_copy_from_uspace;
+
+        /**
+         * True if this thread is executing copy_to_uspace().
+         * False otherwise.
+         */
+        bool in_copy_to_uspace;
+
+#ifdef CONFIG_FPU
+        fpu_context_t fpu_context;
+#endif
+        bool fpu_context_exists;
+
+        /* The thread will not be migrated if nomigrate is non-zero. */
+        unsigned int nomigrate;
+
+        /** Thread state. */
+        state_t state;
+
+        /** Thread CPU. */
+        cpu_t *cpu;
+        /** Containing task. */
+        task_t *task;
+        /** Thread was migrated to another CPU and has not run yet. */
+        bool stolen;
         /** Thread is executed in user space. */
         bool uspace;
 
+        /** Thread accounting. */
+        uint64_t ucycles;
+        uint64_t kcycles;
+        /** Last sampled cycle. */
+        uint64_t last_cycle;
         /** Thread doesn't affect accumulated accounting. */
         bool uncounted;
 
-        /** Containing task. */
-        task_t *task;
+        /** Thread's priority. Implemented as index to CPU->rq */
+        int priority;
+        /** Thread ID. */
+        thread_id_t tid;
+
+        /** Architecture-specific data. */
+        thread_arch_t arch;
 
         /** Thread's kernel stack. */
         uint8_t *kstack;
 
-        /*
-         * Local fields.
-         *
-         * These fields can be safely accessed from code that _controls execution_
-         * of this thread. Code controls execution of a thread if either:
-         *  - it runs in the context of said thread AND interrupts are disabled
-         *    (interrupts can and will access these fields)
-         *  - the thread is not running, and the code accessing it can legally
-         *    add/remove the thread to/from a runqueue, i.e., either:
-         *    - it is allowed to enqueue thread in a new runqueue
-         *    - it holds the lock to the runqueue containing the thread
-         *
-         */
-
-        /**
-         * From here, the stored context is restored
-         * when the thread is scheduled.
-         */
-        context_t saved_context;
-
-        // TODO: we only need one of the two bools below
-
-        /**
-         * True if this thread is executing copy_from_uspace().
-         * False otherwise.
-         */
-        bool in_copy_from_uspace;
-
-        /**
-         * True if this thread is executing copy_to_uspace().
-         * False otherwise.
-         */
-        bool in_copy_to_uspace;
-
-        /*
-         * FPU context is a special case. If lazy FPU switching is disabled,
-         * it acts as a regular local field. However, if lazy switching is enabled,
-         * the context is synchronized via CPU->fpu_lock
-         */
-#ifdef CONFIG_FPU
-        fpu_context_t fpu_context;
-#endif
-        bool fpu_context_exists;
-
-        /* The thread will not be migrated if nomigrate is non-zero. */
-        unsigned int nomigrate;
-
-        /** Thread was migrated to another CPU and has not run yet. */
-        bool stolen;
-
-        /**
-         * Thread state (state_t).
-         * This is atomic because we read it via some commands for debug output,
-         * otherwise it could just be a regular local.
-         */
-        atomic_int_fast32_t state;
-
-        /** Thread CPU. */
-        _Atomic(cpu_t *) cpu;
-
-        /** Thread's priority. Implemented as index to CPU->rq */
-        atomic_int_fast32_t priority;
-
-        /** Last sampled cycle. */
-        uint64_t last_cycle;
+#ifdef CONFIG_UDEBUG
+        /**
+         * If true, the scheduler will print a stack trace
+         * to the kernel console upon scheduling this thread.
+         */
+        bool btrace;
+
+        /** Debugging stuff */
+        udebug_thread_t udebug;
+#endif /* CONFIG_UDEBUG */
 } thread_t;
 
@@ -219 +186 @@
 extern void thread_attach(thread_t *, task_t *);
 extern void thread_start(thread_t *);
-extern void thread_requeue_sleeping(thread_t *);
+extern void thread_ready(thread_t *);
 extern void thread_exit(void) __attribute__((noreturn));
 extern void thread_interrupt(thread_t *);