From 57d195e2244c85b96baa4975de5a98aca45d53b6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 13 Jun 2012 04:47:25 +0000 Subject: os: Use Entersyscall when reading directories. From-SVN: r188494 --- libgo/go/os/dir.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libgo') diff --git a/libgo/go/os/dir.go b/libgo/go/os/dir.go index c693aeb..02b21e6 100644 --- a/libgo/go/os/dir.go +++ b/libgo/go/os/dir.go @@ -42,7 +42,11 @@ func (file *File) readdirnames(n int) (names []string, err error) { if file.dirinfo == nil { file.dirinfo = new(dirInfo) file.dirinfo.buf = make([]byte, elen) - file.dirinfo.dir = libc_opendir(syscall.StringBytePtr(file.name)) + p := syscall.StringBytePtr(file.name) + syscall.Entersyscall() + r := libc_opendir(p) + syscall.Exitsyscall() + file.dirinfo.dir = r } entry_dirent := unsafe.Pointer(&file.dirinfo.buf[0]).(*syscall.Dirent) @@ -62,7 +66,10 @@ func (file *File) readdirnames(n int) (names []string, err error) { for n != 0 { var result *syscall.Dirent - i := libc_readdir_r(dir, entry_dirent, &result) + pr := &result + syscall.Entersyscall() + i := libc_readdir_r(dir, entry_dirent, pr) + syscall.Exitsyscall() if i != 0 { return names, NewSyscallError("readdir_r", i) } -- cgit v1.1