vitalif
/
fusego
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a deadlock in FlushFSTest.Dup2.

geesefs-0-30-9
Aaron Jacobs 2015-03-23 10:27:22 +11:00
parent e2f3ca7109
commit 62d30c7631
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
samples/flushfs/flush_fs_test.go
View File

@ -122,6 +122,19 @@ func (t *FlushFSTest) setFsyncError(err error) {
t.fsyncErr = err
}
// Like syscall.Dup2, but correctly annotates the syscall as blocking. See here
// for more info: https://github.com/golang/go/issues/10202
func dup2(oldfd int, newfd int) (err error) {
_, _, e1 := syscall.Syscall(
syscall.SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
if e1 != 0 {
err = e1
}
return
}
////////////////////////////////////////////////////////////////////////
// Tests
////////////////////////////////////////////////////////////////////////
@ -575,7 +588,7 @@ func (t *FlushFSTest) Dup2() {
// Duplicate the temporary file descriptor on top of the file from our file
// system. We should see a flush.
err = syscall.Dup2(int(f2.Fd()), int(f1.Fd()))
err = dup2(int(f2.Fd()), int(f1.Fd()))
ExpectEq(nil, err)
ExpectThat(t.getFlushes(), ElementsAre("taco"))