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

Revert handle wrap refed check #6401

Closed
wants to merge 3 commits into from
Closed

Revert handle wrap refed check #6401

wants to merge 3 commits into from

Conversation

Fishrock123
Copy link
Member

Refs: #6382
Refs: #6204
Refs: #5834

I'm pretty appalled this release process is making me do this.

cc @jasnell

@Fishrock123 Fishrock123 added the lib / src Issues and PRs related to general changes in the lib or src directory. label Apr 26, 2016
@nodejs-github-bot nodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label Apr 26, 2016
@Fishrock123
Copy link
Member Author

I would really prefer if these were rebased out of v6..

@bnoordhuis bnoordhuis mentioned this pull request Apr 26, 2016
Merged
@jasnell jasnell added this to the 6.0.0 milestone Apr 26, 2016
@jasnell
Copy link
Member

jasnell commented Apr 26, 2016

CI: https://ci.nodejs.org/job/node-test-pull-request/2401/

@jasnell
Copy link
Member

jasnell commented Apr 26, 2016

The v6.x branch is available if you can get the commits rebased out. I'll hold off doing further updates there for just a bit to give you an opportunity.

@Fishrock123 Fishrock123 force-pushed the revert-handle_wrap-refed-check branch from d248a6a to 80a2229 Compare April 26, 2016 16:41
@Fishrock123
Copy link
Member Author

Updated my revert with a 3rd commit I forgot about.

@jasnell
Copy link
Member

jasnell commented Apr 26, 2016

once the other pending commits have been added to v6.x, I will apply this and rebase out the reverted commits and their reverts so they don't appear in the history for v6.x

@Fishrock123
Copy link
Member Author

@jasnell Thanks.

@jasnell
Copy link
Member

jasnell commented Apr 26, 2016

Ok, pulled this into v6.x. Should be able to close this on master

@jasnell jasnell removed this from the 6.0.0 milestone Apr 26, 2016
@jasnell
Copy link
Member

jasnell commented Apr 27, 2016

@Fishrock123 ... do we need to keep this open now?

@Fishrock123 Fishrock123 deleted the revert-handle_wrap-refed-check branch April 27, 2016 13:52
@bnoordhuis
Copy link
Member

For posterity, what happened here is that the original commits were dropped, not reverted, from the v6.x branch? So effectively the revert commits in this PR never landed in either master or v6.x?

@jasnell
Copy link
Member

jasnell commented Apr 27, 2016

Yes, the commits were dropped from v6 at @Fishrock123's request. The
commits are still in master. Those PRs need to be labeled don't land in v6
On Apr 27, 2016 7:09 AM, "Ben Noordhuis" notifications@github.com wrote:

For posterity, what happened here is that the original commits were
dropped, not reverted, from the v6.x branch? So effectively the revert
commits in this PR never landed in either master or v6.x?

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#6401 (comment)

@bnoordhuis
Copy link
Member

I've added the labels to #5834 and #6204. #6382 didn't land, AFAICT.

@Fishrock123
Copy link
Member Author

sorry, I'll do my best fix this mess in the coming week

Fishrock123 added a commit to Fishrock123/node that referenced this pull request May 3, 2016
@Fishrock123
Revert "handle_wrap: IsRefed -> Unrefed, no isAlive check"
e19c5dd 
This reverts commit 9bb5a5e.

Refs: nodejs#6395
Refs: nodejs#6204
Refs: nodejs#6401
Refs: nodejs#6382
Fixes: nodejs#6381

Conflicts:
	src/handle_wrap.cc
	test/parallel/test-handle-wrap-isrefed-tty.js
	test/parallel/test-handle-wrap-isrefed.js
@Fishrock123 Fishrock123 mentioned this pull request May 3, 2016
Merged
3 tasks
Fishrock123 added a commit to Fishrock123/node that referenced this pull request May 11, 2016
@Fishrock123
Revert "handle_wrap: IsRefed -> Unrefed, no isAlive check"
96a9439 
This reverts commit 9bb5a5e.

This API is not suitable because it depended on being able to
potentially access the handle's flag after the handle was already
cleaned up. Since this is not actually possible (obviously, oops)
this newer API no longer makes much sense, and the older API is more
suitable.

API comparison:
IsRefed -> Has a strong reference AND is alive. (Deterministic)
Unrefed -> Has a weak reference OR is dead. (Less deterministic)

Refs: nodejs#6395
Refs: nodejs#6204
Refs: nodejs#6401
Refs: nodejs#6382
Fixes: nodejs#6381

PR-URL: nodejs#6546
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>

Conflicts:
	src/handle_wrap.cc
	test/parallel/test-handle-wrap-isrefed-tty.js
	test/parallel/test-handle-wrap-isrefed.js
Fishrock123 added a commit to Fishrock123/node that referenced this pull request May 11, 2016
@Fishrock123
handle_wrap: IsRefed() -> HasRef()
fe4837a 
Rename slightly to HasRef() at bnoordhuis’ request.
Better reflects what we actually do for this check.

Refs: nodejs#6395
Refs: nodejs#6204
Refs: nodejs#6401
Refs: nodejs#6382
Refs: nodejs#6381

PR-URL: nodejs#6546
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
evanlucas pushed a commit that referenced this pull request May 17, 2016
@Fishrock123 @evanlucas
Revert "handle_wrap: IsRefed -> Unrefed, no isAlive check"
cc2af79 
This reverts commit 9bb5a5e.

This API is not suitable because it depended on being able to
potentially access the handle's flag after the handle was already
cleaned up. Since this is not actually possible (obviously, oops)
this newer API no longer makes much sense, and the older API is more
suitable.

API comparison:
IsRefed -> Has a strong reference AND is alive. (Deterministic)
Unrefed -> Has a weak reference OR is dead. (Less deterministic)

Refs: #6395
Refs: #6204
Refs: #6401
Refs: #6382
Fixes: #6381

PR-URL: #6546
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>

Conflicts:
	src/handle_wrap.cc
	test/parallel/test-handle-wrap-isrefed-tty.js
	test/parallel/test-handle-wrap-isrefed.js
evanlucas pushed a commit that referenced this pull request May 17, 2016
@Fishrock123 @evanlucas
handle_wrap: IsRefed() -> HasRef()
f31a5ec 
Rename slightly to HasRef() at bnoordhuis’ request.
Better reflects what we actually do for this check.

Refs: #6395
Refs: #6204
Refs: #6401
Refs: #6382
Refs: #6381

PR-URL: #6546
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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.

None yet
4 participants
@Fishrock123 @jasnell @bnoordhuis @nodejs-github-bot