Do not run loop in go-routine, but let caller decide.

example/main.go

@@ -26,9 +26,9 @@ func main() {
 	state.Debug = *debug
 
 	mountPoint := flag.Arg(1)
-	state.Mount(mountPoint, *threaded)
+	state.Mount(mountPoint)
 
 	fmt.Printf("Mounted %s on %s (threaded=%v, debug=%v)\n", orig, mountPoint, *threaded, *debug)
-	
+	state.Loop(*threaded)
 }
 

examplelib/passthrough_test.go

@@ -72,12 +72,15 @@ func (self *testCase) Setup(t *testing.T) {
 	fs := fuse.NewPathFileSystemConnector(NewPassThroughFuse(self.origDir))
 
 	self.state = fuse.NewMountState(fs)
-	self.state.Mount(self.mountPoint, false)
+	self.state.Mount(self.mountPoint)
 
 	//self.state.Debug = false
 	self.state.Debug = true
 
 	fmt.Println("Orig ", self.origDir, " mount ", self.mountPoint)
+
+	// Unthreaded, but in background.
+	go self.state.Loop(false)
 }
 
 // Unmount and del.

fuse/fuse.go

@@ -99,15 +99,20 @@ func (self *MountState) UnregisterDir(handle uint64) {
 // using channels.
 //
 // TODO - error handling should perhaps be user-serviceable.
-func (self *MountState) Mount(mountPoint string, threaded bool) os.Error {
+func (self *MountState) Mount(mountPoint string) os.Error {
 	file, mp, err := mount(mountPoint)
 	if err != nil {
 		return err
 	}
 	self.mountPoint = mp
 	self.mountFile = file
-	self.threaded = threaded
+	return nil
+}
 	
+// Normally, callers should run loop() and wait for FUSE to exit, but
+// tests will want to run this in a goroutine. 
+func (self *MountState) Loop(threaded bool) {
+	self.threaded = threaded
 	if self.threaded {
 		self.outputChannel = make(chan [][]byte, 100)
 		self.errorChannel = make(chan os.Error, 100)
@@ -115,8 +120,12 @@ func (self *MountState) Mount(mountPoint string, threaded bool) os.Error {
 		go self.DefaultErrorHandler()
 	}
 
-	go self.loop()
-	return nil
+	self.loop()
+
+	if self.threaded {
+		close(self.outputChannel)
+		close(self.errorChannel)
+	}
 }
 
 func (self *MountState) Unmount() os.Error {
@@ -130,7 +139,7 @@ func (self *MountState) Unmount() os.Error {
 
 func (self *MountState) DefaultErrorHandler() {
 	for err := range self.errorChannel {
-		if err == os.EOF {
+		if err == os.EOF || err == nil {
 			break
 		}
 		log.Println("error: ", err)
@@ -223,10 +232,6 @@ func (self *MountState) loop() {
 	}
 
 	self.mountFile.Close()
-	if self.threaded {
-		close(self.outputChannel)
-		close(self.errorChannel)
-	}
 }
 
 func (self *MountState) handle(in_data []byte) {