Skip to content

Commit 9e4c902

Browse files
committed
Fix iovec usages
1 parent e79b303 commit 9e4c902

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

common/buf/buffer_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ package buf
44

55
import "golang.org/x/sys/unix"
66

7-
func (b *Buffer) Iovec() unix.Iovec {
7+
func (b *Buffer) Iovec(length int) unix.Iovec {
88
var iov unix.Iovec
99
iov.Base = &b.data[b.start]
10-
iov.SetLen(b.capacity)
10+
iov.SetLen(length)
1111
return iov
1212
}

common/buf/buffer_windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package buf
22

33
import "golang.org/x/sys/windows"
44

5-
func (b *Buffer) Iovec() windows.WSABuf {
5+
func (b *Buffer) Iovec(length int) windows.WSABuf {
66
return windows.WSABuf{
77
Buf: &b.data[b.start],
8-
Len: uint32(b.capacity),
8+
Len: uint32(length),
99
}
1010
}

common/bufio/copy_direct_posix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (w *vectorisedSyscallReadWaiter) InitializeReadWaiter(options N.ReadWaitOpt
114114
buffer = w.options.NewBuffer()
115115
w.buffers[i] = buffer
116116
}
117-
w.iovecList[i] = buffer.Iovec()
117+
w.iovecList[i] = buffer.Iovec(buffer.Cap())
118118
}
119119
var (
120120
readN uintptr

common/bufio/copy_direct_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (w *vectorisedSyscallReadWaiter) InitializeReadWaiter(options N.ReadWaitOpt
125125
buffer = w.options.NewBuffer()
126126
w.buffers[i] = buffer
127127
}
128-
w.iovecList[i] = buffer.Iovec()
128+
w.iovecList[i] = buffer.Iovec(buffer.Cap())
129129
}
130130
var readN uint32
131131
//nolint:staticcheck

common/bufio/vectorised_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (w *SyscallVectorisedWriter) WriteVectorised(buffers []*buf.Buffer) error {
2424
defer buf.ReleaseMulti(buffers)
2525
iovecList := w.iovecList
2626
for _, buffer := range buffers {
27-
iovecList = append(iovecList, buffer.Iovec())
27+
iovecList = append(iovecList, buffer.Iovec(buffer.Len()))
2828
}
2929
var innerErr unix.Errno
3030
err := w.rawConn.Write(func(fd uintptr) (done bool) {
@@ -50,7 +50,7 @@ func (w *SyscallVectorisedPacketWriter) WriteVectorisedPacket(buffers []*buf.Buf
5050
defer buf.ReleaseMulti(buffers)
5151
iovecList := w.iovecList
5252
for _, buffer := range buffers {
53-
iovecList = append(iovecList, buffer.Iovec())
53+
iovecList = append(iovecList, buffer.Iovec(buffer.Len()))
5454
}
5555
var innerErr error
5656
err := w.rawConn.Write(func(fd uintptr) (done bool) {

common/bufio/vectorised_windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func (w *SyscallVectorisedWriter) WriteVectorised(buffers []*buf.Buffer) error {
2020
defer buf.ReleaseMulti(buffers)
2121
iovecList := w.iovecList
2222
for _, buffer := range buffers {
23-
iovecList = append(iovecList, buffer.Iovec())
23+
iovecList = append(iovecList, buffer.Iovec(buffer.Len()))
2424
}
2525
var n uint32
2626
var innerErr error
@@ -46,7 +46,7 @@ func (w *SyscallVectorisedPacketWriter) WriteVectorisedPacket(buffers []*buf.Buf
4646
defer buf.ReleaseMulti(buffers)
4747
iovecList := w.iovecList
4848
for _, buffer := range buffers {
49-
iovecList = append(iovecList, buffer.Iovec())
49+
iovecList = append(iovecList, buffer.Iovec(buffer.Len()))
5050
}
5151
var n uint32
5252
var innerErr error

0 commit comments

Comments
 (0)