Merge pull request 'rewrote the implementation for the shared memory' (#6) from windows-event-compatibility into master
Reviewed-on: #6
This commit was merged in pull request #6.
This commit is contained in:
@@ -52,21 +52,32 @@ func OpenMemMap(name string, size uint32) (Reader, error) {
|
||||
|
||||
// openEvent opens a windows.Handle for a given event
|
||||
func (u *utils) OpenEvent(eventName string) error {
|
||||
name, err := windows.UTF16PtrFromString(eventName)
|
||||
namePtr, err := windows.UTF16PtrFromString(eventName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Request EVENT_MODIFY_STATE so SetEvent can be called on this handle
|
||||
event, err := windows.OpenEvent(windows.SYNCHRONIZE|windows.EVENT_MODIFY_STATE, false, name)
|
||||
if err != nil {
|
||||
// If event does not exist yet, create it
|
||||
event, err = windows.CreateEvent(nil, 0, 0, name)
|
||||
eventHandle, err := windows.OpenEvent(windows.SYNCHRONIZE, false, namePtr)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
u.wEvent = event
|
||||
|
||||
u.wEvent = eventHandle
|
||||
// name, err := windows.UTF16PtrFromString(eventName)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// // Request EVENT_MODIFY_STATE so SetEvent can be called on this handle
|
||||
// event, err := windows.OpenEvent(windows.SYNCHRONIZE|windows.EVENT_MODIFY_STATE, false, name)
|
||||
// if err != nil {
|
||||
// // If event does not exist yet, create it
|
||||
// event, err = windows.CreateEvent(nil, 0, 0, name)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// }
|
||||
// u.wEvent = event
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -143,13 +154,14 @@ func (u *utils) CheckValidDataEvent(timeout time.Duration) bool {
|
||||
}
|
||||
|
||||
// Check the result of the wait
|
||||
if result == WAIT_OBJECT_0 {
|
||||
return true
|
||||
} else if result == WAIT_TIMEOUT {
|
||||
return false
|
||||
}
|
||||
return result == WAIT_OBJECT_0
|
||||
// if result == WAIT_OBJECT_0 {
|
||||
// return true
|
||||
// } else if result == WAIT_TIMEOUT {
|
||||
// return false
|
||||
// }
|
||||
|
||||
return false
|
||||
// return false
|
||||
}
|
||||
|
||||
// SendBroadcastMessage sends a message trough the broadcast channel
|
||||
|
||||
@@ -6,10 +6,16 @@ package sharedMem
|
||||
import (
|
||||
"io"
|
||||
"log"
|
||||
"unsafe"
|
||||
|
||||
"golang.org/x/sys/windows"
|
||||
)
|
||||
|
||||
var (
|
||||
modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
|
||||
procOpenFileMappingW = modkernel32.NewProc("OpenFileMappingW")
|
||||
)
|
||||
|
||||
type shmi struct {
|
||||
h windows.Handle
|
||||
v uintptr
|
||||
@@ -45,9 +51,46 @@ func create(name string, size uint32) (*shmi, error) {
|
||||
return &shmi{h, addr, size}, nil
|
||||
}
|
||||
|
||||
func openFileMapping(desidredAccess uint32, inheritHandle bool, name *uint16) (windows.Handle, error) {
|
||||
var inherit uint32
|
||||
if inheritHandle {
|
||||
inherit = 1
|
||||
}
|
||||
|
||||
r1, _, err := procOpenFileMappingW.Call(
|
||||
uintptr(desidredAccess),
|
||||
uintptr(inherit),
|
||||
uintptr(unsafe.Pointer(name)),
|
||||
)
|
||||
if r1 == 0 {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
return windows.Handle(r1), nil
|
||||
}
|
||||
|
||||
// open shared memory. return shmi object.
|
||||
func open(name string, size uint32) (*shmi, error) {
|
||||
return create(name, size)
|
||||
fnPtr, err := windows.UTF16PtrFromString(name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
memHandle, err := openFileMapping(windows.FILE_MAP_READ, false, fnPtr)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
memAddr, err := windows.MapViewOfFile(memHandle, windows.FILE_MAP_READ, 0, 0, 0)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &shmi{
|
||||
h: memHandle,
|
||||
v: memAddr,
|
||||
size: size,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (o *shmi) close() error {
|
||||
|
||||
Reference in New Issue
Block a user