Skip to content

Commit

Permalink
feat: use x/sys/unix for remapping (#87)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmo314 authored Feb 6, 2024
1 parent 4e6dd0b commit 4877488
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 17 deletions.
24 changes: 7 additions & 17 deletions pkg/mmap/mmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import (
"fmt"
"io"
"os"
"reflect"
"unsafe"

"golang.org/x/sys/unix"
)
Expand Down Expand Up @@ -40,6 +38,9 @@ func NewMemoryMappedFile(f *os.File) (*MemoryMappedFile, error) {

// Close closes the file and unmaps the memory.
func (m *MemoryMappedFile) Close() error {
if m.bytes == nil {
return nil
}
return unix.Munmap(m.bytes)
}

Expand Down Expand Up @@ -113,22 +114,11 @@ func (m *MemoryMappedFile) WriteAt(b []byte, off int64) (int, error) {
}
return len(b), nil
}
header := (*reflect.SliceHeader)(unsafe.Pointer(&m.bytes))
mmapAddr, mmapSize, errno := unix.Syscall6(
unix.SYS_MREMAP,
header.Data,
uintptr(header.Len),
uintptr(fi.Size()),
uintptr(0x01), // MREMAP_MAYMOVE
0,
0,
)
if errno != 0 {
return 0, fmt.Errorf("mmap: %v", errno)
b, err := unix.Mremap(m.bytes, int(fi.Size()), unix.MREMAP_MAYMOVE)
if err != nil {
return 0, fmt.Errorf("mmap: %v", err)
}
header.Data = mmapAddr
header.Len = int(mmapSize)
header.Cap = int(mmapSize)
m.bytes = b
return len(b), nil
}
// write the data
Expand Down
52 changes: 52 additions & 0 deletions pkg/mmap/mmap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,3 +350,55 @@ func TestMemoryMappedFile_Seek(t *testing.T) {
}
})
}

func TestMemoryMappedFile_Close(t *testing.T) {
t.Run("Close", func(t *testing.T) {
f, err := os.CreateTemp("", "close")
if err != nil {
log.Fatal(err)
}
defer os.Remove(f.Name())

m, err := NewMemoryMappedFile(f)
if err != nil {
log.Fatal(err)
}

// write some data
if _, err := m.Write([]byte("Hello, world!")); err != nil {
log.Fatal(err)
}

if err := m.Close(); err != nil {
log.Fatal(err)
}
})

t.Run("Close with remap", func(t *testing.T) {
f, err := os.CreateTemp("", "closeremap")
if err != nil {
log.Fatal(err)
}
defer os.Remove(f.Name())

m, err := NewMemoryMappedFile(f)
if err != nil {
log.Fatal(err)
}

// write some data
if _, err := m.Write([]byte("Hello, world!")); err != nil {
log.Fatal(err)
}

// write some more data, triggering a remap
if _, err := m.Write([]byte("Hello, world!")); err != nil {
log.Fatal(err)
}

// close the file
if err := m.Close(); err != nil {
log.Fatal(err)
}
})
}

0 comments on commit 4877488

Please sign in to comment.