Changeset 8013637 in mainline for kernel/generic/include

Timestamp:

2012-07-20T13:51:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8fccd42

Parents:

c5bff3c (diff), 7030bc9 (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:

More mainline changes.

Location:

kernel/generic/include

Files:

• console/prompt.h (added)
• debug.h (modified) (1 diff)
• ipc/ipc.h (modified) (1 diff)
• ipc/ipcrsc.h (modified) (1 diff)
• lib/ra.h (modified) (1 diff)
• mm/slab.h (modified) (2 diffs)
• proc/program.h (modified) (1 diff)
• proc/thread.h (modified) (4 diffs)
• symtab.h (modified) (1 diff)
• symtab_lookup.h (added)

kernel/generic/include/debug.h

@@ -37 +37 @@
 
 #include <panic.h>
-#include <symtab.h>
+#include <symtab_lookup.h>
 
 #define CALLER  ((uintptr_t) __builtin_return_address(0))

kernel/generic/include/ipc/ipc.h

@@ -148 +148 @@
 extern int ipc_call(phone_t *, call_t *);
 extern int ipc_call_sync(phone_t *, call_t *);
-extern call_t * ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
+extern call_t *ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
 extern int ipc_forward(call_t *, phone_t *, answerbox_t *, unsigned int);
 extern void ipc_answer(answerbox_t *, call_t *);

kernel/generic/include/ipc/ipcrsc.h

@@ -39 +39 @@
 #include <ipc/ipc.h>
 
-extern call_t * get_call(sysarg_t callid);
-extern int phone_alloc(task_t *t);
-extern void phone_connect(int phoneid, answerbox_t *box);
-extern void phone_dealloc(int phoneid);
+extern call_t *get_call(sysarg_t);
+extern int phone_alloc(task_t *);
+extern void phone_connect(int, answerbox_t *);
+extern void phone_dealloc(int);
 
 #endif

kernel/generic/include/lib/ra.h

@@ -42 +42 @@
 
 typedef struct {
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
         list_t spans;           /**< List of arena's spans. */
 } ra_arena_t;

kernel/generic/include/mm/slab.h

@@ -81 +81 @@
         slab_magazine_t *current;
         slab_magazine_t *last;
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
 } slab_mag_cache_t;
 
@@ -113 +113 @@
         list_t full_slabs;     /**< List of full slabs */
         list_t partial_slabs;  /**< List of partial slabs */
-        SPINLOCK_DECLARE(slablock);
+        IRQ_SPINLOCK_DECLARE(slablock);
         /* Magazines */
         list_t magazines;  /**< List o full magazines */
-        SPINLOCK_DECLARE(maglock);
+        IRQ_SPINLOCK_DECLARE(maglock);
         
         /** CPU cache */

kernel/generic/include/proc/program.h

@@ -50 +50 @@
         struct task *task;           /**< Program task */
         struct thread *main_thread;  /**< Program main thread */
+        unsigned int loader_status;  /**< Binary loader error status */
 } program_t;
 

kernel/generic/include/proc/thread.h

@@ -54 +54 @@
 
 /* Thread flags */
-
-/** Thread cannot be migrated to another CPU.
- *
- * When using this flag, the caller must set cpu in the thread_t
- * structure manually before calling thread_ready (even on uniprocessor).
- *
- */
-#define THREAD_FLAG_WIRED  (1 << 0)
-
-/** Thread was migrated to another CPU and has not run yet. */
-#define THREAD_FLAG_STOLEN  (1 << 1)
-
-/** Thread executes in userspace. */
-#define THREAD_FLAG_USPACE  (1 << 2)
-
-/** Thread will be attached by the caller. */
-#define THREAD_FLAG_NOATTACH  (1 << 3)
+typedef enum {
+        THREAD_FLAG_NONE = 0,
+        /** Thread executes in user space. */
+        THREAD_FLAG_USPACE = (1 << 0),
+        /** Thread will be attached by the caller. */
+        THREAD_FLAG_NOATTACH = (1 << 1),
+        /** Thread accounting doesn't affect accumulated task accounting. */
+        THREAD_FLAG_UNCOUNTED = (1 << 2)
+} thread_flags_t;
 
 /** Thread structure. There is one per thread. */
@@ -147 +139 @@
         
         fpu_context_t *saved_fpu_context;
-        int fpu_context_exists;
+        bool fpu_context_exists;
         
         /*
@@ -154 +146 @@
          * thread. This disables migration.
          */
-        int fpu_context_engaged;
+        bool fpu_context_engaged;
         
         /* The thread will not be migrated if nomigrate is non-zero. */
-        int nomigrate;
-        
-        /** Thread's state. */
+        unsigned int nomigrate;
+        
+        /** Thread state. */
         state_t state;
-        /** Thread's flags. */
-        unsigned int flags;
-        
-        /** Thread's CPU. */
+        
+        /** Thread CPU. */
         cpu_t *cpu;
         /** Containing task. */
         task_t *task;
+        /** Thread is wired to CPU. */
+        bool wired;
+        /** Thread was migrated to another CPU and has not run yet. */
+        bool stolen;
+        /** Thread is executed in user space. */
+        bool uspace;
         
         /** Ticks before preemption. */
@@ -216 +212 @@
 extern void thread_init(void);
 extern thread_t *thread_create(void (*)(void *), void *, task_t *,
-    unsigned int, const char *, bool);
+    thread_flags_t, const char *);
+extern void thread_wire(thread_t *, cpu_t *);
 extern void thread_attach(thread_t *, task_t *);
 extern void thread_ready(thread_t *);

kernel/generic/include/symtab.h

@@ -36 +36 @@
 #define KERN_SYMTAB_H_
 
-#include <typedefs.h>
+#include <symtab_lookup.h>
+#include <console/chardev.h>
 
-#define MAX_SYMBOL_NAME  64
-
-struct symtab_entry {
-        uint64_t address_le;
-        char symbol_name[MAX_SYMBOL_NAME];
-};
-
-extern int symtab_name_lookup(uintptr_t, const char **, uintptr_t *);
-extern const char *symtab_fmt_name_lookup(uintptr_t);
-extern int symtab_addr_lookup(const char *, uintptr_t *);
 extern void symtab_print_search(const char *);
-extern int symtab_compl(char *, size_t);
-
-#ifdef CONFIG_SYMTAB
-
-/** Symtable linked together by build process
- *
- */
-extern struct symtab_entry symbol_table[];
-
-#endif /* CONFIG_SYMTAB */
+extern int symtab_compl(char *, size_t, indev_t *);
 
 #endif