Merge 5b587d5 into 8175afd

models/graph.go

@@ -48,17 +48,20 @@ func (nodes *Nodes) BuildGraph() *Graph {
 		vpn:     make(map[string]interface{}),
 	}
 
-	builder.readNodes(nodes.List)
+	builder.readNodes(nodes)
 
 	graph := &Graph{Version: 1}
 	graph.Batadv.Directed = false
 	graph.Batadv.Nodes, graph.Batadv.Links = builder.extract()
 	return graph
 }
 
-func (builder *graphBuilder) readNodes(nodes map[string]*Node) {
+func (builder *graphBuilder) readNodes(nodes *Nodes) {
+	nodes.RLock()
+	defer nodes.RUnlock()
+
 	// Fill mac->id map
-	for sourceID, node := range nodes {
+	for sourceID, node := range nodes.List {
 		if nodeinfo := node.Nodeinfo; nodeinfo != nil {
 			// is VPN address?
 			if nodeinfo.VPN {
@@ -89,7 +92,7 @@ func (builder *graphBuilder) readNodes(nodes map[string]*Node) {
 	}
 
 	// Add links
-	for sourceID, node := range nodes {
+	for sourceID, node := range nodes.List {
 		if node.Flags.Online {
 			if neighbours := node.Neighbours; neighbours != nil {
 				// Batman neighbours

models/nodes.go

@@ -4,9 +4,10 @@ import (
 	"encoding/json"
 	"log"
 	"os"
-	"sync"
 	"time"
 
+	"github.com/sasha-s/go-deadlock"
+
 	"github.com/FreifunkBremen/yanic/data"
 	"github.com/FreifunkBremen/yanic/jsontime"
 	"github.com/FreifunkBremen/yanic/meshviewer"
@@ -16,7 +17,7 @@ import (
 type Nodes struct {
 	List   map[string]*Node `json:"nodes"` // the current nodemap, indexed by node ID
 	config *Config
-	sync.RWMutex
+	deadlock.RWMutex
 }
 
 // NewNodes create Nodes structs

models/stats.go

@@ -23,7 +23,7 @@ func NewGlobalStats(nodes *Nodes) (result *GlobalStats) {
 		Models:    make(CounterMap),
 	}
 
-	nodes.Lock()
+	nodes.RLock()
 	for _, node := range nodes.List {
 		if node.Flags.Online {
 			result.Nodes++
@@ -42,7 +42,7 @@ func NewGlobalStats(nodes *Nodes) (result *GlobalStats) {
 			}
 		}
 	}
-	nodes.Unlock()
+	nodes.RUnlock()
 	return
 }