GitHubMirror/sys
1
0
Fork 0
mirror of https://github.com/rwinkhart/sys.git synced 2026-09-05 16:47:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "windows: support nil done parameter in ReadFile and WriteFile"

Browse Source 
This reverts CL 559375.

Reason for revert: introduced a different regression (golang/go#65378).

Fixes golang/go#65378.
Updates golang/go#65365.

Change-Id: Ie2a602415913b04b9d9b65fee5c6a54c0267b35e
Cq-Include-Trybots: luci.golang.try:x_sys-gotip-windows-amd64-longtest
Reviewed-on: https://go-review.googlesource.com/c/sys/+/559502
Auto-Submit: Bryan Mills <bcmills@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>
This commit is contained in:
Bryan Mills
2024-01-30 20:43:58 +00:00
committed by Gopher Robot
parent 628365db92
commit 511ec846b6
2 changed files with 6 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/syscall_windows.go
+6 -14
View File
@@ -572,17 +572,13 @@ func Write(fd Handle, p []byte) (n int, err error) {
}
func ReadFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error {
var n uint32
err := readFile(fd, p, &n, overlapped)
err := readFile(fd, p, done, overlapped)
if raceenabled {
if n > 0 {
raceWriteRange(unsafe.Pointer(&p[0]), int(n))
if *done > 0 {
raceWriteRange(unsafe.Pointer(&p[0]), int(*done))
}
raceAcquire(unsafe.Pointer(&ioSync))
}
if done != nil {
*done = n
}
return err
}
@@ -590,13 +586,9 @@ func WriteFile(fd Handle, p []byte, done *uint32, overlapped *Overlapped) error
if raceenabled {
raceReleaseMerge(unsafe.Pointer(&ioSync))
}
var n uint32
err := writeFile(fd, p, &n, overlapped)
if raceenabled && n > 0 {
raceReadRange(unsafe.Pointer(&p[0]), int(n))
}
if done != nil {
*done = n
err := writeFile(fd, p, done, overlapped)
if raceenabled && *done > 0 {
raceReadRange(unsafe.Pointer(&p[0]), int(*done))
}
return err
}