Skip to content

Commit 5a70918

Browse files
dcantahdcantah
committed
Replace winapi GetQueuedCompletionStatus bind with x/sys/windows (#1307)
Previously we had our own definition for GetQueuedCompletionStatus as x/sys/windows had an incorrect definition for it. This was remedied a bit ago in this change golang/sys@683adc9 so we're alright to remove our own at this point. Signed-off-by: Daniel Canter <[email protected]> (cherry picked from commit 4721411) Signed-off-by: Daniel Canter <[email protected]>
1 parent dab144a commit 5a70918

7 files changed

Lines changed: 3 additions & 35 deletions

File tree

‎internal/jobobject/iocp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func pollIOCP(ctx context.Context, iocpHandle windows.Handle) {
3838
)
3939

4040
for {
41-
err := winapi.GetQueuedCompletionStatus(iocpHandle, &code, &key, (**windows.Overlapped)(unsafe.Pointer(&overlapped)), windows.INFINITE)
41+
err := windows.GetQueuedCompletionStatus(iocpHandle, &code, &key, (**windows.Overlapped)(unsafe.Pointer(&overlapped)), windows.INFINITE)
4242
if err != nil {
4343
log.G(ctx).WithError(err).Error("failed to poll for job object message")
4444
continue

‎internal/winapi/iocp.go‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎internal/winapi/winapi.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
// be thought of as an extension to golang.org/x/sys/windows.
33
package winapi
44

5-
//go:generate go run ..\..\mksyscall_windows.go -output zsyscall_windows.go console.go system.go net.go path.go thread.go iocp.go jobobject.go logon.go memory.go process.go processor.go devices.go filesystem.go errors.go
5+
//go:generate go run ..\..\mksyscall_windows.go -output zsyscall_windows.go user.go console.go system.go net.go path.go thread.go jobobject.go logon.go memory.go process.go processor.go devices.go filesystem.go errors.go

‎internal/winapi/zsyscall_windows.go‎

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/vendor/github.com/Microsoft/hcsshim/internal/winapi/iocp.go‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎test/vendor/github.com/Microsoft/hcsshim/internal/winapi/winapi.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/vendor/github.com/Microsoft/hcsshim/internal/winapi/zsyscall_windows.go‎

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)