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.

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

Set of standard producers and updated queue implementations with some #2963

Merged
merged 2 commits into from
May 19, 2015
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@
*/
package rx.internal.operators;

import rx.Observable.Operator;
import rx.Subscriber;
import java.util.*;

import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import rx.Observable.Operator;
import rx.*;
import rx.internal.producers.SingleDelayedProducer;

/**
* Returns an {@code Observable} that emits a single item, a list composed of all the items emitted by the
Expand Down Expand Up @@ -90,7 +89,7 @@ public void onCompleted() {
return;
}
list = null;
producer.set(result);
producer.setValue(result);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import rx.Observable.Operator;
import rx.*;
import rx.functions.Func2;
import rx.internal.producers.SingleDelayedProducer;

/**
* Return an {@code Observable} that emits the items emitted by the source {@code Observable}, in a sorted order
Expand Down Expand Up @@ -77,7 +78,7 @@ public void onCompleted() {
onError(e);
return;
}
producer.set(a);
producer.setValue(a);
}
}

Expand Down
87 changes: 0 additions & 87 deletions src/main/java/rx/internal/operators/SingleDelayedProducer.java

This file was deleted.

191 changes: 191 additions & 0 deletions src/main/java/rx/internal/producers/ProducerArbiter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
/**
* Copyright 2015 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package rx.internal.producers;

import rx.*;

/**
* Producer that allows changing an underlying producer atomically and correctly resume with the accumulated
* requests.
*/
public final class ProducerArbiter implements Producer {
long requested;
Producer currentProducer;

boolean emitting;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we could spruce up this class with the naming. This class doesn't emit anything, the emit loop actually performs requests so is a request loop (which may induce emissions elsewhere perhaps but I don't think that justifies the use of emit).

Perhaps emitting -> busy or requesting and emitLoop->requestLoop

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's named after the emitter-loop pattern and I'd like to keep it named this way so developers can recognize it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I noticed the naming pattern from your blogs and I think instead of a queue drainer and an emitter they are better described as both queue drainers except one is aysnc biased and the other is sync biased.

long missedRequested;
long missedProduced;
Producer missedProducer;

static final Producer NULL_PRODUCER = new Producer() {
@Override
public void request(long n) {

}
};

@Override
public void request(long n) {
if (n < 0) {
throw new IllegalArgumentException("n >= 0 required");
}
if (n == 0) {
return;
}
synchronized (this) {
if (emitting) {
missedRequested += n;
return;
}
emitting = true;
}
boolean skipFinal = false;
try {
long r = requested;
long u = r + n;
if (u < 0) {
u = Long.MAX_VALUE;
}
requested = u;

Producer p = currentProducer;
if (p != null) {
p.request(n);
}

emitLoop();
skipFinal = true;
} finally {
if (!skipFinal) {
synchronized (this) {
emitting = false;
}
}
}
}

public void produced(long n) {
if (n <= 0) {
throw new IllegalArgumentException("n > 0 required");
}
synchronized (this) {
if (emitting) {
missedProduced += n;
return;
}
emitting = true;
}

boolean skipFinal = false;
try {
long r = requested;
if (r != Long.MAX_VALUE) {
long u = r - n;
if (u < 0) {
throw new IllegalStateException();
}
requested = u;
}

emitLoop();
skipFinal = true;
} finally {
if (!skipFinal) {
synchronized (this) {
emitting = false;
}
}
}
}

public void setProducer(Producer newProducer) {
synchronized (this) {
if (emitting) {
missedProducer = newProducer == null ? NULL_PRODUCER : newProducer;
return;
}
emitting = true;
}
boolean skipFinal = false;
try {
currentProducer = newProducer;
if (newProducer != null) {
newProducer.request(requested);
}

emitLoop();
skipFinal = true;
} finally {
if (!skipFinal) {
synchronized (this) {
emitting = false;
}
}
}
}

public void emitLoop() {
for (;;) {
long localRequested;
long localProduced;
Producer localProducer;
synchronized (this) {
localRequested = missedRequested;
localProduced = missedProduced;
localProducer = missedProducer;
if (localRequested == 0L
&& localProduced == 0L
&& localProducer == null) {
emitting = false;
return;
}
missedRequested = 0L;
missedProduced = 0L;
missedProducer = null;
}

long r = requested;

if (r != Long.MAX_VALUE) {
long u = r + localRequested;
if (u < 0 || u == Long.MAX_VALUE) {
r = Long.MAX_VALUE;
requested = r;
} else {
long v = u - localProduced;
if (v < 0) {
throw new IllegalStateException("more produced than requested");
}
r = v;
requested = v;
}
}
if (localProducer != null) {
if (localProducer == NULL_PRODUCER) {
currentProducer = null;
} else {
currentProducer = localProducer;
localProducer.request(r);
}
} else {
Producer p = currentProducer;
if (p != null && localRequested != 0L) {
p.request(localRequested);
}
}
}
}
}
Loading