Changeset 8751cf3 in mainline

Timestamp:

2018-06-19T20:04:17Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

826a0a97

Parents:

3bd1d7d4

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-04 20:01:22)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-06-19 20:04:17)

Message:

Print stacktrace on KIO before attempting printf().

Location:

uspace/lib/c

Files:

• generic/assert.c (modified) (2 diffs)
• generic/stacktrace.c (modified) (3 diffs)
• include/stacktrace.h (modified) (2 diffs)

uspace/lib/c/generic/assert.c

@@ -49 +49 @@
             cond, file, line);
 
+        stacktrace_kio_print();
+
         /* Sometimes we know in advance that regular printf() would likely fail. */
         abort();
@@ -60 +62 @@
         kio_printf("Assertion failed (%s) in file \"%s\", line %u.\n",
             cond, file, line);
+
+        stacktrace_kio_print();
 
         /*

uspace/lib/c/generic/stacktrace.c

@@ -39 +39 @@
 #include <stdint.h>
 #include <errno.h>
+#include <io/kio.h>
 
 static errno_t stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);
 
 static stacktrace_ops_t basic_ops = {
-        .read_uintptr = stacktrace_read_uintptr
+        .read_uintptr = stacktrace_read_uintptr,
+        .printf = printf,
+};
+
+static stacktrace_ops_t kio_ops = {
+        .read_uintptr = stacktrace_read_uintptr,
+        .printf = kio_printf,
 };
 
@@ -57 +64 @@
 
         while (stacktrace_fp_valid(&st, fp)) {
-                printf("%p: %p()\n", (void *) fp, (void *) pc);
+                ops->printf("%p: %p()\n", (void *) fp, (void *) pc);
                 rc =  stacktrace_ra_get(&st, fp, &pc);
                 if (rc != EOK)
@@ -71 +78 @@
 {
         stacktrace_print_generic(&basic_ops, NULL, fp, pc);
+}
+
+void stacktrace_kio_print(void)
+{
+        stacktrace_prepare();
+        stacktrace_print_generic(&kio_ops, NULL, stacktrace_fp_get(), stacktrace_pc_get());
+
+        /*
+         * Prevent the tail call optimization of the previous call by
+         * making it a non-tail call.
+         */
+
+        kio_printf("-- end of stack trace --\n");
 }
 

uspace/lib/c/include/stacktrace.h

@@ -43 +43 @@
 typedef struct {
         errno_t (*read_uintptr)(void *, uintptr_t, uintptr_t *);
+        int (*printf)(const char *, ...);
 } stacktrace_ops_t;
 
@@ -51 +52 @@
 
 extern void stacktrace_print(void);
+extern void stacktrace_kio_print(void);
 extern void stacktrace_print_fp_pc(uintptr_t, uintptr_t);
 extern void stacktrace_print_generic(stacktrace_ops_t *, void *, uintptr_t,