Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize: WriteDirect implementation to avoid panic and duplicate creation of redundant LinkBufferNode when remainLen is 0 #250

Merged
merged 1 commit into from
May 8, 2023
Merged

optimize: WriteDirect implementation to avoid panic and duplicate creation of redundant LinkBufferNode when remainLen is 0 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions nocopy_linkbuffer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ func (b *LinkBuffer) WriteDirect(p []byte, remainLen int) error {
// find origin
origin := b.flush
malloc := b.mallocSize - remainLen // calculate the remaining malloc length
for t := origin.malloc - len(origin.buf); t <= malloc; t = origin.malloc - len(origin.buf) {
for t := origin.malloc - len(origin.buf); t < malloc; t = origin.malloc - len(origin.buf) {
malloc -= t
origin = origin.next
}
Expand All @@ -486,18 +486,24 @@ func (b *LinkBuffer) WriteDirect(p []byte, remainLen int) error {
dataNode := newLinkBufferNode(0)
dataNode.buf, dataNode.malloc = p[:0], n

newNode := newLinkBufferNode(0)
newNode.off = malloc
newNode.buf = origin.buf[:malloc]
newNode.malloc = origin.malloc
newNode.readonly = false
origin.malloc = malloc
origin.readonly = true

// link nodes
dataNode.next = newNode
newNode.next = origin.next
origin.next = dataNode
if remainLen > 0 {
newNode := newLinkBufferNode(0)
newNode.off = malloc
newNode.buf = origin.buf[:malloc]
newNode.malloc = origin.malloc
newNode.readonly = false
origin.malloc = malloc
origin.readonly = true

// link nodes
dataNode.next = newNode
newNode.next = origin.next
origin.next = dataNode
} else {
// link nodes
dataNode.next = origin.next
origin.next = dataNode
}

// adjust b.write
for b.write.next != nil {
Expand Down
32 changes: 19 additions & 13 deletions nocopy_linkbuffer_race.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ func (b *LinkBuffer) WriteDirect(p []byte, remainLen int) error {
// find origin
origin := b.flush
malloc := b.mallocSize - remainLen // calculate the remaining malloc length
for t := origin.malloc - len(origin.buf); t <= malloc; t = origin.malloc - len(origin.buf) {
for t := origin.malloc - len(origin.buf); t < malloc; t = origin.malloc - len(origin.buf) {
malloc -= t
origin = origin.next
}
Expand All @@ -524,18 +524,24 @@ func (b *LinkBuffer) WriteDirect(p []byte, remainLen int) error {
dataNode := newLinkBufferNode(0)
dataNode.buf, dataNode.malloc = p[:0], n

newNode := newLinkBufferNode(0)
newNode.off = malloc
newNode.buf = origin.buf[:malloc]
newNode.malloc = origin.malloc
newNode.readonly = false
origin.malloc = malloc
origin.readonly = true

// link nodes
dataNode.next = newNode
newNode.next = origin.next
origin.next = dataNode
if remainLen > 0 {
newNode := newLinkBufferNode(0)
newNode.off = malloc
newNode.buf = origin.buf[:malloc]
newNode.malloc = origin.malloc
newNode.readonly = false
origin.malloc = malloc
origin.readonly = true

// link nodes
dataNode.next = newNode
newNode.next = origin.next
origin.next = dataNode
} else {
// link nodes
dataNode.next = origin.next
origin.next = dataNode
}

// adjust b.write
for b.write.next != nil {
Expand Down
4 changes: 3 additions & 1 deletion nocopy_linkbuffer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,9 +454,11 @@ func TestWriteDirect(t *testing.T) {
buf.WriteDirect([]byte("nopqrst"), 28)
bt[4] = 'u'
buf.WriteDirect([]byte("vwxyz"), 27)
copy(bt[5:], "abcdefghijklmnopqrstuvwxyza")
buf.WriteDirect([]byte("abcdefghijklmnopqrstuvwxyz"), 0)
buf.Flush()
bs := buf.Bytes()
str := "abcdefghijklmnopqrstuvwxyz"
str := "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzaabcdefghijklmnopqrstuvwxyz"
for i := 0; i < len(str); i++ {
if bs[i] != str[i] {
t.Error("not equal!")
Expand Down
Loading