Clean up bspc/

1 files changed, 55 insertions, 36 deletions

diff --git a/bspc/bspc.go b/bspc/bspc.go
index a089595..f840210 100644
--- a/bspc/bspc.go
+++ b/bspc/bspc.go
@@ -4,6 +4,7 @@ import (
 	"io"
 	"fmt"
 	"time"
+	"sync"
 	"bufio"
 	"errors"
 	"strings"
@@ -84,6 +85,31 @@ var reloadEvents = []string{
 	"node_swap",
 	"node_transfer" }
 
+var cmdlist []*exec.Cmd
+var cmdlock sync.Mutex
+
+func cmdRegister(c *exec.Cmd) int {
+	cmdlock.Lock()
+	defer cmdlock.Unlock()
+
+	for i, v := range cmdlist {
+		if v == nil {
+			cmdlist[i] = c
+			return i
+		}
+	}
+
+	cmdlist = append(cmdlist, c)
+	i := len(cmdlist) - 1
+	return i
+}
+
+func cmdDelete(i int) {
+	cmdlock.Lock()
+	defer cmdlock.Unlock()
+	cmdlist[i] = nil
+}
+
 func getState() (*State, error) {
 	cmd := exec.Command("bspc", "wm", "-d")
 
@@ -122,27 +148,20 @@ func getState() (*State, error) {
 	return &state, nil
 }
 
-type subscriber struct {
-	State       *State
-	StateUpdate chan bool
-	StErr       chan error
-	Event       chan *Event
-	EvErr       chan error
-	cmd         *exec.Cmd
-	pipe        io.ReadCloser
-	scanner     *bufio.Scanner
-}
-
-type Event struct {
+type event struct {
 	Name	string
 	Tokens	[]string
 }
 
-var InitErr error
-var Handle  subscriber
+var InitErr         error
+var NewState = make(chan *State, 1) // Buffered to prevent blocking on first send
+var StErr    = make(chan error)
+var Event    = make(chan *event)
+var EvErr    = make(chan error)
 
 func init() {
 	cmd := exec.Command("bspc", "subscribe", "all")
+	cmdRegister(cmd)
 
 	pipe, err := cmd.StdoutPipe()
 	if err != nil {
@@ -161,35 +180,29 @@ func init() {
 		return
 	}
 
-	Handle.State       = istate
-	Handle.StateUpdate = make(chan bool)
-	Handle.StErr       = make(chan error)
-	Handle.Event       = make(chan *Event)
-	Handle.EvErr       = make(chan error)
-	Handle.cmd         = cmd
-	Handle.pipe        = pipe
-	Handle.scanner     = bufio.NewScanner(Handle.pipe)
+	NewState <- istate
+
+	scanner := bufio.NewScanner(pipe)
 
 	go func() { for {
-		event, err := get()
+		event, err := get(scanner)
 
 		if event != nil {
 			for i := 0; i < len(reloadEvents); i++ {
 				if event.Name == reloadEvents[i] {
 					state, serr := getState()
 					if serr != nil {
-						Handle.StErr <- serr
+						StErr <- serr
 						return
 					}
-					Handle.State = state
-					Handle.StateUpdate <- true
+					NewState <- state
 				}
 			}
-			Handle.Event <- event
+			Event <- event
 		}
 
 		if err != nil {
-			Handle.EvErr <- err
+			EvErr <- err
 			return
 		}
 	}}()
@@ -198,6 +211,7 @@ func init() {
 func Cmd(args ...string) {
 	cmd := exec.Command("bspc", args...)
 
+	cmdi    := cmdRegister(cmd)
 	pipe, _ := cmd.StderrPipe()
 	scan    := bufio.NewScanner(pipe)
 	startt  := time.Now()
@@ -214,29 +228,34 @@ func Cmd(args ...string) {
 	}
 
 	cmd.Wait()
+	cmdDelete(cmdi)
 }
 
 func Cleanup() {
-	Handle.cmd.Process.Kill()
+	for _, c := range cmdlist {
+		if c != nil {
+			c.Process.Kill()
+		}
+	}
 }
 
-func getLine() (string, error) {
-	if Handle.scanner.Scan() {
-		return Handle.scanner.Text(), nil
+func getLine(s *bufio.Scanner) (string, error) {
+	if s.Scan() {
+		return s.Text(), nil
 	}
 
-	if err := Handle.scanner.Err(); err != nil {
+	if err := s.Err(); err != nil {
 		return "", common.Perror("scanner.Err", err)
 	}
 
 	return "", nil
 }
 
-func get() (*Event, error) {
+func get(s *bufio.Scanner) (*event, error) {
 	var line string
 	var err  error
 	for {
-		line, err = getLine()
+		line, err = getLine(s)
 		if len(line) > 0 && line[0] != 'W' { break }
 	}
 
@@ -245,5 +264,5 @@ func get() (*Event, error) {
 
 	name, tokens, _ := strings.Cut(line, " ")
 
-	return &Event{name, strings.Split(tokens, " ")}, nil
+	return &event{name, strings.Split(tokens, " ")}, nil
 }