netstack: Use ctx.BlockWithTimeout() directly while releasing socket. #12457
+48
−28
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.
netstack: Use ctx.BlockWithTimeout() directly while releasing socket.
When ctx is of type
kernel.taskAsyncContext, callingkernel.TaskFromContext(ctx)on it returns the original task (even though thisis an async goroutine). And then calling methods like Block() on it would panic
because it expects to be running on the task goroutine. Furthermore, the Task
could have exited so working on a dead task could cause other issues too.
Instead, use
kernel.taskAsyncContextmethods via the context.Contextinterface. This change adds BlockWithTimeout() to the context interface and
implements it for context.NoTask. kernel.Task already implements this.
The current implementation of context.NoTask.BlockWithTimeoutOn was buggy:
However, context.Blocker interface docstring suggest that true should only
be returned when the desired event occurs, which kernel.Task implements
correctly.
since the timer started.
Fixed these two bugs and made the implementations of kernel.Task and
context.NoTask consistent with one another.
Also clarified docstrings for some Task.Block*() methods about the precondition
of "The caller must be running on the task goroutine.".
Reported-by: [email protected]
Reported-by: [email protected]