Merge pull request #387 from uwplse/thread-safe

Ensure thread-safe operations

Author: pavpanchekha

.github/workflows/tests.yml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        racket-version: [ '7.8', '8.0', '8.1' ]
+        racket-version: [ '8.0', '8.0', '8.2' ]
         precision: [ 'binary32', 'binary64' ]
     steps:
       - name: "Install Packages"
@@ -62,7 +62,9 @@ jobs:
       - name: "Install Packages"
         run: sudo apt-get install -y libmpfr6 libmpfr-dev
       - name: "Install Racket"
-        uses: Bogdanp/[email protected]
+        uses: Bogdanp/[email protected]
+        with:
+          version: '8.0'
       - name: Install Rust compiler
         uses: actions-rs/toolchain@v1
         with:
@@ -90,7 +92,9 @@ jobs:
       - name: "Install Packages"
         run: sudo apt-get install -y libmpfr6 libmpfr-dev
       - name: "Install Racket"
-        uses: Bogdanp/[email protected]
+        uses: Bogdanp/[email protected]
+        with:
+          version: '8.0'
       - name: Install Rust compiler
         uses: actions-rs/toolchain@v1
         with:
@@ -116,15 +120,14 @@ jobs:
     needs: [ 'hamming' ]
     strategy:
       matrix: # this takes a while: don't run too many
-        racket-version: [ '7.9' ]
         precision: [ 'binary32', 'binary64' ]
     steps:
       - name: "Install Packages"
         run: sudo apt-get install -y libmpfr6 libmpfr-dev
       - name: "Install Racket"
-        uses: Bogdanp/setup-racket@v0.5
+        uses: Bogdanp/setup-racket@v1.3.1
         with:
-          version: ${{ matrix.racket-version }}
+          version: '8.0'
       - uses: actions/checkout@master
       - name: "Install dependencies"
         run: make install

src/conversions.rkt

@@ -5,7 +5,7 @@
          (submod "syntax/rules.rkt" internals) (submod "syntax/syntax.rkt" internals))
 (provide generate-conversions generate-prec-rewrites get-rewrite-operator *conversions*)
 
-(define *conversions* (make-parameter (make-hash)))
+(define *conversions* (make-parameter (hash)))
 
 (define/contract (string-replace* str changes)
   (-> string? (listof (cons/c string? string?)) string?)
@@ -104,8 +104,8 @@
     (for/fold ([reprs '()]) ([conv convs])
       (define prec1 (first conv))
       (define prec2 (last conv))
-      (hash-update! (*conversions*) prec1 (λ (x) (cons prec2 x)) '())
-      (hash-update! (*conversions*) prec2 (λ (x) (cons prec1 x)) '())
+      (*conversions* (hash-update (*conversions*) prec1 (λ (x) (cons prec2 x)) '()))
+      (*conversions* (hash-update (*conversions*) prec2 (λ (x) (cons prec1 x)) '()))
       (generate-prec-rewrite prec1 prec2)
       (set-union reprs (list (get-representation prec1) (get-representation prec2)))))
   (*needed-reprs* (set-union reprs (*needed-reprs*))))

src/core/localize.rkt

@@ -60,7 +60,7 @@
 (register-reset
  (λ ()
   (*analyze-context* (*pcontext*))
-  (hash-clear! *analyze-cache*)))
+  (set! *analyze-cache* (make-hash))))
 
 (define (localize-error prog repr)
   (define varmap (map cons (program-variables prog)

src/core/taylor.rkt

@@ -93,9 +93,8 @@
 
 (register-reset
  (λ ()
-  (hash-clear! n-sum-to-cache)
-  (hash-clear! logcache)
-  (hash-set! logcache 1 '((1 -1 1)))))
+  (set! n-sum-to-cache (make-hash))
+  (set! logcache (make-hash '((1 . ((1 -1 1))))))))
 
 (define (taylor var expr*)
   "Return a pair (e, n), such that expr ~= e var^n"

src/debug.rkt

@@ -29,7 +29,7 @@
       (= val1 val2)
       (equal? val1 val2)))
 
-(define *cur-debug-levels* (make-hash))
+(define *cur-debug-levels* (make-hasheq))
 ;; To understand this it might be useful to understand the system.
 ;; The current level of any debug flag is fluid, within a range.
 ;; It's "setting" determines the range, or a fixed value,

src/errors.rkt

@@ -81,5 +81,5 @@
 
 (register-reset
  (λ ()
-   (set-clear! warnings-seen)
+   (set! warnings-seen (mutable-set))
    (set! warning-log '())))

src/function-definitions.rkt

@@ -1,6 +1,6 @@
 #lang racket
 
-(require "config.rkt" "syntax/rules.rkt" "core/matcher.rkt" "programs.rkt" "interface.rkt" "syntax/sugar.rkt")
+(require "config.rkt" "syntax/rules.rkt" "core/matcher.rkt""programs.rkt" "interface.rkt" "syntax/sugar.rkt")
 (provide get-expander get-evaluator)
 
 (define (evaluation-rule? rule)
@@ -22,6 +22,11 @@
 (define expanders (make-hash))
 (define evaluators (make-hash))
 
+(register-reset
+ (λ ()
+  (set! expanders (make-hash))
+  (set! evaluators (make-hash))))
+
 (define (make-expander primitives)
   (define known-functions (make-hash))
   (for ([op primitives])

src/interface.rkt

@@ -25,7 +25,7 @@
   [(define (write-proc repr port mode)
      (fprintf port "#<representation ~a>" (representation-name repr)))])
 
-(define representations (make-hash))
+(define representations (hash))
 
 ;; Repr / operator generation
 ;; Some plugins might define 'templated' reprs (e.g. fixed point with
@@ -55,8 +55,9 @@
       (raise-herbie-error "Could not find support for ~a representation" name)))
 
 (define (register-representation! name type repr? . args)
-  (hash-set! representations name
-            (apply representation name (get-type type) repr? args)))
+  (set! representations
+    (hash-set representations name
+              (apply representation name (get-type type) repr? args))))
 
 (define-syntax-rule (define-representation (name type repr?) args ...)
   (register-representation! 'name 'type repr? args ...))

src/sandbox.rkt

@@ -25,6 +25,12 @@
 (define *reeval-pts* (make-parameter 8000))
 (define *timeout* (make-parameter (* 1000 60 5/2)))
 
+;; true if Racket CS <= 8.2
+(define cs-places-workaround?
+  (let ([major (string->number (substring (version) 0 1))]
+        [minor (string->number (substring (version) 2 3))])
+    (or (< major 8) (and (= major 8) (<= minor 2)))))
+
 (define (get-p&es context)
   (for/lists (pts exs)
       ([(pt ex) (in-pcontext context)])
@@ -123,6 +129,11 @@
            #:render (λ (p order) (write-json (profile->json p)))))
         (compute-result test)))
 
+  ; CS versions <= 8.2: problems with scheduler
+  ; cause places to stay in a suspended state
+  (when cs-places-workaround?
+    (thread (lambda () (sync (system-idle-evt)))))
+  
   (define eng (engine in-engine))
   (if (engine-run (*timeout*) eng)
       (engine-result eng)

src/syntax/sugar.rkt

@@ -6,7 +6,7 @@
 (module+ test (require rackunit))
 
 ;; name -> (vars repr body)
-(define *functions* (make-parameter (make-hash)))
+(define *functions* (make-parameter (make-hasheq)))
 
 (define (register-function! name args repr body)
   (hash-set! (*functions*) name (list args repr body)))