From 39100bd3e3a085b8911b9e3018c78e62dbe6d82b Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Fri, 7 Sep 2012 17:23:26 -0400 Subject: [PATCH] Fix OC for new logging system. --- collects/typed-racket/optimizer/logging.rkt | 5 +++-- .../typed-racket/optimizer/tool/logging.rkt | 21 ++++++++++--------- collects/typed-racket/optimizer/tool/mzc.rkt | 14 +++++-------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/collects/typed-racket/optimizer/logging.rkt b/collects/typed-racket/optimizer/logging.rkt index c9f2514434..a394d16380 100644 --- a/collects/typed-racket/optimizer/logging.rkt +++ b/collects/typed-racket/optimizer/logging.rkt @@ -14,15 +14,16 @@ ;;-------------------------------------------------------------------- (define TR-logging-level 'debug) +(define TR-logger (make-logger 'TR-optimizer (current-logger))) (define (emit-log-message l) - (log-message (current-logger) TR-logging-level + (log-message TR-logger TR-logging-level (format-log-entry l) (cons optimization-log-key l))) ;; producing logs can be expensive, don't do it if no-one's listening ;; to the logs -(define (anyone-listening?) (log-level? (current-logger) TR-logging-level)) +(define (anyone-listening?) (log-level? TR-logger TR-logging-level)) ;; to identify log messages that come from the optimizer ;; to be stored in the data section of log messages diff --git a/collects/typed-racket/optimizer/tool/logging.rkt b/collects/typed-racket/optimizer/tool/logging.rkt index 256aad21e2..9cdbf546b9 100644 --- a/collects/typed-racket/optimizer/tool/logging.rkt +++ b/collects/typed-racket/optimizer/tool/logging.rkt @@ -9,13 +9,14 @@ ;; Intercepts both TR optimizer logging and mzc optimizer logging. ;; Interceptor accepts log-entry structs. (define (with-intercepted-opt-logging interceptor thunk) - (with-intercepted-logging #:level 'debug - (lambda (l) - (cond [(log-message-from-tr-opt? l) - ;; From TR, use the log-entry struct provided. - (interceptor (cdr (vector-ref l 2)))] - ;; We look at the message to tell if it's from mzc. - [(log-message-from-mzc-opt? (vector-ref l 1)) - ;; From mzc, create a log-entry from the info. - (interceptor (mzc-opt-log-message->log-entry (vector-ref l 1)))])) - thunk)) + (with-intercepted-logging + (lambda (l) + (cond [(log-message-from-tr-opt? l) + ;; From TR, use the log-entry struct provided. + (interceptor (cdr (vector-ref l 2)))] + ;; We look at the message to tell if it's from mzc. + [(log-message-from-mzc-opt? (vector-ref l 1)) + ;; From mzc, create a log-entry from the info. + (interceptor (mzc-opt-log-message->log-entry (vector-ref l 1)))])) + thunk + 'debug 'optimizer 'debug 'TR-optimizer)) diff --git a/collects/typed-racket/optimizer/tool/mzc.rkt b/collects/typed-racket/optimizer/tool/mzc.rkt index c9cad1de42..b478aa9602 100644 --- a/collects/typed-racket/optimizer/tool/mzc.rkt +++ b/collects/typed-racket/optimizer/tool/mzc.rkt @@ -13,21 +13,17 @@ ;;; Low-level log parsing. Goes from strings to log-entry structs. -(define mzc-optimizer-regexp "^mzc optimizer: ") (define success-regexp "inlining: ") (define failure-regexp "no inlining: ") (define out-of-fuel-regexp "no inlining, out of fuel: ") (define any-inlining-event-regexp - (string-append mzc-optimizer-regexp - "(" - (string-join (list success-regexp - failure-regexp - out-of-fuel-regexp) - "|") - ")")) + (format "^optimizer: (~a)" (string-join (list success-regexp + failure-regexp + out-of-fuel-regexp) + "|"))) (define (log-message-from-mzc-opt? l) - (regexp-match mzc-optimizer-regexp l)) + (regexp-match any-inlining-event-regexp l)) (struct inliner-log-entry log-entry (inlining-event) #:prefab)