Changeset 4f5dc18 in mainline for kernel/generic

Timestamp:

2009-11-03T21:36:54Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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:

Merge with mainline.

Location:

kernel/generic

Files:

• include/context.h (modified) (2 diffs)
• include/print.h (modified) (1 diff)
• include/printf/printf_core.h (modified) (1 diff)
• include/stackarg.h (deleted)
• include/stdarg.h (modified) (3 diffs)
• src/console/cmd.c (modified) (9 diffs)
• src/ipc/kbox.c (modified) (1 diff)
• src/printf/printf_core.c (modified) (1 diff)

kernel/generic/include/context.h

@@ -51 +51 @@
 /** Save register context.
  *
- * Save current register context (including stack pointers)
- * to context structure.
- *
- * Note that call to context_restore() will return at the same
+ * Save the current register context (including stack pointer) to a context
+ * structure. A subsequent call to context_restore() will return to the same
  * address as the corresponding call to context_save().
  *
- * This MUST be a macro, gcc -O0 does not inline functions even
- * if they are marked inline and context_save_arch must be called
- * from level <= that when context_restore is called.
+ * Note that context_save_arch() must reuse the stack frame of the function
+ * which called context_save(). We guarantee this by:
  *
- * @param c Context structure.
+ *   a) implementing context_save_arch() in assembly so that it does not create
+ *      its own stack frame, and by
+ *   b) defining context_save() as a macro because the inline keyword is just a
+ *      hint for the compiler, not a real constraint; the application of a macro
+ *      will definitely not create a stack frame either.
  *
- * @return context_save() returns 1, context_restore() returns 0.
+ * To imagine what could happen if there were some extra stack frames created
+ * either by context_save() or context_save_arch(), we need to realize that the
+ * sp saved in the contex_t structure points to the current stack frame as it
+ * existed when context_save_arch() was executing. After the return from
+ * context_save_arch() and context_save(), any extra stack frames created by
+ * these functions will be destroyed and their contents sooner or later
+ * overwritten by functions called next. Any attempt to restore to a context
+ * saved like that would therefore lead to a disaster.
+ *
+ * @param c             Context structure.
+ *
+ * @return              context_save() returns 1, context_restore() returns 0.
  */
 #define context_save(c)   context_save_arch(c)
@@ -69 +81 @@
 /** Restore register context.
  *
- * Restore previously saved register context (including stack pointers)
- * from context structure.
+ * Restore a previously saved register context (including stack pointer) from
+ * a context structure.
  *
- * Note that this function does not normally return.
- * Instead, it returns at the same address as the
- * corresponding call to context_save(), the only
- * difference being return value.
+ * Note that this function does not normally return.  Instead, it returns to the
+ * same address as the corresponding call to context_save(), the only difference
+ * being return value.
  *
- * @param c Context structure.
+ * @param c             Context structure.
  */
 static inline void context_restore(context_t *c)

kernel/generic/include/print.h

@@ -37 +37 @@
 
 #include <arch/types.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 #define EOF (-1)

kernel/generic/include/printf/printf_core.h

@@ -37 +37 @@
 
 #include <typedefs.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 
 /** Structure for specifying output methods for different printf clones. */

kernel/generic/include/stdarg.h

@@ -27 +27 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup generic
  * @{
  */
@@ -37 +37 @@
  * for all architectures with compiler support for __builtin_va_*.
  */
- 
+
 #ifndef KERN_STDARG_H_
 #define KERN_STDARG_H_
@@ -43 +43 @@
 typedef __builtin_va_list va_list;
 
-#define va_start(ap, last)              __builtin_va_start(ap, last)
-#define va_arg(ap, type)                __builtin_va_arg(ap, type)
-#define va_end(ap)                      __builtin_va_end(ap)
-#define va_copy(dst, src)               __builtin_va_copy(dst, src)
+#define va_start(ap, last)  __builtin_va_start(ap, last)
+#define va_arg(ap, type)    __builtin_va_arg(ap, type)
+#define va_end(ap)          __builtin_va_end(ap)
+#define va_copy(dst, src)   __builtin_va_copy(dst, src)
 
 #endif

kernel/generic/src/console/cmd.c

@@ -409 +409 @@
 };
 
+/* Data and methods for 'kill' command */
+static int cmd_kill(cmd_arg_t *argv);
+static cmd_arg_t kill_argv = {
+        .type = ARG_TYPE_INT,
+};
+static cmd_info_t kill_info = {
+        .name = "kill",
+        .description = "kill <taskid> Kill a task.",
+        .func = cmd_kill,
+        .argc = 1,
+        .argv = &kill_argv
+};
+
 /* Data and methods for 'zone' command */
 static int cmd_zone(cmd_arg_t *argv);
@@ -459 +472 @@
         &help_info,
         &ipc_info,
+        &kill_info,
         &set4_info,
         &slabs_info,
@@ -848 +862 @@
  * @return Always 1
  */
-int cmd_slabs(cmd_arg_t * argv) {
+int cmd_slabs(cmd_arg_t * argv)
+{
         slab_print_list();
         return 1;
@@ -860 +875 @@
  * @return Always 1
  */
-int cmd_threads(cmd_arg_t * argv) {
+int cmd_threads(cmd_arg_t * argv)
+{
         thread_print_list();
         return 1;
@@ -871 +887 @@
  * @return Always 1
  */
-int cmd_tasks(cmd_arg_t * argv) {
+int cmd_tasks(cmd_arg_t * argv)
+{
         task_print_list();
         return 1;
@@ -882 +899 @@
  * @return Always 1
  */
-int cmd_sched(cmd_arg_t * argv) {
+int cmd_sched(cmd_arg_t * argv)
+{
         sched_print_list();
         return 1;
@@ -893 +911 @@
  * return Always 1
  */
-int cmd_zones(cmd_arg_t * argv) {
+int cmd_zones(cmd_arg_t * argv)
+{
         zone_print_list();
         return 1;
@@ -904 +923 @@
  * return Always 1
  */
-int cmd_zone(cmd_arg_t * argv) {
+int cmd_zone(cmd_arg_t * argv)
+{
         zone_print_one(argv[0].intval);
         return 1;
@@ -915 +935 @@
  * return Always 1
  */
-int cmd_ipc(cmd_arg_t * argv) {
+int cmd_ipc(cmd_arg_t * argv)
+{
         ipc_print_task(argv[0].intval);
         return 1;
 }
 
+/** Command for killing a task
+ *
+ * @param argv Integer argument from cmdline expected
+ *
+ * return 0 on failure, 1 on success.
+ */
+int cmd_kill(cmd_arg_t * argv)
+{
+        if (task_kill(argv[0].intval) != EOK)
+                return 0;
+
+        return 1;
+}
 
 /** Command for listing processors.

kernel/generic/src/ipc/kbox.c

@@ -137 +137 @@
                 /* Only detach kbox thread unless already terminating. */
                 mutex_lock(&TASK->kb.cleanup_lock);
-                if (&TASK->kb.finished == false) {
+                if (TASK->kb.finished == false) {
                         /* Detach kbox thread so it gets freed from memory. */
                         thread_detach(TASK->kb.thread);

kernel/generic/src/printf/printf_core.c

@@ -39 +39 @@
 #include <printf/printf_core.h>
 #include <print.h>
-#include <arch/arg.h>
+#include <stdarg.h>
 #include <macros.h>
 #include <string.h>