Skip to content

Use proper scheduler to unblock request/response streams #141

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
akaroml merged 3 commits into from
Dec 20, 2017
Merged

Use proper scheduler to unblock request/response streams #141

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f159d35
Use proper scheduler to unblock request/response streams
akaroml Dec 20, 2017
a5f1afa
Schedule request processing on a new thread
akaroml Dec 20, 2017
13c36a1
Catch exception when parsing message data
akaroml Dec 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
92 changes: 56 additions & 36 deletions ...bug.core/src/main/java/com/microsoft/java/debug/core/protocol/AbstractProtocolServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.microsoft.java.debug.core.protocol.Events.DebugEvent;

import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.subjects.PublishSubject;

public abstract class AbstractProtocolServer implements IProtocolServer {
Expand All @@ -55,19 +56,30 @@ public abstract class AbstractProtocolServer implements IProtocolServer {
private AtomicInteger sequenceNumber = new AtomicInteger(1);

private PublishSubject<Messages.Response> responseSubject = PublishSubject.<Messages.Response>create();
private PublishSubject<Messages.Request> requestSubject = PublishSubject.<Messages.Request>create();

/**
* Constructs a protocol server instance based on the given input stream and output stream.
* Constructs a protocol server instance based on the given input stream and
* output stream.
*
* @param input
* the input stream
* the input stream
* @param output
* the output stream
* the output stream
*/
public AbstractProtocolServer(InputStream input, OutputStream output) {
this.reader = new BufferedReader(new InputStreamReader(input, PROTOCOL_ENCODING));
this.writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(output, PROTOCOL_ENCODING)));
this.contentLength = -1;
this.rawData = new ByteBuffer();

requestSubject.observeOn(Schedulers.newThread()).subscribe(request -> {
try {
this.dispatchRequest(request);
} catch (Exception e) {
logger.log(Level.SEVERE, String.format("Dispatch debug protocol error: %s", e.toString()), e);
}
});
}

/**
Expand All @@ -91,16 +103,18 @@ public void run() {
}

/**
* Sets terminateSession flag to true. And the dispatcher loop will be terminated after current dispatching operation finishes.
* Sets terminateSession flag to true. And the dispatcher loop will be
* terminated after current dispatching operation finishes.
*/
public void stop() {
this.terminateSession = true;
}

/**
* Send a request/response/event to the DA.
*
* @param message
* the message.
* the message.
*/
private void sendMessage(Messages.ProtocolMessage message) {
message.seq = this.sequenceNumber.getAndIncrement();
Expand Down Expand Up @@ -152,13 +166,18 @@ public CompletableFuture<Messages.Response> sendRequest(Messages.Request request
CompletableFuture<Messages.Response> future = new CompletableFuture<>();
Timer timer = new Timer();
Disposable[] disposable = new Disposable[1];
disposable[0] = responseSubject.filter(response -> response.request_seq == request.seq).take(1).subscribe((response) -> {
timer.cancel();
future.complete(response);
if (disposable[0] != null) {
disposable[0].dispose();
}
});
disposable[0] = responseSubject.filter(response -> response.request_seq == request.seq).take(1)
.observeOn(Schedulers.newThread()).subscribe((response) -> {
try {
timer.cancel();
future.complete(response);
if (disposable[0] != null) {
disposable[0].dispose();
}
} catch (Exception e) {
logger.log(Level.SEVERE, String.format("Handle response error: %s", e.toString()), e);
}
});
sendMessage(request);
if (timeout > 0) {
try {
Expand All @@ -181,46 +200,47 @@ public void run() {
private void processData() {
while (true) {
/**
* In vscode debug protocol, the content length represents the message's byte length with utf8 format.
* In vscode debug protocol, the content length represents the
* message's byte length with utf8 format.
*/
if (this.contentLength >= 0) {
if (this.rawData.length() >= this.contentLength) {
byte[] buf = this.rawData.removeFirst(this.contentLength);
this.contentLength = -1;
String messageData = new String(buf, PROTOCOL_ENCODING);
Messages.ProtocolMessage message = JsonUtils.fromJson(messageData, Messages.ProtocolMessage.class);
try {
Messages.ProtocolMessage message = JsonUtils.fromJson(messageData, Messages.ProtocolMessage.class);

logger.fine(String.format("\n[%s]\n%s", message.type, messageData));
logger.fine(String.format("\n[%s]\n%s", message.type, messageData));

if (message.type.equals("request")) {
try {
this.dispatchRequest(JsonUtils.fromJson(messageData, Messages.Request.class));
} catch (Exception e) {
logger.log(Level.SEVERE, String.format("Dispatch debug protocol error: %s", e.toString()), e);
}
} else if (message.type.equals("response")) {
try {
if (message.type.equals("request")) {
Messages.Request request = JsonUtils.fromJson(messageData, Messages.Request.class);
requestSubject.onNext(request);
} else if (message.type.equals("response")) {
Messages.Response response = JsonUtils.fromJson(messageData, Messages.Response.class);
responseSubject.onNext(response);
} catch (Exception e) {
logger.log(Level.SEVERE, String.format("Handle response error: %s", e.toString()), e);
}
} catch (Exception ex) {
logger.log(Level.SEVERE, String.format("Error parsing message: %s", ex.toString()), ex);
}

continue;
}
} else {
String rawMessage = this.rawData.getString(PROTOCOL_ENCODING);
int idx = rawMessage.indexOf(TWO_CRLF);
if (idx != -1) {
Matcher matcher = CONTENT_LENGTH_MATCHER.matcher(rawMessage);
if (matcher.find()) {
this.contentLength = Integer.parseInt(matcher.group(1));
int headerByteLength = rawMessage.substring(0, idx + TWO_CRLF.length()).getBytes(PROTOCOL_ENCODING).length;
this.rawData.removeFirst(headerByteLength); // Remove the header from the raw message.
continue;
}
}

String rawMessage = this.rawData.getString(PROTOCOL_ENCODING);
int idx = rawMessage.indexOf(TWO_CRLF);
if (idx != -1) {
Matcher matcher = CONTENT_LENGTH_MATCHER.matcher(rawMessage);
if (matcher.find()) {
this.contentLength = Integer.parseInt(matcher.group(1));
int headerByteLength = rawMessage.substring(0, idx + TWO_CRLF.length())
.getBytes(PROTOCOL_ENCODING).length;
this.rawData.removeFirst(headerByteLength); // Remove the header from the raw message.
continue;
}
}

break;
}
}
Expand Down