GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guard deadline readings by mutex

pull/1557/head
Dmitry K 2023-03-21 22:48:53 +03:00 committed by Jack Christensen
parent d829073b2f
commit 2f1bba09c4
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
internal/nbconn/nbconn_real_non_block_windows.go
View File

@ -23,6 +23,8 @@ var dll = syscall.MustLoadDLL("ws2_32.dll")
// ); // );
var ioctlsocket = dll.MustFindProc("ioctlsocket") var ioctlsocket = dll.MustFindProc("ioctlsocket")
var deadlineExpErr = errors.New("i/o timeout")
type sockMode int type sockMode int
const ( const (
@ -45,6 +47,20 @@ func (c *NetConn) isDeadlineSet(dl time.Time) bool {
return !dl.IsZero() && dl != NonBlockingDeadline && dl != disableSetDeadlineDeadline return !dl.IsZero() && dl != NonBlockingDeadline && dl != disableSetDeadlineDeadline
} }
func (c *NetConn) isWriteDeadlineExpired() bool {
c.writeDeadlineLock.Lock()
defer c.writeDeadlineLock.Unlock()
return c.isDeadlineSet(c.writeDeadline) && !time.Now().Before(c.writeDeadline)
}
func (c *NetConn) isReadDeadlineExpired() bool {
c.readDeadlineLock.Lock()
defer c.readDeadlineLock.Unlock()
return c.isDeadlineSet(c.readDeadline) && !time.Now().Before(c.readDeadline)
}
// realNonblockingWrite does a non-blocking write. readFlushLock must already be held. // realNonblockingWrite does a non-blocking write. readFlushLock must already be held.
func (c *NetConn) realNonblockingWrite(b []byte) (n int, err error) { func (c *NetConn) realNonblockingWrite(b []byte) (n int, err error) {
if c.nonblockWriteFunc == nil { if c.nonblockWriteFunc == nil {
@ -63,8 +79,8 @@ func (c *NetConn) realNonblockingWrite(b []byte) (n int, err error) {
c.nonblockWriteN = 0 c.nonblockWriteN = 0
c.nonblockWriteErr = nil c.nonblockWriteErr = nil
if c.isDeadlineSet(c.writeDeadline) && !time.Now().Before(c.writeDeadline) { if c.isWriteDeadlineExpired() {
c.nonblockWriteErr = errors.New("i/o timeout") c.nonblockWriteErr = deadlineExpErr
return 0, c.nonblockWriteErr return 0, c.nonblockWriteErr
} }
@ -109,8 +125,8 @@ func (c *NetConn) realNonblockingRead(b []byte) (n int, err error) {
c.nonblockReadN = 0 c.nonblockReadN = 0
c.nonblockReadErr = nil c.nonblockReadErr = nil
if c.isDeadlineSet(c.readDeadline) && !time.Now().Before(c.readDeadline) { if c.isReadDeadlineExpired() {
c.nonblockReadErr = errors.New("i/o timeout") c.nonblockReadErr = deadlineExpErr
return 0, c.nonblockReadErr return 0, c.nonblockReadErr
} }