ffhb/yanic
ffhb
/
yanic
mirror of https://github.com/FreifunkBremen/yanic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

correction + go deadlock

This commit is contained in:
Martin Geno 2017-03-12 18:38:54 +01:00
parent 34a920e01f
commit 4628a8d5ab
No known key found for this signature in database
GPG Key ID: F0D39A37E925E941
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meshviewer/graph.go
View File

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

5
runtime/nodes.go
View File

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