Changeset 8119363 in mainline for uspace/lib/c/generic/stacktrace.c

Timestamp:

2018-06-26T17:35:40Z (7 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:

6e569bf

Parents:

fbfe59d (diff), e768aea (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 some preliminary async/fibril framework changes.

File:

• uspace/lib/c/generic/stacktrace.c (modified) (3 diffs)

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");
 }