all tests passing now

heyts · Jun 6, 2015 · 4207dd4 · 4207dd4
1 parent 96c90fd
commit 4207dd4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/codesearch/index/mmap_windows.go b/codesearch/index/mmap_windows.go
@@ -37,19 +37,15 @@ func mmapFile(f *os.File) mmapData {
 }
 
 func unmmapFile(m *mmapData) error {
-	err := syscall.UnmapViewOfFile(uintptr(unsafe.Pointer(&m.d)))
+	err := syscall.UnmapViewOfFile(uintptr(unsafe.Pointer(&m.d[0])))
 	if err != nil {
-		log.Fatalf("UnmapViewOfFile %s: %v", m.f.Name(), err)
-		return err
-	}
-	err = syscall.CloseHandle(syscall.Handle(m.f.Fd()))
-	if err != nil {
-		log.Fatalf("CloseHandle %s: %v", m.f.Name(), err)
+		log.Fatalf(err)
 		return err
 	}
+
 	err = m.f.Close()
 	if err != nil {
-		log.Fatalf("Close %s: %v", m.f.Name(), err)
+		log.Fatal(err)
 		return err
 	}
 

diff --git a/codesearch/index/write.go b/codesearch/index/write.go
@@ -260,6 +260,10 @@ func (ix *IndexWriter) Flush() {
 	ix.main.flush()
 }
 
+func (ix *IndexWriter) Close() {
+	ix.main.file.Close()
+}
+
 func copyFile(dst, src *bufWriter) {
 	dst.flush()
 	_, err := io.Copy(dst.file, src.finish())

diff --git a/index/index.go b/index/index.go
@@ -304,6 +304,7 @@ func containsString(haystack []string, needle string) bool {
 
 func indexAllFiles(opt *IndexOptions, dst, src string) error {
 	ix := index.Create(filepath.Join(dst, "tri"))
+	defer ix.Close()
 
 	excluded := []*ExcludedFile{}