-
Notifications
You must be signed in to change notification settings - Fork 7.6k
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
1.x: overhead reduction for merge and flatMap #3476
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -177,14 +177,24 @@ static final class MergeSubscriber<T> extends Subscriber<Observable<? extends T> | |
/** An empty array to avoid creating new empty arrays in removeInner. */ | ||
static final InnerSubscriber<?>[] EMPTY = new InnerSubscriber<?>[0]; | ||
|
||
final int scalarEmissionLimit; | ||
|
||
int scalarEmissionCount; | ||
|
||
public MergeSubscriber(Subscriber<? super T> child, boolean delayErrors, int maxConcurrent) { | ||
this.child = child; | ||
this.delayErrors = delayErrors; | ||
this.maxConcurrent = maxConcurrent; | ||
this.nl = NotificationLite.instance(); | ||
this.innerGuard = new Object(); | ||
this.innerSubscribers = EMPTY; | ||
request(maxConcurrent == Integer.MAX_VALUE ? Long.MAX_VALUE : maxConcurrent); | ||
if (maxConcurrent == Integer.MAX_VALUE) { | ||
scalarEmissionLimit = Integer.MAX_VALUE; | ||
request(Long.MAX_VALUE); | ||
} else { | ||
scalarEmissionLimit = Math.max(1, maxConcurrent >> 1); | ||
request(maxConcurrent); | ||
} | ||
} | ||
|
||
Queue<Throwable> getOrCreateErrorQueue() { | ||
|
@@ -488,7 +498,15 @@ protected void emitScalar(T value, long r) { | |
if (r != Long.MAX_VALUE) { | ||
producer.produced(1); | ||
} | ||
this.requestMore(1); | ||
|
||
int produced = scalarEmissionCount + 1; | ||
if (produced == scalarEmissionLimit) { | ||
scalarEmissionCount = 0; | ||
this.requestMore(produced); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: use the const There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That equals the producer which is already a local/register loaded value |
||
} else { | ||
scalarEmissionCount = produced; | ||
} | ||
|
||
// check if some state changed while emitting | ||
synchronized (this) { | ||
skipFinal = true; | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A small question: any reason for setting
scalarEmissionLimit
tomaxConcurrent / 2
? Or just pick up a magic number2
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just curious
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tend to use 50% - 75% of the prefetch as the rerequest amount. It's a heuristic and its optimal value depends on the source emission pattern. The idea is to amortize a 40 cycle atomic increment by doing it less frequently. Basically any value above 1 helps with the overhead reduction but too large and any source to consumer loses pipelining effects.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for clarifying 👍