From 275bf31b13f430d0dda4ef445c99ef953be0fc13 Mon Sep 17 00:00:00 2001
From: Alex Shinn <ashinn@users.noreply.github.com>
Date: Sat, 21 Jul 2012 17:28:09 +0900
Subject: [PATCH] adding optional thread debugging output
---
include/chibi/features.h | 4 ++++
vm.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/include/chibi/features.h b/include/chibi/features.h
index 07dad44e..918a0820 100644
--- a/include/chibi/features.h
+++ b/include/chibi/features.h
@@ -284,6 +284,10 @@
#define SEXP_USE_GREEN_THREADS ! SEXP_USE_NO_FEATURES
#endif
+#ifndef SEXP_USE_DEBUG_THREADS
+#define SEXP_USE_DEBUG_THREADS 0
+#endif
+
#ifndef SEXP_USE_AUTO_FORCE
#define SEXP_USE_AUTO_FORCE 0
#endif
diff --git a/vm.c b/vm.c
index b5fa7a5d..1977bced 100644
--- a/vm.c
+++ b/vm.c
@@ -922,6 +922,23 @@ sexp sexp_print_vm_profile (sexp ctx, sexp self, sexp_sint_t n) {
}
#endif
+#if SEXP_USE_DEBUG_THREADS
+static const char* sexp_thread_debug_name(sexp ctx) {
+ if (sexp_stringp(sexp_context_name(ctx)))
+ return sexp_string_data(sexp_context_name(ctx));
+ return "?";
+}
+
+static char* sexp_thread_debug_event_type(sexp ctx) {
+ sexp evt = sexp_context_event(ctx);
+ return sexp_portp(evt) ? "p" : sexp_contextp(evt) ? "c" : "?";
+}
+
+static void* sexp_thread_debug_event(sexp ctx) {
+ return (void*)sexp_context_event(ctx);
+}
+#endif
+
#if SEXP_USE_CHECK_STACK
#define sexp_ensure_stack(n) \
if (top+(n) >= sexp_stack_length(sexp_context_stack(ctx))) { \
@@ -977,6 +994,9 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
sexp_context_last_fp(ctx) = fp;
sexp_context_proc(ctx) = self;
/* run scheduler */
+#if SEXP_USE_DEBUG_THREADS
+ tmp2 = ctx;
+#endif
ctx = sexp_apply1(ctx, tmp1, root_thread);
/* restore thread */
stack = sexp_stack_data(sexp_context_stack(ctx));
@@ -986,6 +1006,18 @@ sexp sexp_apply (sexp ctx, sexp proc, sexp args) {
self = sexp_context_proc(ctx);
bc = sexp_procedure_code(self);
cp = sexp_procedure_vars(self);
+#if SEXP_USE_DEBUG_THREADS
+ if (ctx != tmp2) {
+ fprintf(stderr, "****** schedule: %p (%s) active:",
+ ctx, sexp_thread_debug_name(ctx));
+ for (tmp1=sexp_global(ctx, SEXP_G_THREADS_FRONT); sexp_pairp(tmp1); tmp1=sexp_cdr(tmp1))
+ fprintf(stderr, " %p (%s)", sexp_car(tmp1), sexp_thread_debug_name(sexp_car(tmp1)));
+ fprintf(stderr, " paused:");
+ for (tmp1=sexp_global(ctx, SEXP_G_THREADS_PAUSED); sexp_pairp(tmp1); tmp1=sexp_cdr(tmp1))
+ fprintf(stderr, " %p (%s) [%s %p]", sexp_car(tmp1), sexp_thread_debug_name(sexp_car(tmp1)), sexp_thread_debug_event_type(sexp_car(tmp1)), sexp_thread_debug_event(sexp_car(tmp1)));
+ fprintf(stderr, " ******\n");
+ }
+#endif
}
fuel = sexp_context_refuel(ctx);
if (fuel <= 0) goto end_loop;