From e20506644ff5b1f0361d3de0f775941413156a7d Mon Sep 17 00:00:00 2001 From: Sam Caldwell Date: Fri, 22 Jul 2016 16:28:22 -0400 Subject: [PATCH] update monolithic impl to use hierarchy.rkt --- racket/syndicate-monolithic/core.rkt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/racket/syndicate-monolithic/core.rkt b/racket/syndicate-monolithic/core.rkt index 211f36b..b5a9772 100644 --- a/racket/syndicate-monolithic/core.rkt +++ b/racket/syndicate-monolithic/core.rkt @@ -70,6 +70,7 @@ (require "../syndicate/trie.rkt") (require "scn.rkt") (require "../syndicate/trace.rkt") +(require "../syndicate/hierarchy.rkt") (require "mux.rkt") (require "../syndicate/pretty.rkt") (module+ test (require rackunit)) @@ -210,7 +211,7 @@ (define (disable-process pid exn w) (when exn (log-error "Process ~a died with exception:\n~a" - (cons pid (trace-pid-stack)) + (append (current-actor-path) (list pid)) (exn->string exn))) (struct-copy dataspace w [behaviors (hash-remove (dataspace-behaviors w) pid)] @@ -218,7 +219,7 @@ (define (invoke-process pid thunk k-ok k-exn) (define-values (ok? result) - (call-in-trace-context + (call/extended-actor-path pid (lambda () (with-handlers ([(lambda (exn) #t) (lambda (exn) (values #f exn))]) @@ -352,7 +353,7 @@ (create-process w behavior initial-transition)) (lambda (exn) (log-error "Spawned process in dataspace ~a died with exception:\n~a" - (trace-pid-stack) + (current-actor-path) (exn->string exn)) (transition w '())))] ['quit @@ -369,7 +370,7 @@ [(and m (message body)) (when (observe? body) (log-warning "Stream ~a sent message containing query ~v" - (cons label (trace-pid-stack)) + (append (current-actor-path) (list label)) body)) (if (and (not (meta-label? label)) ;; it's from a local process, not envt (at-meta? body)) ;; it relates to envt, not local