tasks improvements

daemon/tasks/base.go

@@ -11,7 +11,6 @@ type TaskBase struct {
 	Cancel  context.CancelFunc
 	Results chan interface{}
 	Errors  chan error
-	StopChan chan struct{}
 
 	// Stop the task if the daemon is disconnected from the GUI (server).
 	// Some tasks don't need to run if the daemon is not connected to the GUI,

daemon/tasks/nodemonitor/main.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"sync"
 	"syscall"
 	"time"
 	"unsafe"
@@ -24,6 +25,7 @@ type Config struct {
 // NodeMonitor monitors the resources of a node (ram, swap, load avg, etc).
 type NodeMonitor struct {
 	tasks.TaskBase
+	mu     *sync.RWMutex
 	Ticker *time.Ticker
 
 	Interval string
@@ -36,8 +38,8 @@ func New(node, interval string, stopOnDisconnect bool) (string, *NodeMonitor) {
 		TaskBase: tasks.TaskBase{
 			Results: make(chan interface{}),
 			Errors:  make(chan error),
-			StopChan: make(chan struct{}),
 		},
+		mu:       &sync.RWMutex{},
 		Node:     node,
 		Interval: interval,
 	}
@@ -45,6 +47,9 @@ func New(node, interval string, stopOnDisconnect bool) (string, *NodeMonitor) {
 
 // Start ...
 func (pm *NodeMonitor) Start(ctx context.Context, cancel context.CancelFunc) error {
+	pm.mu.Lock()
+	defer pm.mu.Unlock()
+
 	pm.Ctx = ctx
 	pm.Cancel = cancel
 
@@ -60,8 +65,6 @@ func (pm *NodeMonitor) Start(ctx context.Context, cancel context.CancelFunc) err
 		var info syscall.Sysinfo_t
 		for {
 			select {
-			case <-pm.StopChan:
-				goto Exit
 			case <-ctx.Done():
 				goto Exit
 			case <-pm.Ticker.C:
@@ -102,9 +105,13 @@ func (pm *NodeMonitor) Resume() error {
 
 // Stop ...
 func (pm *NodeMonitor) Stop() error {
+	pm.mu.RLock()
+	defer pm.mu.RUnlock()
+
 	if pm.StopOnDisconnect {
 		return nil
 	}
+	pm.Ticker.Stop()
 	pm.Cancel()
 	close(pm.TaskBase.Results)
 	close(pm.TaskBase.Errors)

daemon/tasks/pidmonitor/main.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"sync"
 	"time"
 	"unsafe"
 
@@ -25,9 +26,11 @@ type Config struct {
 // PIDMonitor monitors a process ID.
 type PIDMonitor struct {
 	tasks.TaskBase
+	mu        *sync.RWMutex
 	Ticker    *time.Ticker
 	Interval  string
 	Pid       int
+	isStopped bool
 }
 
 // New returns a new PIDMonitor
@@ -36,8 +39,8 @@ func New(pid int, interval string, stopOnDisconnect bool) (string, *PIDMonitor)
 		TaskBase: tasks.TaskBase{
 			Results: make(chan interface{}),
 			Errors:  make(chan error),
-			StopChan: make(chan struct{}),
 		},
+		mu:       &sync.RWMutex{},
 		Pid:      pid,
 		Interval: interval,
 	}
@@ -45,6 +48,9 @@ func New(pid int, interval string, stopOnDisconnect bool) (string, *PIDMonitor)
 
 // Start ...
 func (pm *PIDMonitor) Start(ctx context.Context, cancel context.CancelFunc) error {
+	pm.mu.RLock()
+	defer pm.mu.RUnlock()
+
 	pm.Ctx = ctx
 	pm.Cancel = cancel
 	p := &procmon.Process{}
@@ -71,8 +77,6 @@ func (pm *PIDMonitor) Start(ctx context.Context, cancel context.CancelFunc) erro
 	go func(ctx context.Context) {
 		for {
 			select {
-			case <-pm.StopChan:
-				goto Exit
 			case <-ctx.Done():
 				goto Exit
 			case <-pm.Ticker.C:
@@ -86,6 +90,9 @@ func (pm *PIDMonitor) Start(ctx context.Context, cancel context.CancelFunc) erro
 					pm.TaskBase.Errors <- err
 					continue
 				}
+				if pm.isStopped {
+					goto Exit
+				}
 				// ~200µs (string()) vs ~60ns
 				pm.TaskBase.Results <- unsafe.String(unsafe.SliceData(pJSON), len(pJSON))
 			}
@@ -111,12 +118,17 @@ func (pm *PIDMonitor) Resume() error {
 
 // Stop ...
 func (pm *PIDMonitor) Stop() error {
+	pm.mu.Lock()
+	defer pm.mu.Unlock()
+
 	if pm.StopOnDisconnect {
 		log.Debug("[task.PIDMonitor] ignoring Stop()")
 		return nil
 	}
+	pm.isStopped = true
+
 	log.Debug("[task.PIDMonitor] Stop()")
-	pm.StopChan <- struct{}{}
+	pm.Ticker.Stop()
 	pm.Cancel()
 	close(pm.TaskBase.Results)
 	close(pm.TaskBase.Errors)

daemon/tasks/socketsmonitor/main.go

@@ -73,7 +73,6 @@ func New(config interface{}, stopOnDisconnect bool) (*SocketsMonitor, error) {
 		TaskBase: tasks.TaskBase{
 			Results: make(chan interface{}),
 			Errors:  make(chan error),
-			StopChan: make(chan struct{}),
 		},
 		mu:               &sync.RWMutex{},
 		StopOnDisconnect: stopOnDisconnect,
@@ -98,8 +97,6 @@ func (pm *SocketsMonitor) Start(ctx context.Context, cancel context.CancelFunc)
 	go func(ctx context.Context) {
 		for {
 			select {
-			case <-pm.TaskBase.StopChan:
-				goto Exit
 			case <-ctx.Done():
 				goto Exit
 			case <-pm.Ticker.C: