-
Notifications
You must be signed in to change notification settings - Fork 273
Sharing map sharing statistics #2509
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 all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
be7e140
Activate internal checks for the sharing map unit tests
danpoe 332febe
Remove wrong sharing map internal assertions
danpoe 4438b43
Fix sharing map internal assertion
danpoe 186897c
Sharing stats for the sharing map
danpoe 4ae8eb6
Move sharing map friends declarations to unit tests
danpoe 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,6 +129,8 @@ SN_TYPE_PAR_DEF class sharing_node_innert : public sharing_node_baset | |
|
||
bool shares_with(const sharing_node_innert &other) const | ||
{ | ||
SN_ASSERT(data && other.data); | ||
|
||
return data == other.data; | ||
} | ||
|
||
|
@@ -151,8 +153,6 @@ SN_TYPE_PAR_DEF class sharing_node_innert : public sharing_node_baset | |
|
||
d_it &write_internal() | ||
{ | ||
SN_ASSERT(data.use_count() > 0); | ||
|
||
if(data == empty_data) | ||
{ | ||
data = make_shared_derived_u<SN_PTR_TYPE_ARGS>(); | ||
|
@@ -176,8 +176,6 @@ SN_TYPE_PAR_DEF class sharing_node_innert : public sharing_node_baset | |
|
||
d_ct &write_container() | ||
{ | ||
SN_ASSERT(data.use_count() > 0); | ||
|
||
if(data == empty_data) | ||
{ | ||
data = make_shared_derived_v<SN_PTR_TYPE_ARGS>(); | ||
|
@@ -259,8 +257,9 @@ SN_TYPE_PAR_DEF class sharing_node_innert : public sharing_node_baset | |
leaft *place_leaf(const keyT &k, const valueT &v) | ||
{ | ||
SN_ASSERT(is_container()); | ||
|
||
SN_ASSERT(as_const(this)->find_leaf(k) == nullptr); | ||
// we need to check empty() first as the const version of find_leaf() must | ||
// not be called on an empty node | ||
SN_ASSERT(empty() || as_const(this)->find_leaf(k) == nullptr); | ||
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. Again, is there a test? 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. (see comment above) |
||
|
||
leaf_listt &c = get_container(); | ||
c.push_front(leaft(k, v)); | ||
|
Oops, something went wrong.
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.
Is there any test that shows that this is wrong (and is now correct)?
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.
This code was already exercised by several tests, but I used the wrong macro names to activate the sharing map/node internal assertions in the unit tests. Thus, none of the internal assertions were enabled and we didn't see the assertion failures. This is corrected by the first commit in this PR.