Split fiber status and flags #7094
Merged
Conversation
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
Co-Authored-By: twosee <twose@qq.com>
krakjoe
approved these changes
Jun 3, 2021
twose
reviewed
Jun 4, 2021
| @@ -711,13 +712,15 @@ ZEND_METHOD(Fiber, getReturn) | |||
|
|
|||
| fiber = (zend_fiber *) Z_OBJ_P(getThis()); | |||
|
|
|||
| if (fiber->status != ZEND_FIBER_STATUS_RETURNED) { | |||
| if (fiber->status != ZEND_FIBER_STATUS_DEAD || fiber->flags) { | |||
There was a problem hiding this comment.
We can only get the return value after the fiber is dead, so the || fiber->flags here seem unnecessary, and it assumes that the flags are always used to indicate the error state, and we may add more other flags in the future.
There was a problem hiding this comment.
A fiber can be dead but have not returned a value (i.e., threw an exception). If flags are used for something other than error conditions then we'll have to revisit this, but it's fine for now.
There was a problem hiding this comment.
I mean
if (fiber->status == ZEND_FIBER_STATUS_INIT) {
...
} else if (fiber->status == ZEND_FIBER_STATUS_DEAD) {
if (fiber->flags ...) { ... }
} else {
...
}It looks like you're being lazy.
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.
This splits the fiber running status from flags about how the fiber exited: normally, with an exception, bailout, or forced destroyed.
Observers are better able to differentiate running status from exiting (e.g., a fiber is running because it is being destroyed vs. a fiber is dead and was destroyed), which is why the dubious output of
ext/zend_test/tests/observer_fiber_05.phptis now improved with this change.