2. Dropped channel in sensorFileReadHandle

internal/fusefs/converters.go

@@ -1,61 +0,0 @@
-package fusefs
-
-import (
-	"go.arsenm.dev/infinitime"
-	"context"
-	"strconv"
-)
-
-func converterU8(ctx context.Context, in <-chan uint8) <-chan []byte {
-	out := make(chan []byte, 2)
-	go func() {
-		for {
-			select {
-			case <- ctx.Done():
-				return
-			case event := <-in:
-				out <- []byte(strconv.Itoa(int(event)) + "\n")
-			}
-		}
-	}()
-	return out
-}
-
-func converterU32(ctx context.Context, in <-chan uint32) <-chan []byte {
-	out := make(chan []byte, 2)
-	go func() {
-		for {
-			select {
-			case <- ctx.Done():
-				return
-			case event := <-in:
-				out <- []byte(strconv.Itoa(int(event)) + "\n")
-			}
-		}
-	}()
-	return out
-}
-
-func converterMotionValues(ctx context.Context, in <-chan infinitime.MotionValues) <-chan []byte {
-	out := make(chan []byte, 2)
-	go func() {
-		for {
-			select {
-			case <- ctx.Done():
-				return
-			case event := <-in:
-				out <- []byte(strconv.Itoa(int(event.X)) + " " + strconv.Itoa(int(event.Y)) + " " + strconv.Itoa(int(event.Z)) + "\n")
-			}
-		}
-	}()
-	return out
-}
-
-func converter1String(ctx context.Context, in string) <-chan []byte {
-	out := make(chan []byte, 2)
-	out <- []byte(in + "\n")
-	close(out)
-	return out
-}
-
-

internal/fusefs/fuse.go

@@ -10,13 +10,13 @@ import (
 	"github.com/hanwen/go-fuse/v2/fuse"
 	"io"
 	"bytes"
+	"strconv"
 )
 
 type ITProperty struct {
 	name string
 	Ino uint64
-	oneshot bool
+	gen func() ([]byte, error)
-	gen func(context.Context) (<-chan []byte, error)
 }
 
 
@@ -55,40 +55,35 @@ func BuildRootNode(dev *infinitime.Device) (*ITNode, error) {
 var properties = make([]ITProperty, 6)
 
 func BuildProperties(dev *infinitime.Device) {
-	properties[0] = ITProperty{"heartrate", 2, true,
+	properties[0] = ITProperty{"heartrate", 2,
-		func(ctx context.Context) (<-chan []byte, error) {
+		func() ([]byte, error) {
-			ans, err := dev.WatchHeartRate(ctx)
+			ans, err := dev.HeartRate()
-			return converterU8(ctx, ans), err
+			return []byte(strconv.Itoa(int(ans)) + "\n"), err
 	}}
-	properties[1] = ITProperty{"battery", 3, true,
+	properties[1] = ITProperty{"battery", 3,
-		func(ctx context.Context) (<-chan []byte, error) {
+		func() ([]byte, error) {
-			ans, err := dev.WatchBatteryLevel(ctx)
+			ans, err := dev.BatteryLevel()
-			return converterU8(ctx, ans), err
+			return []byte(strconv.Itoa(int(ans)) + "\n"), err
 	}}
-	properties[2] = ITProperty{"motion", 4, true,
+	properties[2] = ITProperty{"motion", 4,
-		func(ctx context.Context) (<-chan []byte, error) {
+		func() ([]byte, error) {
-			ans, err := dev.WatchMotion(ctx)
+			ans, err := dev.Motion()
-			return converterMotionValues(ctx, ans), err
+			return []byte(strconv.Itoa(int(ans.X)) + " " + strconv.Itoa(int(ans.Y)) + " " + strconv.Itoa(int(ans.Z)) + "\n"), err
 	}}
-	properties[3] = ITProperty{"motion", 5, true,
+	properties[3] = ITProperty{"stepcount", 6,
-		func(ctx context.Context) (<-chan []byte, error) {
+		func() ([]byte, error) {
-			ans, err := dev.WatchMotion(ctx)
+			ans, err := dev.StepCount()
-			return converterMotionValues(ctx, ans), err
+			return []byte(strconv.Itoa(int(ans)) + "\n"), err
 	}}
-	properties[4] = ITProperty{"stepcount", 6, true,
+	properties[4] = ITProperty{"version", 7,
-		func(ctx context.Context) (<-chan []byte, error) {
+		func() ([]byte, error) {
-			ans, err := dev.WatchStepCount(ctx)
-			return converterU32(ctx, ans), err
-	}}
-	properties[5] = ITProperty{"version", 7, true,
-		func(ctx context.Context) (<-chan []byte, error) {
 			ans, err := dev.Version()
-			return converter1String(ctx, ans), err
+			return []byte(ans + "\n"), err
 	}}
-	properties[6] = ITProperty{"address", 8, true,
+	properties[5] = ITProperty{"address", 8,
-		func(ctx context.Context) (<-chan []byte, error) {
+		func() ([]byte, error) {
 			ans := dev.Address()
-			return converter1String(ctx, ans), nil
+			return []byte(ans + "\n"), nil
 	}}
 
 }
@@ -270,18 +265,20 @@ func (fh *bytesFileReadHandle) Read(ctx context.Context, dest []byte, off int64)
 }
 
 type sensorFileReadHandle struct {
-	ch <-chan []byte
+	content []byte
-	cancel context.CancelFunc
 }
 var _ fs.FileReader = (*sensorFileReadHandle)(nil)
 func (fh *sensorFileReadHandle) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
-	content := <-fh.ch
+	log.Info("Executing Read").Int("size", len(fh.content)).Send()
-	return fuse.ReadResultData(content), 0
+	end := off + int64(len(dest))
+	if end > int64(len(fh.content)) {
+		end = int64(len(fh.content))
+	}
+	return fuse.ReadResultData(fh.content[off:end]), 0
 }
 
 var _ fs.FileFlusher = (*sensorFileReadHandle)(nil)
 func (fh *sensorFileReadHandle) Flush(ctx context.Context) (errno syscall.Errno) {
-	fh.cancel()
 	return 0
 }
 
@@ -433,15 +430,13 @@ func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle,
 
 		for _, value := range properties {
 			if value.Ino == f.Ino {
-				sub_ctx, cancel := context.WithCancel(ctx)
+				ans, err := value.gen()
-				ans, err := value.gen(sub_ctx)
 				if err != nil {
 					return nil, 0, syscallErr(err)
 				}
 
 				fh = &sensorFileReadHandle{
-					ch: ans,
+					content : ans,
-					cancel : cancel,
 				}
 				return fh, fuse.FOPEN_DIRECT_IO, 0
 			}

internal/fusefs/unmount.go

@@ -0,0 +1,15 @@
+package fusefs
+
+import (
+	_ "unsafe"
+	"github.com/hanwen/go-fuse/v2/fuse"
+)
+
+func Unmount(mountPoint string) error {
+	return unmount(mountPoint, &fuse.MountOptions{DirectMount: false})
+}
+
+// Unfortunately, the FUSE library does not export its unmount function,
+// so this is required until that changes
+//go:linkname unmount github.com/hanwen/go-fuse/v2/fuse.unmount
+func unmount(mountPoint string, opts *fuse.MountOptions) error