mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00
Code Activity

inside-profiler? to parameter instead of global variable

Browse source 
* module/statprof.scm (<state>): Add inside-profiler? member.  Move
  mutations of inside-profiler? here.
This commit is contained in:
Andy Wingo 2014-02-21 21:25:50 +01:00
parent 62fd93e242
commit 56bfce7c5d
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
module/statprof.scm
View file

@ -163,7 +163,7 @@
(make-state accumulated-time last-start-time sample-count
sampling-frequency remaining-prof-time profile-level
count-calls? gc-time-taken record-full-stacks?
stacks procedure-data)
stacks procedure-data inside-profiler?)
state?
;; Total time so far.
(accumulated-time accumulated-time set-accumulated-time!)
@ -188,13 +188,15 @@
;; A hash where the key is the function object itself and the value is
;; the data. The data will be a vector like this:
;; #(name call-count cum-sample-count self-sample-count)
(procedure-data procedure-data set-procedure-data!))
(procedure-data procedure-data set-procedure-data!)
;; True if we are inside the profiler.
(inside-profiler? inside-profiler? set-inside-profiler?!))
(define profiler-state (make-parameter #f))
(define (ensure-profiler-state)
(or (profiler-state)
(let ((state (make-state #f #f #f #f #f 0 #t 0 #f '() #f)))
(let ((state (make-state #f #f #f #f #f 0 #t 0 #f '() #f #f)))
(profiler-state state)
state)))
@ -278,12 +280,10 @@
(loop (frame-previous frame) procs-seen self))))
hit-count-call?))
(define inside-profiler? #f)
(define (profile-signal-handler sig)
(define state (ensure-profiler-state))
(set! inside-profiler? #t)
(set-inside-profiler?! state #t)
;; FIXME: with-statprof should be able to set an outer frame for the
;; stack cut
@ -322,7 +322,7 @@
(if (count-calls? state)
(set-vm-trace-level! (1+ (vm-trace-level))))))))
(set! inside-profiler? #f))
(set-inside-profiler?! state #f))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Count total calls.
@ -330,7 +330,7 @@
(define (count-call frame)
(define state (ensure-profiler-state))
(if (not inside-profiler?)
(if (not (inside-profiler? state))
(begin
(accumulate-time state (get-internal-run-time))
@ -762,9 +762,9 @@ whole call tree, for later analysis. Use @code{statprof-fetch-stacks} or
(define (gc-callback)
(cond
(inside-profiler?)
((inside-profiler? state))
(else
(set! inside-profiler? #t)
(set-inside-profiler?! state #t)
;; FIXME: should be able to set an outer frame for the stack cut
(let ((stop-time (get-internal-run-time))
@ -777,7 +777,7 @@ whole call tree, for later analysis. Use @code{statprof-fetch-stacks} or
(accumulate-time state stop-time)
(set-last-start-time! state (get-internal-run-time)))
(set! inside-profiler? #f))))
(set-inside-profiler?! state #f))))
(define (start)
(set-profile-level! state (+ (profile-level state) 1))