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

buffer: fix internal iterator invalidation on rebuild, get_contiguous #6962

Merged
merged 2 commits into from Dec 31, 2015
Merged

buffer: fix internal iterator invalidation on rebuild, get_contiguous #6962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e77e3b
common/buffer: reset iterator on rebuild
liewegas Dec 17, 2015
b88561a
common/buffer: reset last_p on get_contiguous
liewegas Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/common/buffer.cc
View file
Open in desktop
Expand Up @@ -1402,6 +1402,7 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
if (nb.length())
_buffers.push_back(nb);
invalidate_crc();
last_p = begin();
}

void buffer::list::rebuild_aligned(unsigned align)
Expand Down Expand Up @@ -1449,6 +1450,7 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
}
_buffers.insert(p, unaligned._buffers.front());
}
last_p = begin();
}

void buffer::list::rebuild_page_aligned()
Expand Down Expand Up @@ -1693,6 +1695,8 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
return tmp.c_str() + off;
}

last_p = begin(); // we modified _buffers

return curbuf->c_str() + off;
}

Expand Down
11 changes: 11 additions & 0 deletions src/test/bufferlist.cc
View file
Open in desktop
Expand Up @@ -876,6 +876,17 @@ TEST(BufferListIterator, constructors) {
}
}

TEST(BufferListIterator, empty_create_append_copy) {
bufferlist bl, bl2, bl3, out;
bl2.append("bar");
bl.swap(bl2);
bl2.append("xxx");
bl.append(bl2);
bl.rebuild();
bl.copy(0, 6, out);
ASSERT_TRUE(out.contents_equal(bl));
}

TEST(BufferListIterator, operator_equal) {
bufferlist bl;
bl.append("ABC", 3);
Expand Down