Fix race in gkvlite introduced when removing `unsafe`

node.go

 package gkvlite
 
 import (
         "encoding/binary"
         "fmt"
         "sync"
         "sync/atomic"
 )
 
 // A persistable node.
 type node struct {
         numNodes, numBytes uint64
         item               itemLoc
         left, right        nodeLoc
         next               *node // For free-list tracking.
 }
 
+var nodeLocGL = sync.RWMutex{}
+
 // A persistable node and its persistence location.
 type nodeLoc struct {
-        m sync.Mutex
-
         loc  *ploc    // *ploc - can be nil if node is dirty (not yet persisted).
         node *node    // *node - can be nil if node is not fetched into memory yet.
         next *nodeLoc // For free-list tracking.
 }
 
 var empty_nodeLoc = &nodeLoc{} // Sentinel.
 
 func (nloc *nodeLoc) Loc() *ploc {
-        nloc.m.Lock()
-        defer nloc.m.Unlock()
+        nodeLocGL.RLock()
+        defer nodeLocGL.RUnlock()
         return nloc.loc
 }
 
 func (nloc *nodeLoc) setLoc(n *ploc) {
-        nloc.m.Lock()
-        defer nloc.m.Unlock()
+        nodeLocGL.Lock()
+        defer nodeLocGL.Unlock()
         nloc.loc = n
 }
 
 func (nloc *nodeLoc) Node() *node {
-        nloc.m.Lock()
-        defer nloc.m.Unlock()
+        nodeLocGL.RLock()
+        defer nodeLocGL.RUnlock()
         return nloc.node
 }
 
 func (nloc *nodeLoc) setNode(n *node) {
-        nloc.m.Lock()
-        defer nloc.m.Unlock()
+        nodeLocGL.Lock()
+        defer nodeLocGL.Unlock()
         nloc.node = n
 }
 
+func (nloc *nodeLoc) LocNode() (*ploc, *node) {
+        nodeLocGL.RLock()
+        defer nodeLocGL.RUnlock()
+        return nloc.loc, nloc.node
+}
+
 func (nloc *nodeLoc) Copy(src *nodeLoc) *nodeLoc {
         if src == nil {
                 return nloc.Copy(empty_nodeLoc)
         }
-        newloc := src.Loc()
-        newnode := src.Node()
+        newloc, newnode := src.LocNode()
 
-        nloc.m.Lock()
-        defer nloc.m.Unlock()
+        nodeLocGL.Lock()
+        nodeLocGL.Unlock()

[Vadim Sh., 2015/11/10 19:14:05]

wat? did you forget "defer"?

Also you can access src.loc and src.node directly while holding the lock
(instead of taking and releasing it in LocNode).

         nloc.loc = newloc
         nloc.node = newnode
         return nloc
 }
 
 func (nloc *nodeLoc) isEmpty() bool {
-        return nloc == nil || (nloc.Loc().isEmpty() && nloc.Node() == nil)
+        nodeLocGL.RLock()
+        defer nodeLocGL.RUnlock()
+        return nloc == nil || (nloc.loc.isEmpty() && nloc.node == nil)
 }
 
 func (nloc *nodeLoc) write(o *Store) error {
-        if nloc != nil && nloc.Loc().isEmpty() {
-                node := nloc.Node()
+        loc, node := nloc.LocNode()
+
+        if nloc != nil && loc.isEmpty() {
                 if node == nil {
                         return nil
                 }
                 offset := atomic.LoadInt64(&o.size)
                 length := ploc_length + ploc_length + ploc_length + 8 + 8
                 b := make([]byte, length)
                 pos := 0
                 pos = node.item.Loc().write(b, pos)
                 pos = node.left.Loc().write(b, pos)
                 pos = node.right.Loc().write(b, pos)
@@ skipping 11 matching lines @@
                 atomic.StoreInt64(&o.size, offset+int64(length))
                 nloc.setLoc(&ploc{Offset: offset, Length: uint32(length)})
         }
         return nil
 }
 
 func (nloc *nodeLoc) read(o *Store) (n *node, err error) {
         if nloc == nil {
                 return nil, nil
         }
-        n = nloc.Node()
+        loc, n := nloc.LocNode()
         if n != nil {
                 return n, nil
         }
-        loc := nloc.Loc()
         if loc.isEmpty() {
                 return nil, nil
         }
         if loc.Length != uint32(ploc_length+ploc_length+ploc_length+8+8) {
                 return nil, fmt.Errorf("unexpected node loc.Length: %v != %v",
                         loc.Length, ploc_length+ploc_length+ploc_length+8+8)
         }
         b := make([]byte, loc.Length)
         if _, err := o.file.ReadAt(b, loc.Offset); err != nil {
                 return nil, err
@@ skipping 57 matching lines @@
         }
         fmt.Printf("%p - %v\n", nNode, k)
         dump(o, &nNode.right, level+1)
 }
 
 func dumpIndent(level int) {
         for i := 0; i < level; i++ {
                 fmt.Print(" ")
         }
 }