Allocator::max_size support in basic_memory_buffer #1960
Merged
Conversation
This file contains 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
|
Thanks for the PR but I don't think it's necessary because |
|
If "size <= max_size && new_capacity > max_size" then exception thrown from allocate() will not be correctly. |
vitaut
requested changes
Oct 28, 2020
include/fmt/format.h
Outdated
Comment on lines
746
to
748
| if (size > max_size) { | ||
| throw std::length_error("fmt::basic_memory_buffer::grow"); | ||
| } |
There was a problem hiding this comment.
Please remove this to reduce the number of checks.
include/fmt/format.h
Outdated
Comment on lines
751
to
752
| if (new_capacity > max_size) new_capacity = max_size; | ||
| if (size > new_capacity) new_capacity = size; // size is never greater max_size. |
There was a problem hiding this comment.
We only need to check new_capacity if it is not greater than size. The rest allocate will take care of. Something like:
if (size > new_capacity) new_capacity = size;
else if (new_capacity > max_size) new_capacity = (std::max)(size, max_size);
phprus
force-pushed
the
allocator_max_size
branch
from
50a5e4f
to
8f7a638
Compare
|
Commit updated. |
vitaut
reviewed
Oct 28, 2020
test/mock-allocator.h
Outdated
Comment on lines
60
to
78
| template <typename Allocator, size_t MaxSize> | ||
| class allocator_max_size: public Allocator { | ||
| public: | ||
| typedef typename Allocator::value_type value_type; | ||
| size_t max_size() const FMT_NOEXCEPT { | ||
| return MaxSize; | ||
| } | ||
| value_type* allocate(size_t n) { | ||
| if (n > max_size()) { | ||
| throw std::length_error("size > max_size"); | ||
| } | ||
| return std::allocator_traits<Allocator>::allocate( | ||
| *static_cast<Allocator *>(this), n); | ||
| } | ||
| void deallocate(value_type* p, size_t n) { | ||
| std::allocator_traits<Allocator>::deallocate( | ||
| *static_cast<Allocator *>(this), p, n); | ||
| } | ||
| }; |
There was a problem hiding this comment.
Please move this to the format-test.cc since it's only used there and not a mock.
phprus
force-pushed
the
allocator_max_size
branch
from
8f7a638
to
1250382
Compare
vitaut
reviewed
Oct 29, 2020
test/format-test.cc
Outdated
| template <typename Allocator, size_t MaxSize> | ||
| class allocator_max_size: public Allocator { | ||
| public: | ||
| typedef typename Allocator::value_type value_type; |
There was a problem hiding this comment.
Here and below: typedef -> using
test/format-test.cc
Outdated
| } catch (const std::exception &) { | ||
| throws_on_resize = true; | ||
| } | ||
| EXPECT_EQ(throws_on_resize, false); |
test/format-test.cc
Outdated
| } catch (const std::exception &) { | ||
| throws_on_resize = true; | ||
| } | ||
| EXPECT_EQ(throws_on_resize, true); |
phprus
force-pushed
the
allocator_max_size
branch
from
1250382
to
d290fa5
Compare
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The allocator may have a limit on the size of the allocated memory.
I agree that my contributions are licensed under the {fmt} license, and agree to future changes to the licensing.