syndicate-lang
/
syndicate-2017
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update monolithic impl to use hierarchy.rkt

This commit is contained in:
Sam Caldwell 2016-07-22 16:28:22 -04:00
parent f28e16ee7b
commit e20506644f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
racket/syndicate-monolithic/core.rkt
View File

@ -70,6 +70,7 @@
(require "../syndicate/trie.rkt") (require "../syndicate/trie.rkt")
(require "scn.rkt") (require "scn.rkt")
(require "../syndicate/trace.rkt") (require "../syndicate/trace.rkt")
(require "../syndicate/hierarchy.rkt")
(require "mux.rkt") (require "mux.rkt")
(require "../syndicate/pretty.rkt") (require "../syndicate/pretty.rkt")
(module+ test (require rackunit)) (module+ test (require rackunit))
@ -210,7 +211,7 @@
(define (disable-process pid exn w) (define (disable-process pid exn w)
(when exn (when exn
(log-error "Process ~a died with exception:\n~a" (log-error "Process ~a died with exception:\n~a"
(cons pid (trace-pid-stack)) (append (current-actor-path) (list pid))
(exn->string exn))) (exn->string exn)))
(struct-copy dataspace w (struct-copy dataspace w
[behaviors (hash-remove (dataspace-behaviors w) pid)] [behaviors (hash-remove (dataspace-behaviors w) pid)]
@ -218,7 +219,7 @@
(define (invoke-process pid thunk k-ok k-exn) (define (invoke-process pid thunk k-ok k-exn)
(define-values (ok? result) (define-values (ok? result)
(call-in-trace-context (call/extended-actor-path
pid pid
(lambda () (lambda ()
(with-handlers ([(lambda (exn) #t) (lambda (exn) (values #f exn))]) (with-handlers ([(lambda (exn) #t) (lambda (exn) (values #f exn))])
@ -352,7 +353,7 @@
(create-process w behavior initial-transition)) (create-process w behavior initial-transition))
(lambda (exn) (lambda (exn)
(log-error "Spawned process in dataspace ~a died with exception:\n~a" (log-error "Spawned process in dataspace ~a died with exception:\n~a"
(trace-pid-stack) (current-actor-path)
(exn->string exn)) (exn->string exn))
(transition w '())))] (transition w '())))]
['quit ['quit
@ -369,7 +370,7 @@
[(and m (message body)) [(and m (message body))
(when (observe? body) (when (observe? body)
(log-warning "Stream ~a sent message containing query ~v" (log-warning "Stream ~a sent message containing query ~v"
(cons label (trace-pid-stack)) (append (current-actor-path) (list label))
body)) body))
(if (and (not (meta-label? label)) ;; it's from a local process, not envt (if (and (not (meta-label? label)) ;; it's from a local process, not envt
(at-meta? body)) ;; it relates to envt, not local (at-meta? body)) ;; it relates to envt, not local