Changeset 32fffef0 in mainline for kernel/generic/include

Timestamp:

2006-08-29T11:06:57Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0fa6044

Parents:

c8ea4a8b

Message:

Define architecture-specific thread sub-constructors and sub-destructors on all architectures.
Define the THREAD_FLAG_USPACE which means that the thread runs in user space.
The forementioned changes allow for allocating of user window buffer on sparc64
threads that execute in userspace.

A lot of formatting and indentation fixes.

Location:

kernel/generic/include

Files:

• mm/frame.h (modified) (5 diffs)
• proc/thread.h (modified) (6 diffs)

kernel/generic/include/mm/frame.h

@@ -28 +28 @@
  */
 
- /** @addtogroup genericmm
+/** @addtogroup genericmm
  * @{
  */
@@ -34 +34 @@
  */
 
-#ifndef __FRAME_H__
-#define __FRAME_H__
+#ifndef KERN_FRAME_H_
+#define KERN_FRAME_H_
 
 #include <arch/types.h>
@@ -62 +62 @@
 #define FRAME_NO_RECLAIM        0x4     /* do not start reclaiming when no free memory */
 
-#define FRAME_OK                0       /* frame_alloc return status */
-#define FRAME_NO_MEMORY         1       /* frame_alloc return status */
-#define FRAME_ERROR             2       /* frame_alloc return status */
-
 static inline uintptr_t PFN2ADDR(pfn_t frame)
 {
@@ -89 +85 @@
 #define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame)   (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
 
-#define frame_alloc(order, flags)                               frame_alloc_generic(order, flags, NULL)
+#define frame_alloc(order, flags)               frame_alloc_generic(order, flags, NULL)
 
 extern void frame_init(void);
@@ -112 +108 @@
 #endif
 
- /** @}
+/** @}
  */
-

kernel/generic/include/proc/thread.h

@@ -53 +53 @@
 #define THREAD_STACK_SIZE       STACK_SIZE
 
-/**< Thread states. */
+/** Thread states. */
 enum state {
         Invalid,        /**< It is an error, if thread is found in this state. */
@@ -66 +66 @@
 extern char *thread_states[];
 
-/**< Join types. */
+/** Join types. */
 typedef enum {
         None,
@@ -73 +73 @@
 } thread_join_type_t;
 
-#define X_WIRED         (1<<0)
-#define X_STOLEN        (1<<1)
+/* Thread flags */
+#define THREAD_FLAG_WIRED       (1<<0)  /**< Thread cannot be migrated to another CPU. */
+#define THREAD_FLAG_STOLEN      (1<<1)  /**< Thread was migrated to another CPU and has not run yet. */
+#define THREAD_FLAG_USPACE      (1<<2)  /**< Thread executes in userspace. */
 
 #define THREAD_NAME_BUFLEN      20
@@ -128 +130 @@
          * Defined only if thread doesn't run.
          * It means that fpu context is in CPU that last time executes this thread.
-         * This disables migration
+         * This disables migration.
          */
         int fpu_context_engaged;
@@ -150 +152 @@
         thread_arch_t arch;                     /**< Architecture-specific data. */
 
-        uint8_t *kstack;                                /**< Thread's kernel stack. */
+        uint8_t *kstack;                        /**< Thread's kernel stack. */
 };
 
@@ -171 +173 @@
 extern void thread_create_arch(thread_t *t);
 #endif
+#ifndef thr_constructor_arch
+extern void thr_constructor_arch(thread_t *t);
+#endif
+#ifndef thr_destructor_arch
+extern void thr_destructor_arch(thread_t *t);
+#endif
 
 extern void thread_sleep(uint32_t sec);