Changeset 12193


Ignore:
Timestamp:
Jun 4, 2009, 9:30:23 PM (10 years ago)
Author:
gz
Message:

merge r12190 into trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/lib/backtrace.lisp

    r11659 r12193  
    5353                          (count target::target-most-positive-fixnum)
    5454                          (start-frame-number 0)
    55                           (stream *debug-io*)
    5655                          (print-level *backtrace-print-level*)
    5756                          (print-length *backtrace-print-length*)
     
    6867                    (process (process-tcr process))
    6968                    (t (%current-tcr))))
    70          (*debug-io* stream)
    7169         (*backtrace-print-level* print-level)
    7270         (*backtrace-print-length* print-length)
     
    104102                    (process (process-tcr process))
    105103                    (t (%current-tcr))))
    106          (*debug-io* stream)
    107104         (*backtrace-print-level* print-level)
    108105         (*backtrace-print-length* print-length)
     
    110107         (*backtrace-format* format))
    111108    (if (eq tcr (%current-tcr))
    112       (%print-call-history-internal context (or origin (%get-frame-ptr)) detailed-p count start-frame-number)
     109      (%print-call-history-internal context (or origin (%get-frame-ptr)) detailed-p count start-frame-number stream)
    113110      (unwind-protect
    114111           (progn
     
    116113             (unless context
    117114               (setq context (context-for-suspended-tcr tcr)))
    118              (%print-call-history-internal context (or origin (bt.current context)) detailed-p count start-frame-number))
     115             (%print-call-history-internal context (or origin (bt.current context)) detailed-p count start-frame-number stream))
    119116        (%resume-tcr tcr)))
    120117    (values)))
     
    290287 
    291288(defun %print-call-history-internal (context origin detailed-p
    292                                              &optional (count target::target-most-positive-fixnum) (skip-initial 0))
     289                                             &optional (count target::target-most-positive-fixnum)
     290                                                       (skip-initial 0)
     291                                                       (stream *debug-io*))
    293292  (unless (eq (last-frame-ptr context origin) (last-frame-ptr context))
    294293    (error "Origin ~s is not in the stack of ~s" origin context))
    295   (let ((*standard-output* *debug-io*)
     294  (let ((*standard-output* stream)
    296295        (*print-circle* nil)
    297296        (*print-catch-errors* t)
Note: See TracChangeset for help on using the changeset viewer.