diff options
| author | Taras Madan <tarasmadan@google.com> | 2025-02-06 10:29:46 +0100 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2025-02-10 11:56:20 +0000 |
| commit | 43f51a00700e5960fc890e6c3d596846757bf29d (patch) | |
| tree | dee3d11120b60aa848b1f1d73d5066c8d5dd9c7c /pkg/osutil | |
| parent | 529cb927961356394978d77470022859e718c44a (diff) | |
all: delete dead code
go install golang.org/x/tools/cmd/deadcode@latest
deadcode -test ./...
Diffstat (limited to 'pkg/osutil')
| -rw-r--r-- | pkg/osutil/osutil.go | 23 | ||||
| -rw-r--r-- | pkg/osutil/osutil_fuchsia.go | 9 | ||||
| -rw-r--r-- | pkg/osutil/osutil_unix.go | 40 | ||||
| -rw-r--r-- | pkg/osutil/osutil_windows.go | 9 | ||||
| -rw-r--r-- | pkg/osutil/sharedmem_file.go | 41 | ||||
| -rw-r--r-- | pkg/osutil/sharedmem_memfd.go | 29 |
6 files changed, 0 insertions, 151 deletions
diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index c9ee98412..8e0ed7ea3 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -145,29 +145,6 @@ func IsExist(name string) bool { return err == nil } -// IsAccessible checks if the file can be opened. -func IsAccessible(name string) error { - if !IsExist(name) { - return fmt.Errorf("%v does not exist", name) - } - f, err := os.Open(name) - if err != nil { - return fmt.Errorf("%v can't be opened (%w)", name, err) - } - f.Close() - return nil -} - -// IsWritable checks if the file can be written. -func IsWritable(name string) error { - f, err := os.OpenFile(name, os.O_WRONLY, DefaultFilePerm) - if err != nil { - return fmt.Errorf("%v can't be written (%w)", name, err) - } - f.Close() - return nil -} - // FilesExist returns true if all files exist in dir. // Files are assumed to be relative names in slash notation. func FilesExist(dir string, files map[string]bool) bool { diff --git a/pkg/osutil/osutil_fuchsia.go b/pkg/osutil/osutil_fuchsia.go index 1ebd64eb4..fce4e38ba 100644 --- a/pkg/osutil/osutil_fuchsia.go +++ b/pkg/osutil/osutil_fuchsia.go @@ -6,7 +6,6 @@ package osutil import ( - "fmt" "os" "os/exec" "time" @@ -27,14 +26,6 @@ func SystemMemorySize() uint64 { return 0 } -func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) { - return nil, nil, fmt.Errorf("CreateMemMappedFile is not implemented") -} - -func CloseMemMappedFile(f *os.File, mem []byte) error { - return fmt.Errorf("CloseMemMappedFile is not implemented") -} - func ProcessExitStatus(ps *os.ProcessState) int { // TODO: can be extracted from ExitStatus string. return 0 diff --git a/pkg/osutil/osutil_unix.go b/pkg/osutil/osutil_unix.go index 7243a7014..91a713236 100644 --- a/pkg/osutil/osutil_unix.go +++ b/pkg/osutil/osutil_unix.go @@ -93,43 +93,3 @@ func LongPipe() (io.ReadCloser, io.WriteCloser, error) { prolongPipe(r, w) return r, w, err } - -// ProcessExitStatus returns process exit status. -// This is here only because of fuchsia that does not implement WaitStatus. -func ProcessExitStatus(ps *os.ProcessState) int { - return ps.Sys().(syscall.WaitStatus).ExitStatus() -} - -// CreateMemMappedFile creates a temp file with the requested size and maps it into memory. -func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) { - f, err = CreateSharedMemFile(size) - if err != nil { - return - } - if err = f.Truncate(int64(size)); err != nil { - err = fmt.Errorf("failed to truncate shared mem file: %w", err) - CloseSharedMemFile(f) - return - } - - mem, err = syscall.Mmap(int(f.Fd()), 0, size, syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_SHARED) - if err != nil { - err = fmt.Errorf("failed to mmap shm file: %w", err) - CloseSharedMemFile(f) - } - return -} - -// CloseMemMappedFile destroys memory mapping created by CreateMemMappedFile. -func CloseMemMappedFile(f *os.File, mem []byte) error { - err1 := syscall.Munmap(mem) - err2 := CloseSharedMemFile(f) - switch { - case err1 != nil: - return err1 - case err2 != nil: - return err2 - default: - return nil - } -} diff --git a/pkg/osutil/osutil_windows.go b/pkg/osutil/osutil_windows.go index c5763b677..03e729e83 100644 --- a/pkg/osutil/osutil_windows.go +++ b/pkg/osutil/osutil_windows.go @@ -4,7 +4,6 @@ package osutil import ( - "fmt" "os" "os/exec" "syscall" @@ -29,14 +28,6 @@ func SystemMemorySize() uint64 { func prolongPipe(r, w *os.File) { } -func CreateMemMappedFile(size int) (f *os.File, mem []byte, err error) { - return nil, nil, fmt.Errorf("CreateMemMappedFile is not implemented") -} - -func CloseMemMappedFile(f *os.File, mem []byte) error { - return fmt.Errorf("CloseMemMappedFile is not implemented") -} - func ProcessExitStatus(ps *os.ProcessState) int { return ps.Sys().(syscall.WaitStatus).ExitStatus() } diff --git a/pkg/osutil/sharedmem_file.go b/pkg/osutil/sharedmem_file.go deleted file mode 100644 index 0d899fab5..000000000 --- a/pkg/osutil/sharedmem_file.go +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2021 syzkaller project authors. All rights reserved. -// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -//go:build freebsd || netbsd || openbsd || darwin - -package osutil - -import ( - "fmt" - "io/ioutil" - "os" -) - -func CreateSharedMemFile(size int) (f *os.File, err error) { - f, err = ioutil.TempFile("./", "syzkaller-shm") - if err != nil { - err = fmt.Errorf("failed to create temp file: %v", err) - return - } - f.Close() - fname := f.Name() - f, err = os.OpenFile(f.Name(), os.O_RDWR, DefaultFilePerm) - if err != nil { - err = fmt.Errorf("failed to open shm file: %v", err) - os.Remove(fname) - } - return -} - -func CloseSharedMemFile(f *os.File) error { - err1 := f.Close() - err2 := os.Remove(f.Name()) - switch { - case err1 != nil: - return err1 - case err2 != nil: - return err2 - default: - return nil - } -} diff --git a/pkg/osutil/sharedmem_memfd.go b/pkg/osutil/sharedmem_memfd.go deleted file mode 100644 index 84077b9ec..000000000 --- a/pkg/osutil/sharedmem_memfd.go +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2021 syzkaller project authors. All rights reserved. -// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. - -//go:build linux - -package osutil - -import ( - "fmt" - "os" - - "golang.org/x/sys/unix" -) - -// In the case of Linux, we can just use the memfd_create syscall. -func CreateSharedMemFile(size int) (f *os.File, err error) { - // The name is actually irrelevant and can even be the same for all such files. - fd, err := unix.MemfdCreate("syz-shared-mem", unix.MFD_CLOEXEC) - if err != nil { - err = fmt.Errorf("failed to do memfd_create: %w", err) - return - } - f = os.NewFile(uintptr(fd), fmt.Sprintf("/proc/self/fd/%d", fd)) - return -} - -func CloseSharedMemFile(f *os.File) error { - return f.Close() -} |
