gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

use Os.File/uintptr instead of windows.Handle in memory map struct

Browse source
This commit is contained in:
j.laycock 2019-08-28 15:40:47 +01:00
parent 0e5d3b1a70
commit 523f3a12b3
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
weed/storage/memory_map/memory_map_windows.go
View file

@ -3,6 +3,7 @@
package memory_map package memory_map
import ( import (
"os"
"reflect" "reflect"
"syscall" "syscall"
"unsafe" "unsafe"
@ -10,9 +11,6 @@ import (
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
) )
type DWORD = uint32
type WORD = uint16
type MemoryBuffer struct { type MemoryBuffer struct {
aligned_length uint64 aligned_length uint64
length uint64 length uint64
@ -22,34 +20,36 @@ type MemoryBuffer struct {
} }
type MemoryMap struct { type MemoryMap struct {
file_handle windows.Handle file_handle *os.File
file_memory_map_handle windows.Handle file_memory_map_handle uintptr
write_map_views []MemoryBuffer write_map_views []MemoryBuffer
max_length uint64 max_length uint64
End_Of_File int64 End_Of_File int64
// read_map_views []memory_buffer
} }
var FileMemoryMap = make(map[string]MemoryMap)
type DWORD = uint32
type WORD = uint16
var ( var (
procGetSystemInfo = syscall.NewLazyDLL("kernel32.dll").NewProc("GetSystemInfo") procGetSystemInfo = syscall.NewLazyDLL("kernel32.dll").NewProc("GetSystemInfo")
) )
var FileMemoryMap = make(map[string]MemoryMap)
var system_info, err = getSystemInfo() var system_info, err = getSystemInfo()
var chunk_size = uint64(system_info.dwAllocationGranularity) * 512 var chunk_size = uint64(system_info.dwAllocationGranularity) * 512
func CreateMemoryMap(hFile windows.Handle, maxlength uint64) MemoryMap { func CreateMemoryMap(file *os.File, maxlength uint64) MemoryMap {
mem_map := MemoryMap{} mem_map := MemoryMap{}
maxlength_high := uint32(maxlength >> 32) maxlength_high := uint32(maxlength >> 32)
maxlength_low := uint32(maxlength & 0xFFFFFFFF) maxlength_low := uint32(maxlength & 0xFFFFFFFF)
file_memory_map_handle, err := windows.CreateFileMapping(hFile, nil, windows.PAGE_READWRITE, maxlength_high, maxlength_low, nil) file_memory_map_handle, err := windows.CreateFileMapping(windows.Handle(file.Fd()), nil, windows.PAGE_READWRITE, maxlength_high, maxlength_low, nil)
if err != nil { if err != nil {
mem_map.file_handle = hFile mem_map.file_handle = file
mem_map.file_memory_map_handle = file_memory_map_handle mem_map.file_memory_map_handle = uintptr(file_memory_map_handle)
mem_map.max_length = maxlength mem_map.max_length = maxlength
mem_map.End_Of_File = -1 mem_map.End_Of_File = -1
} }
@ -58,8 +58,8 @@ func CreateMemoryMap(hFile windows.Handle, maxlength uint64) MemoryMap {
} }
func DeleteFileAndMemoryMap(mem_map MemoryMap) { func DeleteFileAndMemoryMap(mem_map MemoryMap) {
windows.CloseHandle(mem_map.file_memory_map_handle) windows.CloseHandle(windows.Handle(mem_map.file_memory_map_handle))
windows.CloseHandle(mem_map.file_handle) windows.CloseHandle(windows.Handle(mem_map.file_handle.Fd()))
for _, view := range mem_map.write_map_views { for _, view := range mem_map.write_map_views {
ReleaseMemory(view) ReleaseMemory(view)
@ -111,7 +111,7 @@ func WriteMemory(mem_map MemoryMap, offset uint64, length uint64, data []byte) {
} }
func ReadMemory(mem_map MemoryMap, offset uint64, length uint64) (MemoryBuffer, error) { func ReadMemory(mem_map MemoryMap, offset uint64, length uint64) (MemoryBuffer, error) {
return allocate(mem_map.file_memory_map_handle, offset, length, false) return allocate(windows.Handle(mem_map.file_memory_map_handle), offset, length, false)
} }
func ReleaseMemory(mem_buffer MemoryBuffer) { func ReleaseMemory(mem_buffer MemoryBuffer) {
@ -127,7 +127,7 @@ func ReleaseMemory(mem_buffer MemoryBuffer) {
func allocateChunk(mem_map MemoryMap) { func allocateChunk(mem_map MemoryMap) {
start := uint64(len(mem_map.write_map_views)-1) * chunk_size start := uint64(len(mem_map.write_map_views)-1) * chunk_size
mem_buffer, err := allocate(mem_map.file_memory_map_handle, start, chunk_size, true) mem_buffer, err := allocate(windows.Handle(mem_map.file_memory_map_handle), start, chunk_size, true)
if err == nil { if err == nil {
mem_map.write_map_views = append(mem_map.write_map_views, mem_buffer) mem_map.write_map_views = append(mem_map.write_map_views, mem_buffer)