add non-locking support for plan9

lock_all.go

@@ -0,0 +1,28 @@
+//go:build !plan9
+// +build !plan9
+
+package tkvs
+
+import (
+	"os"
+	"sync"
+
+	"github.com/danjacques/gofslock/fslock"
+)
+
+type TKVS struct {
+	file   *os.File
+	misErr error
+	lock   *fslock.Handle
+	kvs    KeyVal
+	sync.Mutex
+}
+
+func (t *TKVS) fsLock(path string) error {
+	l, err := fslock.Lock(path)
+	if err != nil {
+		return err
+	}
+	t.lock = &l
+	return nil
+}

lock_p9.go

@@ -0,0 +1,18 @@
+//go:build plan9
+// +build plan9
+
+package tkvs
+
+import (
+	"os"
+	"sync"
+)
+
+type TKVS struct {
+	file   *os.File
+	misErr error
+	kvs    KeyVal
+	sync.Mutex
+}
+
+func (t *TKVS) fsLock(_ string) error { return nil }

tkvs.go

@@ -7,19 +7,8 @@ import (
 	"io"
 	"log"
 	"os"
-	"sync"
-
-	"github.com/danjacques/gofslock/fslock"
 )
 
-type TKVS struct {
-	file   *os.File
-	misErr error
-	lock   *fslock.Handle
-	kvs    KeyVal
-	sync.Mutex
-}
-
 type KeyVal map[string][]byte
 
 type Container struct {
@@ -87,15 +76,16 @@ func (j *TKVS) Keys() []string {
 }
 
 func New(path string, misErr error) *TKVS {
-	l, err := fslock.Lock(path)
+	k := &TKVS{misErr: misErr}
+	err := k.fsLock(path)
 	if err != nil {
 		log.Fatalf("unable to lock %q: %v", path, err)
 	}
 	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0600)
 	if err != nil {
 		log.Fatalf("unable to open %q: %v", path, err)
 	}
-	k := &TKVS{file: f, misErr: misErr, lock: &l}
+	k.file = f
 	err = k.readJson()
 	if err != nil {
 		log.Fatalf("unable to read %q: %v", path, err)