lechu/go-serial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the timeout is set to NoTimeout, make Read wait forever.

Browse Source 
Otherwise the maximul allowed timeout is 0x7FFFFFFF milliseconds,
equivalent to about 24.85 days.
This patch will make a transparent repeated read in case this long
timeout should ever happen.
This commit is contained in:
Cristian Maglie
2025-03-12 20:52:40 +01:00
parent fb4b111d50
commit 1ff9b6fa9a
1 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
serial_windows.go
View File

@@ -28,8 +28,9 @@ import (
) )
type windowsPort struct { type windowsPort struct {
mu sync.Mutex mu sync.Mutex
handle windows.Handle handle windows.Handle
hasTimeout bool
} }
func nativeGetPortsList() ([]string, error) { func nativeGetPortsList() ([]string, error) {
@@ -72,26 +73,33 @@ func (port *windowsPort) Read(p []byte) (int, error) {
} }
defer windows.CloseHandle(ev.HEvent) defer windows.CloseHandle(ev.HEvent)
err = windows.ReadFile(port.handle, p, &readed, ev) for {
if err == windows.ERROR_IO_PENDING { err = windows.ReadFile(port.handle, p, &readed, ev)
err = windows.GetOverlappedResult(port.handle, ev, &readed, true) if err == windows.ERROR_IO_PENDING {
} err = windows.GetOverlappedResult(port.handle, ev, &readed, true)
switch err { }
case nil: switch err {
// operation completed successfully case nil:
case windows.ERROR_OPERATION_ABORTED: // operation completed successfully
// port may have been closed case windows.ERROR_OPERATION_ABORTED:
return int(readed), &PortError{code: PortClosed, causedBy: err} // port may have been closed
default: return int(readed), &PortError{code: PortClosed, causedBy: err}
// error happened default:
return int(readed), err // error happened
} return int(readed), err
if readed > 0 { }
return int(readed), nil if readed > 0 {
} return int(readed), nil
}
// Timeout // Timeout
return 0, nil port.mu.Lock()
hasTimeout := port.hasTimeout
port.mu.Unlock()
if hasTimeout {
return 0, nil
}
}
} }
func (port *windowsPort) Write(p []byte) (int, error) { func (port *windowsPort) Write(p []byte) (int, error) {
@@ -304,9 +312,12 @@ func (port *windowsPort) SetReadTimeout(timeout time.Duration) error {
commTimeouts.ReadTotalTimeoutConstant = uint32(ms) commTimeouts.ReadTotalTimeoutConstant = uint32(ms)
} }
port.mu.Lock()
defer port.mu.Unlock()
if err := windows.SetCommTimeouts(port.handle, commTimeouts); err != nil { if err := windows.SetCommTimeouts(port.handle, commTimeouts); err != nil {
return &PortError{code: InvalidTimeoutValue, causedBy: err} return &PortError{code: InvalidTimeoutValue, causedBy: err}
} }
port.hasTimeout = (timeout != NoTimeout)
return nil return nil
} }