-
Notifications
You must be signed in to change notification settings - Fork 5.5k
utilities: Implemented an ostream that writes to a user provided buffer #13797
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.
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a6af696
Implemented an ostream that writes to a user provided buffer and trun…
KBaichoo ac8a034
Minor changes to tests mostly.
KBaichoo 6f23391
Marked numValidBytesWrittenToBuffer const. Used std::array for test.
KBaichoo e67164e
Merge remote-tracking branch 'upstream/master' into ostream-memory-buff
KBaichoo aada91b
Added contents() method, cleaned up naming, etc.
KBaichoo 9c75aac
Minor tweaks.
KBaichoo 24513e3
Merge remote-tracking branch 'upstream/master' into ostream-memory-buff
KBaichoo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ | |
|
|
||
| #include "common/common/utility.h" | ||
|
|
||
| #include "test/common/stats/stat_test_utility.h" | ||
| #include "test/test_common/simulated_time_system.h" | ||
| #include "test/test_common/test_time.h" | ||
| #include "test/test_common/utility.h" | ||
|
|
@@ -116,6 +117,68 @@ TEST(DateUtil, NowToMilliseconds) { | |
| EXPECT_EQ(12345067, DateUtil::nowToMilliseconds(test_time)); | ||
| } | ||
|
|
||
| TEST(OutputBufferStream, FailsOnWriteToEmptyBuffer) { | ||
| constexpr char data = 'x'; | ||
| OutputBufferStream ostream{nullptr, 0}; | ||
| ASSERT_TRUE(ostream.good()); | ||
|
|
||
| ostream << data; | ||
|
|
||
| EXPECT_TRUE(ostream.bad()); | ||
| } | ||
|
|
||
| TEST(OutputBufferStream, CanWriteToBuffer) { | ||
| constexpr char data[] = "123"; | ||
| std::string buffer; | ||
| buffer.resize(3); | ||
|
|
||
| OutputBufferStream ostream{buffer.data(), buffer.size()}; | ||
| ostream << data; | ||
|
|
||
| EXPECT_EQ(buffer, data); | ||
| } | ||
|
|
||
| TEST(OutputBufferStream, CannotOverwriteBuffer) { | ||
| constexpr char data[] = "123"; | ||
| std::string buffer; | ||
| buffer.resize(2); | ||
|
|
||
| OutputBufferStream ostream{buffer.data(), buffer.size()}; | ||
| ostream << data << std::endl; | ||
|
|
||
| EXPECT_EQ(buffer, "12"); | ||
| } | ||
|
|
||
| TEST(OutputBufferStream, DoesNotAllocateMemoryEvenIfWeTryToOverflowBuffer) { | ||
| constexpr char data[] = "123"; | ||
| std::string buffer; | ||
| buffer.resize(2); | ||
| Stats::TestUtil::MemoryTest memory_test; | ||
|
|
||
| OutputBufferStream ostream{buffer.data(), buffer.size()}; | ||
| ostream << data << std::endl; | ||
|
|
||
| EXPECT_EQ(buffer, "12"); | ||
| EXPECT_EQ(memory_test.consumedBytes(), 0); | ||
| } | ||
|
|
||
| TEST(OutputBufferStream, ReturnsNumberOfBytesWrittenIntoBuffer) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test seems very similar to OutputBufferStream.CanWriteToBuffer
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Folded into that test and the overflow test. |
||
| constexpr char data[] = "123"; | ||
| std::string buffer; | ||
| buffer.resize(3); | ||
|
KBaichoo marked this conversation as resolved.
Outdated
|
||
|
|
||
| OutputBufferStream ostream{buffer.data(), buffer.size()}; | ||
| ASSERT_EQ(ostream.numValidBytesWrittenToBuffer(), 0); | ||
|
|
||
| ostream << data; | ||
| ASSERT_EQ(buffer, data); | ||
| EXPECT_EQ(ostream.numValidBytesWrittenToBuffer(), 3); | ||
|
|
||
| // Try to overflow buffer, should still have 3 as bytes written. | ||
| ostream << data; | ||
| EXPECT_EQ(ostream.numValidBytesWrittenToBuffer(), 3); | ||
| } | ||
|
|
||
| TEST(InputConstMemoryStream, All) { | ||
| { | ||
| InputConstMemoryStream istream{nullptr, 0}; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the call to setp need to happen before a pointer is given to the ostream constructor?
This seems to work:
/*** std::ostream class that serializes writes into the provided buffer.*/class OutputBufferStream : private std::streambuf, public std::ostream {public:OutputBufferStream(char* data, size_t size);...}OutputBufferStream::OutputBufferStream(char* data, size_t size): std::ostream(this) {setp(data, data + size);}There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The call to setp doesn't need to occur first since streambuf are more focused on managing some storage (buffer, file, ...) and ostreams are more focused on serializing objects. ostream defers the actual writing / storage management to the streambuf.
I organized it like this to be consistent with the
InputConstMemoryStream. If you want I can flatten it (removingFixedSizeStreamBuffer)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would consider using the name MutableMemoryStreamBuffer
I don't feel strongly about flattening it. Flattening it seems slightly cleaner but both approaches are fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.