Overload createFile function, expose File in memory_map struct, delete from memory_map map on delete
This commit is contained in:
@@ -20,7 +20,7 @@ type MemoryBuffer struct {
|
||||
}
|
||||
|
||||
type MemoryMap struct {
|
||||
file_handle *os.File
|
||||
File *os.File
|
||||
file_memory_map_handle uintptr
|
||||
write_map_views []MemoryBuffer
|
||||
max_length uint64
|
||||
@@ -48,7 +48,7 @@ func CreateMemoryMap(file *os.File, maxlength uint64) MemoryMap {
|
||||
file_memory_map_handle, err := windows.CreateFileMapping(windows.Handle(file.Fd()), nil, windows.PAGE_READWRITE, maxlength_high, maxlength_low, nil)
|
||||
|
||||
if err != nil {
|
||||
mem_map.file_handle = file
|
||||
mem_map.File = file
|
||||
mem_map.file_memory_map_handle = uintptr(file_memory_map_handle)
|
||||
mem_map.max_length = maxlength
|
||||
mem_map.End_Of_File = -1
|
||||
@@ -59,7 +59,7 @@ func CreateMemoryMap(file *os.File, maxlength uint64) MemoryMap {
|
||||
|
||||
func DeleteFileAndMemoryMap(mem_map MemoryMap) {
|
||||
windows.CloseHandle(windows.Handle(mem_map.file_memory_map_handle))
|
||||
windows.CloseHandle(windows.Handle(mem_map.file_handle.Fd()))
|
||||
windows.CloseHandle(windows.Handle(mem_map.File.Fd()))
|
||||
|
||||
for _, view := range mem_map.write_map_views {
|
||||
ReleaseMemory(view)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// +build !linux
|
||||
// +build !linux, !windows
|
||||
|
||||
package storage
|
||||
|
||||
|
||||
30
weed/storage/volume_create_windows.go
Normal file
30
weed/storage/volume_create_windows.go
Normal file
@@ -0,0 +1,30 @@
|
||||
// +build windows
|
||||
|
||||
package storage
|
||||
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/joeslay/seaweedfs/weed/storage/memory_map"
|
||||
"golang.org/x/sys/windows"
|
||||
|
||||
"github.com/chrislusf/seaweedfs/weed/glog"
|
||||
"github.com/joeslay/seaweedfs/weed/os_overloads"
|
||||
)
|
||||
|
||||
func createVolumeFile(fileName string, preallocate int64) (*os.File, error) {
|
||||
|
||||
mem_map, exists := memory_map.FileMemoryMap[fileName]
|
||||
if !exists {
|
||||
file, e := os_overloads.OpenFile(fileName, windows.O_RDWR|windows.O_CREAT, 0644, true)
|
||||
new_mem_map := memory_map.CreateMemoryMap(file, 2^32)
|
||||
memory_map.FileMemoryMap[fileName] = new_mem_map
|
||||
|
||||
if preallocate > 0 {
|
||||
glog.V(0).Infof("Preallocated disk space for %s is not supported", fileName)
|
||||
}
|
||||
return file, e
|
||||
} else {
|
||||
return mem_map.File, nil
|
||||
}
|
||||
}
|
||||
@@ -52,6 +52,7 @@ func (v *Volume) Destroy() (err error) {
|
||||
mem_map, exists := memory_map.FileMemoryMap[v.FileName()]
|
||||
if exists {
|
||||
memory_map.DeleteFileAndMemoryMap(mem_map)
|
||||
delete(memory_map.FileMemoryMap, v.FileName())
|
||||
}
|
||||
|
||||
v.Close()
|
||||
|
||||
Reference in New Issue
Block a user