Refactor benchmark/

benchmark/benchmark.go

-package fuse
+package benchmark
 
 // Routines for benchmarking fuse.
 
 import (
+	"bufio"
 	"fmt"
 	"log"
 	"math"
@@ -12,6 +13,33 @@ import (
 	"time"
 )
 
+
+func ReadLines(name string) []string {
+	f, err := os.Open(name)
+	if err != nil {
+		log.Fatal("ReadLines: ", err)
+	}
+	defer f.Close()
+	r := bufio.NewReader(f)
+
+	l := []string{}
+	for {
+		line, _, err := r.ReadLine()
+		if line == nil || err != nil {
+			break
+		}
+
+		fn := string(line)
+		l = append(l, fn)
+	}
+	if len(l) == 0 {
+		log.Fatal("no files added")
+	}
+	log.Printf("Read %d file names", len(l))
+
+	return l
+}
+
 // Used for benchmarking.  Returns milliseconds.
 func BulkStat(parallelism int, files []string) float64 {
 	todo := make(chan string, len(files))

benchmark/stat_test.go

-package fuse
+package benchmark
 
 import (
-	"bufio"
 	"fmt"
 	"github.com/hanwen/go-fuse/fuse"
 	"io/ioutil"
@@ -11,68 +10,18 @@ import (
 	"path/filepath"
 	"runtime"
 	"sort"
-	"strings"
 	"testing"
 	"time"
 )
 
 var CheckSuccess = fuse.CheckSuccess
-var delay = 0 * time.Microsecond
 
-
-type StatFs struct {
-	fuse.DefaultFileSystem
-	entries map[string]*fuse.Attr
-	dirs    map[string][]fuse.DirEntry
-	delay   time.Duration
-}
-
-func (me *StatFs) add(name string, a *fuse.Attr) {
-	name = strings.TrimRight(name, "/")
-	_, ok := me.entries[name]
-	if ok {
-		return
-	}
-
-	me.entries[name] = a
-	if name == "/" || name == "" {
-		return
-	}
-
-	dir, base := filepath.Split(name)
-	dir = strings.TrimRight(dir, "/")
-	me.dirs[dir] = append(me.dirs[dir], fuse.DirEntry{Name: base, Mode: a.Mode})
-	me.add(dir, &fuse.Attr{Mode: fuse.S_IFDIR | 0755})
-}
-
-func (me *StatFs) GetAttr(name string, context *fuse.Context) (*fuse.Attr, fuse.Status) {
-	e := me.entries[name]
-	if e == nil {
-		return nil, fuse.ENOENT
-	}
-
-	if me.delay > 0 {
-		time.Sleep(me.delay)
-	}
-	return e, fuse.OK
-}
-
-func (me *StatFs) OpenDir(name string, context *fuse.Context) (stream []fuse.DirEntry, status fuse.Status) {
-	entries := me.dirs[name]
-	if entries == nil {
-		return nil, fuse.ENOENT
-	}
-	return entries, fuse.OK
-}
-
-func NewStatFs() *StatFs {
-	return &StatFs{
-		entries: make(map[string]*fuse.Attr),
-		dirs:    make(map[string][]fuse.DirEntry),
+func setupFs(fs fuse.FileSystem) (string, func()) {
+	opts := &fuse.FileSystemOptions{
+		EntryTimeout:    0.0,
+		AttrTimeout:     0.0,
+		NegativeTimeout: 0.0,
 	}
-}
-
-func setupFs(fs fuse.FileSystem, opts *fuse.FileSystemOptions) (string, func()) {
 	mountPoint, _ := ioutil.TempDir("", "stat_test")
 	nfs := fuse.NewPathNodeFs(fs, nil)
 	state, _, err := fuse.MountNodeFileSystem(mountPoint, nfs, opts)
@@ -97,10 +46,10 @@ func TestNewStatFs(t *testing.T) {
 	for _, n := range []string{
 		"file.txt", "sub/dir/foo.txt",
 		"sub/dir/bar.txt", "sub/marine.txt"} {
-		fs.add(n, &fuse.Attr{Mode: fuse.S_IFREG | 0644})
+		fs.AddFile(n)
 	}
 
-	wd, clean := setupFs(fs, nil)
+	wd, clean := setupFs(fs)
 	defer clean()
 
 	names, err := ioutil.ReadDir(wd)
@@ -132,51 +81,18 @@ func TestNewStatFs(t *testing.T) {
 	}
 }
 
-func GetTestLines() []string {
-	wd, _ := os.Getwd()
-	// Names from OpenJDK 1.6
-	fn := wd + "/testpaths.txt"
-
-	f, err := os.Open(fn)
-	CheckSuccess(err)
-
-	defer f.Close()
-	r := bufio.NewReader(f)
-
-	l := []string{}
-	for {
-		line, _, err := r.ReadLine()
-		if line == nil || err != nil {
-			break
-		}
-
-		fn := string(line)
-		l = append(l, fn)
-	}
-	return l
-}
-
 func BenchmarkGoFuseThreadedStat(b *testing.B) {
 	b.StopTimer()
 	fs := NewStatFs()
 	fs.delay = delay
-	files := GetTestLines()
+
+	wd, _ := os.Getwd()
+	files := ReadLines(wd + "/testpaths.txt")
 	for _, fn := range files {
-		fs.add(fn, &fuse.Attr{Mode: fuse.S_IFREG | 0644})
-	}
-	if len(files) == 0 {
-		log.Fatal("no files added")
+		fs.AddFile(fn)
 	}
 
-	log.Printf("Read %d file names", len(files))
-
-	ttl := 100 * time.Millisecond
-	opts := fuse.FileSystemOptions{
-		EntryTimeout:    0.0,
-		AttrTimeout:     0.0,
-		NegativeTimeout: 0.0,
-	}
-	wd, clean := setupFs(fs, &opts)
+	wd, clean := setupFs(fs)
 	defer clean()
 
 	for i, l := range files {
@@ -184,13 +100,14 @@ func BenchmarkGoFuseThreadedStat(b *testing.B) {
 	}
 
 	threads := runtime.GOMAXPROCS(0)
-	results := TestingBOnePass(b, threads, time.Duration((ttl*120)/100), files)
+	results := TestingBOnePass(b, threads, files)
 	AnalyzeBenchmarkRuns("Go-FUSE", results)
 }
 
-func TestingBOnePass(b *testing.B, threads int, sleepTime time.Duration, files []string) (results []float64) {
+func TestingBOnePass(b *testing.B, threads int, files []string) (results []float64) {
 	runtime.GC()
 	todo := b.N
+
 	for todo > 0 {
 		if len(files) > todo {
 			files = files[:todo]
@@ -207,7 +124,8 @@ func TestingBOnePass(b *testing.B, threads int, sleepTime time.Duration, files [
 func BenchmarkCFuseThreadedStat(b *testing.B) {
 	b.StopTimer()
 
-	lines := GetTestLines()
+	wd, _ := os.Getwd()
+	lines := ReadLines(wd + "/testpaths.txt")
 	unique := map[string]int{}
 	for _, l := range lines {
 		unique[l] = 1
@@ -233,7 +151,6 @@ func BenchmarkCFuseThreadedStat(b *testing.B) {
 	f.Close()
 
 	mountPoint, _ := ioutil.TempDir("", "stat_test")
-	wd, _ := os.Getwd()
 	cmd := exec.Command(wd+"/cstatfs",
 		"-o",
 		"entry_timeout=0.0,attr_timeout=0.0,ac_attr_timeout=0.0,negative_timeout=0.0",
@@ -253,10 +170,10 @@ func BenchmarkCFuseThreadedStat(b *testing.B) {
 		lines[i] = filepath.Join(mountPoint, l)
 	}
 
-	// Wait for the daemon to mount.
-	time.Sleep(200 * time.Millisecond)
-	ttl := time.Millisecond * 100
+	time.Sleep(10 * time.Millisecond)
+	os.Lstat(mountPoint)
 	threads := runtime.GOMAXPROCS(0)
-	results := TestingBOnePass(b, threads, time.Duration((ttl*12)/10), lines)
+	results := TestingBOnePass(b, threads, lines)
 	AnalyzeBenchmarkRuns("CFuse", results)
 }
+

benchmark/statfs.go

+package benchmark
+
+import (
+	"github.com/hanwen/go-fuse/fuse"
+	"path/filepath"
+	"strings"
+	"time"
+)
+
+var delay = 0 * time.Microsecond
+
+type StatFs struct {
+	fuse.DefaultFileSystem
+	entries map[string]*fuse.Attr
+	dirs    map[string][]fuse.DirEntry
+	delay   time.Duration
+}
+
+func (me *StatFs) Add(name string, a *fuse.Attr) {
+	name = strings.TrimRight(name, "/")
+	_, ok := me.entries[name]
+	if ok {
+		return
+	}
+
+	me.entries[name] = a
+	if name == "/" || name == "" {
+		return
+	}
+
+	dir, base := filepath.Split(name)
+	dir = strings.TrimRight(dir, "/")
+	me.dirs[dir] = append(me.dirs[dir], fuse.DirEntry{Name: base, Mode: a.Mode})
+	me.Add(dir, &fuse.Attr{Mode: fuse.S_IFDIR | 0755})
+}
+
+func (me *StatFs) AddFile(name string) {
+	me.Add(name, &fuse.Attr{Mode: fuse.S_IFREG | 0644})
+}
+
+func (me *StatFs) GetAttr(name string, context *fuse.Context) (*fuse.Attr, fuse.Status) {
+	e := me.entries[name]
+	if e == nil {
+		return nil, fuse.ENOENT
+	}
+
+	if me.delay > 0 {
+		time.Sleep(me.delay)
+	}
+	return e, fuse.OK
+}
+
+func (me *StatFs) OpenDir(name string, context *fuse.Context) (stream []fuse.DirEntry, status fuse.Status) {
+	entries := me.dirs[name]
+	if entries == nil {
+		return nil, fuse.ENOENT
+	}
+	return entries, fuse.OK
+}
+
+func NewStatFs() *StatFs {
+	return &StatFs{
+		entries: make(map[string]*fuse.Attr),
+		dirs:    make(map[string][]fuse.DirEntry),
+	}
+}