mount, mountlib: move function tracing into mount

cmd/mount/read.go

@@ -6,6 +6,7 @@ import (
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
 	"github.com/ncw/rclone/cmd/mountlib"
+	"github.com/ncw/rclone/fs"
 	"golang.org/x/net/context"
 )
 
@@ -28,11 +29,14 @@ var _ fusefs.HandleReader = (*ReadFileHandle)(nil)
 
 // Read from the file handle
 func (fh *ReadFileHandle) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) (err error) {
+	dataRead := -1
+	defer fs.Trace(fh, "len=%d, offset=%d", req.Size, req.Offset)("read=%d, err=%v", &dataRead, &err)
 	data, err := fh.ReadFileHandle.Read(int64(req.Size), req.Offset)
 	if err != nil {
 		return translateError(err)
 	}
 	resp.Data = data
+	dataRead = len(data)
 	return nil
 }
 
@@ -42,7 +46,8 @@ var _ fusefs.HandleFlusher = (*ReadFileHandle)(nil)
 // Flush is called each time the file or directory is closed.
 // Because there can be multiple file descriptors referring to a
 // single opened file, Flush can be called multiple times.
-func (fh *ReadFileHandle) Flush(ctx context.Context, req *fuse.FlushRequest) error {
+func (fh *ReadFileHandle) Flush(ctx context.Context, req *fuse.FlushRequest) (err error) {
+	defer fs.Trace(fh, "")("err=%v", &err)
 	return translateError(fh.ReadFileHandle.Flush())
 }
 
@@ -52,6 +57,7 @@ var _ fusefs.HandleReleaser = (*ReadFileHandle)(nil)
 //
 // It isn't called directly from userspace so the error is ignored by
 // the kernel
-func (fh *ReadFileHandle) Release(ctx context.Context, req *fuse.ReleaseRequest) error {
+func (fh *ReadFileHandle) Release(ctx context.Context, req *fuse.ReleaseRequest) (err error) {
+	defer fs.Trace(fh, "")("err=%v", &err)
 	return translateError(fh.ReadFileHandle.Release())
 }