split mutex in List,Current and Read,Write

runtime/nodes.go

@@ -20,7 +20,8 @@ type Nodes struct {
 	iface           string
 	notifyNodeFunc  []func(*Node, bool)
 	notifyStatsFunc []func(*runtimeYanic.GlobalStats)
-	sync.Mutex
+	ListMux         sync.RWMutex
+	CurrentMux      sync.RWMutex
 }
 
 func NewNodes(path string, iface string, mgmt *ssh.Manager) *Nodes {
@@ -67,32 +68,34 @@ func (nodes *Nodes) UpdateNode(node *Node) bool {
 		log.Warnf("wrong wifi5 channel for '%s'", node.NodeID)
 		return false
 	}
-	nodes.Lock()
+	nodes.ListMux.Lock()
-	defer nodes.Unlock()
 	if n, ok := nodes.List[node.NodeID]; ok {
 		node.Address = n.Address
 		go node.SSHUpdate(nodes.ssh, nodes.iface, n)
 		log.Info("update node", node.NodeID)
 	}
 	nodes.List[node.NodeID] = node
+	nodes.ListMux.Unlock()
 	nodes.notifyNode(node, true)
 	return true
 }
 
 func (nodes *Nodes) Updater() {
-	nodes.Lock()
+	nodes.ListMux.RLock()
-	defer nodes.Unlock()
+	nodes.CurrentMux.RLock()
 	for nodeid, node := range nodes.List {
 		if n, ok := nodes.Current[nodeid]; ok {
 			go node.SSHUpdate(nodes.ssh, nodes.iface, n)
 		}
 	}
+	nodes.ListMux.RUnlock()
+	nodes.CurrentMux.RUnlock()
 	log.Info("updater per ssh")
 }
 
 func (nodes *Nodes) Saver() {
-	nodes.Lock()
+	nodes.ListMux.RLock()
 	file.SaveJSON(nodes.statePath, nodes)
-	nodes.Unlock()
+	nodes.ListMux.RUnlock()
 	log.Debug("saved state file")
 }

runtime/yanic.go

@@ -32,8 +32,7 @@ func (conn *YanicDB) InsertNode(n *runtimeYanic.Node) {
 	}
 	node.Lastseen = jsontime.Now()
 	logger := log.WithField("method", "LearnNode").WithField("node_id", node.NodeID)
-	conn.nodes.Lock()
+	conn.nodes.ListMux.Lock()
-	defer conn.nodes.Unlock()
 	if lNode := conn.nodes.List[node.NodeID]; lNode != nil {
 		lNode.Lastseen = jsontime.Now()
 		lNode.Stats = node.Stats
@@ -41,9 +40,12 @@ func (conn *YanicDB) InsertNode(n *runtimeYanic.Node) {
 		conn.nodes.List[node.NodeID] = node
 		conn.nodes.notifyNode(node, true)
 	}
+	conn.nodes.ListMux.Unlock()
+	conn.nodes.CurrentMux.Lock()
 	if _, ok := conn.nodes.Current[node.NodeID]; ok {
 		conn.nodes.Current[node.NodeID] = node
 		conn.nodes.notifyNode(node, false)
+		conn.nodes.CurrentMux.Unlock()
 		return
 	}
 	// session := nodes.ssh.ConnectTo(node.Address)
@@ -56,10 +58,13 @@ func (conn *YanicDB) InsertNode(n *runtimeYanic.Node) {
 	logger.Infof("new node with uptime: %s", uptime)
 
 	conn.nodes.Current[node.NodeID] = node
+	conn.nodes.CurrentMux.Unlock()
+	conn.nodes.ListMux.Lock()
 	if lNode := conn.nodes.List[node.NodeID]; lNode != nil {
 		lNode.Address = node.Address
 		go lNode.SSHUpdate(conn.nodes.ssh, conn.nodes.iface, node)
 	}
+	conn.nodes.ListMux.Unlock()
 	conn.nodes.notifyNode(node, false)
 }
 

websocket/hd_connect.go

@@ -13,13 +13,16 @@ var wifi5Channels []uint32
 
 func (ws *WebsocketServer) connectHandler(logger *log.Entry, msg *wsLib.Message) error {
 	msg.From.Write(&wsLib.Message{Subject: MessageTypeStats, Body: ws.nodes.Statistics})
-
+	ws.nodes.ListMux.RLock()
 	for _, node := range ws.nodes.List {
 		msg.From.Write(&wsLib.Message{Subject: MessageTypeSystemNode, Body: node})
 	}
+	ws.nodes.ListMux.RUnlock()
+	ws.nodes.CurrentMux.RLock()
 	for _, node := range ws.nodes.Current {
 		msg.From.Write(&wsLib.Message{Subject: MessageTypeCurrentNode, Body: node})
 	}
+	ws.nodes.CurrentMux.RUnlock()
 	msg.From.Write(&wsLib.Message{Subject: MessageTypeChannelsWifi24, Body: wifi24Channels})
 	msg.From.Write(&wsLib.Message{Subject: MessageTypeChannelsWifi5, Body: wifi5Channels})
 	logger.Debug("done")