From a03244647964b29658c16f39c76edfa707699b1f Mon Sep 17 00:00:00 2001 From: Aaron Jacobs Date: Tue, 24 Mar 2015 12:53:12 +1100 Subject: [PATCH] Removed GOMAXPROCS-related workarounds. These are no longer needed as of the work in #4. --- samples/flushfs/flush_fs_test.go | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/samples/flushfs/flush_fs_test.go b/samples/flushfs/flush_fs_test.go index f58a037..7f8bba5 100644 --- a/samples/flushfs/flush_fs_test.go +++ b/samples/flushfs/flush_fs_test.go @@ -546,19 +546,6 @@ func (t *NoErrorsTest) Mmap_MunmapBeforeClose() { var n int var err error - // If we run this test with GOMAXPROCS=1 (the default), the program will - // deadlock for the reason described here: - // - // https://groups.google.com/d/msg/golang-nuts/11rdExWP6ac/TzwT6HBOb3wJ - // - // In summary, the goroutine reading from the mmap'd file is camping on a - // scheduler slot while it blocks on a page fault, and the goroutine handling - // fuse requests is waiting for the scheduler slot. - // - // So run with GOMAXPROCS=2. - old := runtime.GOMAXPROCS(2) - defer runtime.GOMAXPROCS(old) - // Open the file. t.f1, err = os.OpenFile(path.Join(t.Dir, "foo"), os.O_RDWR, 0) AssertEq(nil, err) @@ -606,19 +593,6 @@ func (t *NoErrorsTest) Mmap_CloseBeforeMunmap() { var n int var err error - // If we run this test with GOMAXPROCS=1 (the default), the program will - // deadlock for the reason described here: - // - // https://groups.google.com/d/msg/golang-nuts/11rdExWP6ac/TzwT6HBOb3wJ - // - // In summary, the goroutine reading from the mmap'd file is camping on a - // scheduler slot while it blocks on a page fault, and the goroutine handling - // fuse requests is waiting for the scheduler slot. - // - // So run with GOMAXPROCS=2. - old := runtime.GOMAXPROCS(2) - defer runtime.GOMAXPROCS(old) - // Open the file. t.f1, err = os.OpenFile(path.Join(t.Dir, "foo"), os.O_RDWR, 0) AssertEq(nil, err)