Skip to content

Commit

Permalink
Move pubMsg to dispatch
Browse files Browse the repository at this point in the history
  • Loading branch information
ry committed May 23, 2018
1 parent cb222ce commit 8d1497a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
12 changes: 9 additions & 3 deletions dispatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import (
"sync"
)

var resChan = make(chan *BaseMsg, 10)
var doneChan = make(chan bool)
var wg sync.WaitGroup

// There is a single global worker for this process.
// This file should be the only part of deno that directly access it, so that
// all interaction with V8 can go through a single point.
Expand Down Expand Up @@ -53,9 +57,11 @@ func Pub(channel string, payload []byte) {
}
}

var resChan = make(chan *BaseMsg, 10)
var doneChan = make(chan bool)
var wg sync.WaitGroup
func PubMsg(channel string, msg *Msg) {
payload, err := proto.Marshal(msg)
check(err)
Pub(channel, payload)
}

func DispatchLoop() {
wg.Add(1)
Expand Down
5 changes: 1 addition & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package main
import (
"flag"
"fmt"
"github.com/golang/protobuf/proto"
"github.com/ry/v8worker2"
"io/ioutil"
"log"
Expand Down Expand Up @@ -66,7 +65,7 @@ func main() {
cwd, err := os.Getwd()
check(err)

out, err := proto.Marshal(&Msg{
PubMsg("start", &Msg{
Payload: &Msg_Start{
Start: &StartMsg{
Cwd: &cwd,
Expand All @@ -77,8 +76,6 @@ func main() {
},
},
})
check(err)
Pub("start", out)

DispatchLoop()
}
8 changes: 1 addition & 7 deletions timers.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (t *Timer) StartTimer() {
if !t.Interval {
t.Done = true
}
pubMsg(&Msg{
PubMsg("timers", &Msg{
Payload: &Msg_TimerReady{
TimerReady: &TimerReadyMsg{
Id: &t.Id,
Expand All @@ -75,9 +75,3 @@ func (t *Timer) StartTimer() {
}
}()
}

func pubMsg(msg *Msg) {
payload, err := proto.Marshal(msg)
check(err)
Pub("timers", payload)
}

0 comments on commit 8d1497a

Please sign in to comment.