Skip to content

2.x: add ParallelFlowable.sequentialDelayError #5117

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

Merged
akarnokd merged 3 commits into from
Feb 21, 2017
Merged

2.x: add ParallelFlowable.sequentialDelayError #5117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ea6bf9
2.x: add ParallelFlowable.sequentialDelayError
Feb 18, 2017
97b29c3
Fix javadoc, make sure failed rails are ignored.
Feb 18, 2017
ff2c2c6
Merge branch '2.x' into ParallelMultiError
akarnokd Feb 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 47 additions & 31 deletions src/main/java/io/reactivex/internal/operators/parallel/ParallelFromPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ static final class ParallelDispatcher<T>
this.subscribers = subscribers;
this.prefetch = prefetch;
this.limit = prefetch - (prefetch >> 2);
this.requests = new AtomicLongArray(subscribers.length);
this.emissions = new long[subscribers.length];
int m = subscribers.length;
this.requests = new AtomicLongArray(m + m + 1);
this.requests.lazySet(m + m, m);
this.emissions = new long[m];
}

@Override
Expand Down Expand Up @@ -145,42 +147,56 @@ public void onSubscribe(Subscription s) {
}

void setupSubscribers() {
final int m = subscribers.length;
Subscriber<? super T>[] subs = subscribers;
final int m = subs.length;

for (int i = 0; i < m; i++) {
if (cancelled) {
return;
}
final int j = i;

subscriberCount.lazySet(i + 1);

subscribers[i].onSubscribe(new Subscription() {
@Override
public void request(long n) {
if (SubscriptionHelper.validate(n)) {
AtomicLongArray ra = requests;
for (;;) {
long r = ra.get(j);
if (r == Long.MAX_VALUE) {
return;
}
long u = BackpressureHelper.addCap(r, n);
if (ra.compareAndSet(j, r, u)) {
break;
}
}
if (subscriberCount.get() == m) {
drain();
}
subs[i].onSubscribe(new RailSubscription(i, m));
}
}

final class RailSubscription implements Subscription {

final int j;

final int m;

RailSubscription(int j, int m) {
this.j = j;
this.m = m;
}

@Override
public void request(long n) {
if (SubscriptionHelper.validate(n)) {
AtomicLongArray ra = requests;
for (;;) {
long r = ra.get(j);
if (r == Long.MAX_VALUE) {
return;
}
long u = BackpressureHelper.addCap(r, n);
if (ra.compareAndSet(j, r, u)) {
break;
}
}

@Override
public void cancel() {
ParallelDispatcher.this.cancel();
if (subscriberCount.get() == m) {
drain();
}
});
}
}

@Override
public void cancel() {
if (requests.compareAndSet(m + j, 0L, 1L)) {
ParallelDispatcher.this.cancel(m + m);
}
}
}

Expand Down Expand Up @@ -209,8 +225,8 @@ public void onComplete() {
drain();
}

void cancel() {
if (!cancelled) {
void cancel(int m) {
if (requests.decrementAndGet(m) == 0L) {
cancelled = true;
this.s.cancel();

Expand Down Expand Up @@ -268,7 +284,7 @@ void drainAsync() {

long ridx = r.get(idx);
long eidx = e[idx];
if (ridx != eidx) {
if (ridx != eidx && r.get(n + idx) == 0) {

T v;

Expand Down Expand Up @@ -356,7 +372,7 @@ void drainSync() {

long ridx = r.get(idx);
long eidx = e[idx];
if (ridx != eidx) {
if (ridx != eidx && r.get(n + idx) == 0) {

T v;

Expand Down
Loading