mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 09:10:22 +02:00
Code Activity

Better backtraces from C, especially for optimized closures

Browse source 
* libguile/frames.h:
* libguile/frames.c (scm_frame_call_representation): New interface;
  dispatches to Scheme.

* libguile/backtrace.c (display_application): Use
  scm_frame_call_representation.  This should be monotonically better,
  given that scm_frame_arguments (which was previously called) also
  dispatched to Scheme and actually ended up calling
  frame-call-representation.
This commit is contained in:
Andy Wingo 2014-04-16 14:33:20 +02:00
parent d856931d8d
commit 4819276185
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/backtrace.c
View file

@ -1,5 +1,5 @@
/* Printing of backtraces and error messages /* Printing of backtraces and error messages
* Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009, 2010, 2011 Free Software Foundation * Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009, 2010, 2011, 2014 Free Software Foundation
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -262,14 +262,7 @@ display_frame_expr (char *hdr, SCM exp, char *tlr, int indentation, SCM sport, S
static void static void
display_application (SCM frame, int indentation, SCM sport, SCM port, scm_print_state *pstate) display_application (SCM frame, int indentation, SCM sport, SCM port, scm_print_state *pstate)
{ {
SCM proc = scm_frame_procedure (frame); display_frame_expr ("[", scm_frame_call_representation (frame), "]",
SCM name = (scm_is_true (scm_procedure_p (proc))
? scm_procedure_name (proc)
: SCM_BOOL_F);
display_frame_expr ("[",
scm_cons (scm_is_true (name) ? name : proc,
scm_frame_arguments (frame)),
"]",
indentation, indentation,
sport, sport,
port, port,

21
libguile/frames.c
View file

@ -171,6 +171,27 @@ SCM_DEFINE (scm_frame_arguments, "frame-arguments", 1, 0, 0,
} }
#undef FUNC_NAME #undef FUNC_NAME
static SCM frame_call_representation_var;
static void
init_frame_call_representation_var (void)
{
frame_call_representation_var
= scm_c_private_lookup ("system vm frame", "frame-call-representation");
}
SCM scm_frame_call_representation (SCM frame)
#define FUNC_NAME "frame-call-representation"
{
static scm_i_pthread_once_t once = SCM_I_PTHREAD_ONCE_INIT;
scm_i_pthread_once (&once, init_frame_call_representation_var);
SCM_VALIDATE_VM_FRAME (1, frame);
return scm_call_1 (scm_variable_ref (frame_call_representation_var), frame);
}
#undef FUNC_NAME
SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0, SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0,
(SCM frame), (SCM frame),
"") "")

1
libguile/frames.h
View file

@ -181,6 +181,7 @@ SCM_INTERNAL int scm_c_frame_previous (enum scm_vm_frame_kind kind,
SCM_API SCM scm_frame_p (SCM obj); SCM_API SCM scm_frame_p (SCM obj);
SCM_API SCM scm_frame_procedure (SCM frame); SCM_API SCM scm_frame_procedure (SCM frame);
SCM_API SCM scm_frame_call_representation (SCM frame);
SCM_API SCM scm_frame_arguments (SCM frame); SCM_API SCM scm_frame_arguments (SCM frame);
SCM_API SCM scm_frame_source (SCM frame); SCM_API SCM scm_frame_source (SCM frame);
SCM_API SCM scm_frame_num_locals (SCM frame); SCM_API SCM scm_frame_num_locals (SCM frame);