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

src: use unordered_set instead of custom rb tree #14826

Closed
wants to merge 2 commits into from
Closed

src: use unordered_set instead of custom rb tree #14826

wants to merge 2 commits into from

Conversation

addaleax
Copy link
Member

Use a standard hash-based container instead of the custom included
red/black tree implementation. There is likely no noticeable
performance difference, and if there is one, it is very likely
to be an improvement.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

src/cares_wrap

@addaleax
src: use unordered_set instead of custom rb tree
1bc3c69 
Use a standard hash-based container instead of the custom included
red/black tree implementation. There is likely no noticeable
performance difference, and if there is one, it is very likely
to be an improvement.
@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Aug 14, 2017
@addaleax
Copy link
Member Author

addaleax commented Aug 14, 2017 •
edited
Loading

CI: https://ci.nodejs.org/job/node-test-commit/11762/
CI: https://ci.nodejs.org/job/node-test-commit/11763/

bnoordhuis
bnoordhuis approved these changes Aug 14, 2017
View reviewed changes
Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with a suggestion.

src/cares_wrap.cc Outdated
}
};

typedef std::unordered_set<node_ares_task*, TaskHash, TaskEqual>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use using ... = ..., it's a little shorter.

As well, you could replace TaskHash with a simple using TaskHash = std::hash<node_ares_task*>;, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe use using ... = ..., it's a little shorter.

Done. :)

As well, you could replace TaskHash with a simple using TaskHash = std::hash<node_ares_task*>;, right?

That would make the hash set believe that any two different node_ares_task* pointers refer to different entries, but that’s not how we use it in the lookup below.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, sorry, I missed that I hadn’t pushed the right code for TaskHash yet. Now it’s more obvious why that doesn’t work. :)

bnoordhuis
bnoordhuis approved these changes Aug 15, 2017
View reviewed changes
Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, that clears it up. Thanks, LGTM.

refack
refack reviewed Aug 15, 2017
View reviewed changes
Makefile
@@ -887,8 +887,6 @@ jslint-ci:

CPPLINT_EXCLUDE ?=
CPPLINT_EXCLUDE += src/node_root_certs.h
CPPLINT_EXCLUDE += src/queue.h
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for context, queue.h was removed in 7e779b4 (#667)

@addaleax addaleax mentioned this pull request Aug 17, 2017
Closed
3 tasks
@addaleax
Copy link
Member Author

addaleax commented Aug 17, 2017 •
edited
Loading

Landed in 2e01445 491cc76

@addaleax addaleax closed this Aug 17, 2017
@addaleax addaleax deleted the cares-no-rb branch August 17, 2017 18:15
addaleax added a commit to addaleax/node that referenced this pull request Aug 17, 2017
@addaleax
src: use unordered_set instead of custom rb tree
2e01445 
Use a standard hash-based container instead of the custom included
red/black tree implementation. There is likely no noticeable
performance difference, and if there is one, it is very likely
to be an improvement.

PR-URL: nodejs#14826
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
addaleax added a commit that referenced this pull request Aug 17, 2017
@addaleax
src: use unordered_set instead of custom rb tree
491cc76 
Use a standard hash-based container instead of the custom included
red/black tree implementation. There is likely no noticeable
performance difference, and if there is one, it is very likely
to be an improvement.

PR-URL: #14826
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
MylesBorins pushed a commit that referenced this pull request Sep 10, 2017
@addaleax @MylesBorins
src: use unordered_set instead of custom rb tree
94f34ca 
Use a standard hash-based container instead of the custom included
red/black tree implementation. There is likely no noticeable
performance difference, and if there is one, it is very likely
to be an improvement.

PR-URL: #14826
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@MylesBorins MylesBorins mentioned this pull request Sep 10, 2017
Merged
MylesBorins pushed a commit that referenced this pull request Sep 12, 2017
@addaleax @MylesBorins
src: use unordered_set instead of custom rb tree
dcd7817 
Use a standard hash-based container instead of the custom included
red/black tree implementation. There is likely no noticeable
performance difference, and if there is one, it is very likely
to be an improvement.

PR-URL: #14826
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@MylesBorins
Copy link
Contributor

Should this be backported to v6.x-staging? If yes please follow the guide and raise a backport PR, if no let me know or add the dont-land-on label.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@refack refack refack approved these changes

@tniessen tniessen tniessen approved these changes

@jasnell jasnell jasnell approved these changes

@danbev danbev danbev approved these changes

@bnoordhuis bnoordhuis bnoordhuis approved these changes

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@addaleax @MylesBorins @refack @bnoordhuis @danbev @jasnell @tniessen @nodejs-github-bot