Changeset 7ad17de in mainline

Timestamp:

2012-11-18T10:59:41Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dbb3552

Parents:

9043309c

Message:

Instead of printing the standard kill message, only inform the user when a task
is killed because of its failure to late-reserve memory. This happens, for
example, when there is not enough memory to grow thread stack.

Location:

kernel/generic

Files:

• include/proc/task.h (modified) (1 diff)
• src/interrupt/interrupt.c (modified) (1 diff)
• src/mm/backend_anon.c (modified) (1 diff)
• src/proc/task.c (modified) (1 diff)

kernel/generic/include/proc/task.h

@@ -134 +134 @@
         uint64_t ucycles;
         uint64_t kcycles;
+
+        /** If true, do not attempt to print a verbose kill message. */ 
+        bool silent_kill;
 } task_t;
 

kernel/generic/src/interrupt/interrupt.c

@@ -168 +168 @@
 static NO_TRACE void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
 {
-        printf("Task %s (%" PRIu64 ") killed due to an exception at "
-            "program counter %p.\n", TASK->name, TASK->taskid,
-            (void *) istate_get_pc(istate));
-        
-        istate_decode(istate);
-        stack_trace_istate(istate);
-        
-        printf("Kill message: ");
-        vprintf(fmt, args);
-        printf("\n");
+        if (!TASK->silent_kill) {
+                printf("Task %s (%" PRIu64 ") killed due to an exception at "
+                    "program counter %p.\n", TASK->name, TASK->taskid,
+                    (void *) istate_get_pc(istate));
+        
+                istate_decode(istate);
+                stack_trace_istate(istate);
+        
+                printf("Kill message: ");
+                vprintf(fmt, args);
+                printf("\n");
+        }
         
         task_kill_self(true);

kernel/generic/src/mm/backend_anon.c

@@ -255 +255 @@
                          * Reserve the memory for this page now.
                          */
-                        if (!reserve_try_alloc(1))
+                        if (!reserve_try_alloc(1)) {
+                                printf("Killing task %" PRIu64 " due to a "
+                                    "failed late reservation request.\n",
+                                    TASK->taskid);
+                                TASK->silent_kill = true;
                                 return AS_PF_FAULT;
+                        }
                 }
 

kernel/generic/src/proc/task.c

@@ -196 +196 @@
         task->ucycles = 0;
         task->kcycles = 0;
+
+        task->silent_kill = false;
         
         task->ipc_info.call_sent = 0;