aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2016-06-03 03:20:32 +0800
committerFelix Lange <fjl@twurst.com>2016-06-03 04:49:33 +0800
commitfdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e (patch)
tree97901a1e0c361c782239b145f20514941ac5ffa1
parent16a23ff74056aa306eb8a87272277bc8660f3252 (diff)
downloaddexon-fdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e.tar
dexon-fdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e.tar.gz
dexon-fdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e.tar.bz2
dexon-fdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e.tar.lz
dexon-fdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e.tar.xz
dexon-fdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e.tar.zst
dexon-fdba0cb03cf4e5a87cdcc2ebc0f381ad32f5ad3e.zip
internal/jsre: ensure Stop can be called more than once
This makes "geth js file.js" terminate again.
-rw-r--r--internal/jsre/jsre.go16
1 files changed, 9 insertions, 7 deletions
diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go
index a95efd379..481389304 100644
--- a/internal/jsre/jsre.go
+++ b/internal/jsre/jsre.go
@@ -24,7 +24,6 @@ import (
"io"
"io/ioutil"
"math/rand"
- "sync"
"time"
"github.com/ethereum/go-ethereum/common"
@@ -44,7 +43,7 @@ type JSRE struct {
output io.Writer
evalQueue chan *evalReq
stopEventLoop chan bool
- loopWg sync.WaitGroup
+ closed chan struct{}
}
// jsTimer is a single timer instance with a callback function
@@ -66,10 +65,10 @@ func New(assetPath string, output io.Writer) *JSRE {
re := &JSRE{
assetPath: assetPath,
output: output,
+ closed: make(chan struct{}),
evalQueue: make(chan *evalReq),
stopEventLoop: make(chan bool),
}
- re.loopWg.Add(1)
go re.runEventLoop()
re.Set("loadScript", re.loadScript)
re.Set("inspect", prettyPrintJS)
@@ -98,6 +97,8 @@ func randomSource() *rand.Rand {
// functions should be used if and only if running a routine that was already
// called from JS through an RPC call.
func (self *JSRE) runEventLoop() {
+ defer close(self.closed)
+
vm := otto.New()
r := randomSource()
vm.SetRandomSource(r.Float64)
@@ -213,8 +214,6 @@ loop:
timer.timer.Stop()
delete(registry, timer)
}
-
- self.loopWg.Done()
}
// Do executes the given function on the JS event loop.
@@ -227,8 +226,11 @@ func (self *JSRE) Do(fn func(*otto.Otto)) {
// stops the event loop before exit, optionally waits for all timers to expire
func (self *JSRE) Stop(waitForCallbacks bool) {
- self.stopEventLoop <- waitForCallbacks
- self.loopWg.Wait()
+ select {
+ case <-self.closed:
+ case self.stopEventLoop <- waitForCallbacks:
+ <-self.closed
+ }
}
// Exec(file) loads and runs the contents of a file