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.

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

src: remove duplicate field env in CryptoJob class #31554

Closed
wants to merge 4 commits into from

Conversation

DavenportEmma
Copy link
Contributor

@DavenportEmma DavenportEmma commented Jan 28, 2020

Removed field env from cryptojob class, replaced with function get_env() inherited from ThreadPoolWork

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

Removed field env from cryptojob class, replaced with function get_env() inherited from ThreadPoolWork
@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem. labels Jan 28, 2020
@jasnell jasnell requested a review from addaleax January 28, 2020 16:42
@nodejs-github-bot
Copy link
Collaborator

@addaleax addaleax added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Jan 28, 2020
src/node_internals.h Outdated Show resolved Hide resolved
DavenportEmma and others added 2 commits January 30, 2020 09:07
Co-Authored-By: Ben Noordhuis <info@bnoordhuis.nl>
@nodejs-github-bot
Copy link
Collaborator

bnoordhuis added a commit to bnoordhuis/io.js that referenced this pull request Jan 31, 2020
Add a `ThreadPoolWork::env()` getter and use that. To fix the diamond
problem in class CompressionStream that inherits from both AsyncWrap
and ThreadPoolWork, we add a `CompressionStream::env()` getter that
delegates to `AsyncWrap::env()`.

Refs: nodejs#31554 (comment)
bnoordhuis added a commit to bnoordhuis/io.js that referenced this pull request Jan 31, 2020
Rename `StreamBase::stream_env()` to `StreamBase::env()` and work around
the diamond problem by adding `env()` getters to several classes.

Refs: nodejs#31554 (comment)
@jasnell
Copy link
Member

jasnell commented Jan 31, 2020

I'm good with either this PR or @bnoordhuis' alternative #31588 landing (but have asked that @conordavenport be listed as a co-author on the alternative)

@conordavenport ... I'm working up an additional fixup commit for this that uses env() instead of get_env(). I'll push it up when it's ready.

@jasnell
Copy link
Member

jasnell commented Feb 1, 2020

@conordavenport ... ok, I pushed a new commit that should work but I haven't tested it on macos yet.

@addaleax @Trott @benjamingr @cjihrig @devnexen ... can I ask you to give this another lookover to see if it still looks good to you.

@jasnell

This comment has been minimized.

1 similar comment
@nodejs-github-bot
Copy link
Collaborator

Copy link
Member

@addaleax addaleax left a comment

Choose a reason for hiding this comment

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

I’m also good with this, yes. (Kinda preferred the original variant of using a different method name, of all the ones out there, tbh.)

@jasnell
Copy link
Member

jasnell commented Feb 2, 2020

jasnell pushed a commit that referenced this pull request Feb 2, 2020
Removed field env from cryptojob class, replaced with
function env() inherited from ThreadPoolWork

PR-URL: #31554
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@jasnell
Copy link
Member

jasnell commented Feb 2, 2020

Landed in 99c8c6d

@jasnell jasnell closed this Feb 2, 2020
@DavenportEmma DavenportEmma deleted the new-branch branch February 7, 2020 10:01
codebytere pushed a commit that referenced this pull request Feb 17, 2020
Removed field env from cryptojob class, replaced with
function env() inherited from ThreadPoolWork

PR-URL: #31554
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@codebytere codebytere mentioned this pull request Feb 17, 2020
codebytere pushed a commit that referenced this pull request Mar 15, 2020
Removed field env from cryptojob class, replaced with
function env() inherited from ThreadPoolWork

PR-URL: #31554
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
codebytere pushed a commit that referenced this pull request Mar 17, 2020
Removed field env from cryptojob class, replaced with
function env() inherited from ThreadPoolWork

PR-URL: #31554
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@codebytere codebytere mentioned this pull request Mar 17, 2020
codebytere pushed a commit that referenced this pull request Mar 30, 2020
Removed field env from cryptojob class, replaced with
function env() inherited from ThreadPoolWork

PR-URL: #31554
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants