rewrote the implementation for the shared memory
knew it would bite me in the ass since I was "creating" it instead of just opening it. still need to figure out of this event implementation will actually trigger events for the mockserver tho
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
|
// openEvent opens a windows.Handle for a given event
|
||||||
func (u *utils) OpenEvent(eventName string) error {
|
func (u *utils) OpenEvent(eventName string) error {
|
||||||
name, err := windows.UTF16PtrFromString(eventName)
|
namePtr, err := windows.UTF16PtrFromString(eventName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Request EVENT_MODIFY_STATE so SetEvent can be called on this handle
|
eventHandle, err := windows.OpenEvent(windows.SYNCHRONIZE, false, namePtr)
|
||||||
event, err := windows.OpenEvent(windows.SYNCHRONIZE|windows.EVENT_MODIFY_STATE, false, name)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// If event does not exist yet, create it
|
return err
|
||||||
event, err = windows.CreateEvent(nil, 0, 0, name)
|
|
||||||
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
|
return nil
|
||||||
}
|
}
|
||||||
@@ -143,13 +154,14 @@ func (u *utils) CheckValidDataEvent(timeout time.Duration) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check the result of the wait
|
// Check the result of the wait
|
||||||
if result == WAIT_OBJECT_0 {
|
return result == WAIT_OBJECT_0
|
||||||
return true
|
// if result == WAIT_OBJECT_0 {
|
||||||
} else if result == WAIT_TIMEOUT {
|
// return true
|
||||||
return false
|
// } else if result == WAIT_TIMEOUT {
|
||||||
}
|
// return false
|
||||||
|
// }
|
||||||
|
|
||||||
return false
|
// return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendBroadcastMessage sends a message trough the broadcast channel
|
// SendBroadcastMessage sends a message trough the broadcast channel
|
||||||
|
|||||||
@@ -6,10 +6,16 @@ package sharedMem
|
|||||||
import (
|
import (
|
||||||
"io"
|
"io"
|
||||||
"log"
|
"log"
|
||||||
|
"unsafe"
|
||||||
|
|
||||||
"golang.org/x/sys/windows"
|
"golang.org/x/sys/windows"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
|
||||||
|
procOpenFileMappingW = modkernel32.NewProc("OpenFileMappingW")
|
||||||
|
)
|
||||||
|
|
||||||
type shmi struct {
|
type shmi struct {
|
||||||
h windows.Handle
|
h windows.Handle
|
||||||
v uintptr
|
v uintptr
|
||||||
@@ -45,9 +51,46 @@ func create(name string, size uint32) (*shmi, error) {
|
|||||||
return &shmi{h, addr, size}, nil
|
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.
|
// open shared memory. return shmi object.
|
||||||
func open(name string, size uint32) (*shmi, error) {
|
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 {
|
func (o *shmi) close() error {
|
||||||
|
|||||||
Reference in New Issue
Block a user