Skip to content

GitLab

T
tangled
Commit af34023e authored by johnme@chromium.org's avatar johnme@chromium.org
Browse files
Options

Revert of Adding a router class to handle messages that expect responses.... 

Revert of Adding a router class to handle messages that expect responses. (https://codereview.chromium.org/371603003/)

Reason for revert:
This appears to have broken mojotest_instrumentation_tests with the errors like the ones listed below.

http://build.chromium.org/p/chromium.webkit/builders/Android%20Tests%20%28dbg%29/builds/20270

C   52.086s Main  [FAIL] org.chromium.mojo.bindings.ConnectorTest#testErrors:
C   52.086s Main  java.lang.NoClassDefFoundError: java.util.Objects
C   52.086s Main  	at org.chromium.mojo.bindings.MessageHeader.equals(MessageHeader.java:189)
C   52.086s Main  	at org.chromium.mojo.bindings.MessageWithHeader.<init>(MessageWithHeader.java:29)
C   52.086s Main  	at org.chromium.mojo.bindings.MessageWithHeader.<init>(MessageWithHeader.java:39)
C   52.086s Main  	at org.chromium.mojo.bindings.BindingsTestUtils.newRandomMessageWithHeader(BindingsTestUtils.java:85)
C   52.086s Main  	at org.chromium.mojo.bindings.ConnectorTest.setUp(ConnectorTest.java:53)
C   52.086s Main  	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:191)
C   52.086s Main  	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:176)
C   52.086s Main  	at android.test.InstrumentationTestRunner.onStart(InstrumentationTestRunner.java:554)
C   52.086s Main  	at android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:1701)

C   52.091s Main  [CRASH] org.chromium.mojo.bindings.RouterTest#testReceivingViaRouterWithResponse:
C   52.091s Main  Native crash: Segmentation fault

Original issue's description:
> Adding a router class to handle messages that expect responses.
> 
> This also introduce the notion of message header to allow routing.
> 
> R=rmcilroy@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=283767

TBR=qsr
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/392223004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284059 0039d316-1c4b-4281-b951-d872f2087c98
parent 376fa417
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 1055 deletions
build/android/lint/suppressions.xml
View file @ af34023e
...@@ -24,10 +24,6 @@ Still reading? ...@@ -24,10 +24,6 @@ Still reading?
<issue id="AllowBackup"> <issue id="AllowBackup">
<ignore path="AndroidManifest.xml"/> <ignore path="AndroidManifest.xml"/>
</issue> </issue>
<issue id="Assert">
<ignore regexp="mojo/public/java/src/.*"/>
<ignore regexp="mojo/bindings/java/src/.*"/>
</issue>
<issue id="CommitPrefEdits"> <issue id="CommitPrefEdits">
<ignore path="third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelPreferences.java"/> <ignore path="third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelPreferences.java"/>
</issue> </issue>
......
mojo/android/javatests/src/org/chromium/mojo/TestUtils.java
View file @ af34023e
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
package org.chromium.mojo; package org.chromium.mojo;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Random; import java.util.Random;
/** /**
...@@ -23,7 +22,6 @@ public final class TestUtils { ...@@ -23,7 +22,6 @@ public final class TestUtils {
RANDOM.setSeed(size); RANDOM.setSeed(size);
RANDOM.nextBytes(bytes); RANDOM.nextBytes(bytes);
ByteBuffer data = ByteBuffer.allocateDirect(size); ByteBuffer data = ByteBuffer.allocateDirect(size);
data.order(ByteOrder.nativeOrder());
data.put(bytes); data.put(bytes);
data.flip(); data.flip();
return data; return data;
......
mojo/android/javatests/src/org/chromium/mojo/bindings/BindingsTestUtils.java
View file @ af34023e
...@@ -4,12 +4,8 @@ ...@@ -4,12 +4,8 @@
package org.chromium.mojo.bindings; package org.chromium.mojo.bindings;
import org.chromium.mojo.TestUtils;
import org.chromium.mojo.system.Handle;
import org.chromium.mojo.system.MojoException; import org.chromium.mojo.system.MojoException;
import org.chromium.mojo.system.Pair;
import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -23,65 +19,32 @@ public class BindingsTestUtils { ...@@ -23,65 +19,32 @@ public class BindingsTestUtils {
*/ */
public static class RecordingMessageReceiver implements MessageReceiver { public static class RecordingMessageReceiver implements MessageReceiver {
public final List<MessageWithHeader> messages = new ArrayList<MessageWithHeader>(); public final List<Message> messages = new ArrayList<Message>();
/** /**
* @see MessageReceiver#accept(MessageWithHeader) * @see MessageReceiver#accept(Message)
*/ */
@Override @Override
public boolean accept(MessageWithHeader message) { public boolean accept(Message message) {
messages.add(message); messages.add(message);
return true; return true;
} }
} }
/** /**
* {@link MessageReceiverWithResponder} that records any message it receives. * {@link Connector.ErrorHandler} that records any error it received.
*/ */
public static class RecordingMessageReceiverWithResponder extends RecordingMessageReceiver public static class CapturingErrorHandler implements Connector.ErrorHandler {
implements MessageReceiverWithResponder {
public final List<Pair<MessageWithHeader, MessageReceiver>> messagesWithReceivers =
new ArrayList<Pair<MessageWithHeader, MessageReceiver>>();
/**
* @see MessageReceiverWithResponder#acceptWithResponder(MessageWithHeader,
* MessageReceiver)
*/
@Override
public boolean acceptWithResponder(MessageWithHeader message, MessageReceiver responder) {
messagesWithReceivers.add(Pair.create(message, responder));
return true;
}
}
/**
* {@link ConnectionErrorHandler} that records any error it received.
*/
public static class CapturingErrorHandler implements ConnectionErrorHandler {
public MojoException exception = null; public MojoException exception = null;
/** /**
* @see ConnectionErrorHandler#onConnectionError(MojoException) * @see Connector.ErrorHandler#onError(MojoException)
*/ */
@Override @Override
public void onConnectionError(MojoException e) { public void onError(MojoException e) {
exception = e; exception = e;
} }
} }
/**
* Creates a new valid {@link MessageWithHeader}.
*/
public static MessageWithHeader newRandomMessageWithHeader(int size) {
assert size > 16;
ByteBuffer message = TestUtils.newRandomBuffer(size);
int[] headerAsInts = { 16, 2, 0, 0 };
for (int i = 0; i < 4; ++i) {
message.putInt(4 * i, headerAsInts[i]);
}
message.position(0);
return new MessageWithHeader(new Message(message, new ArrayList<Handle>()));
}
} }
mojo/android/javatests/src/org/chromium/mojo/bindings/ConnectorTest.java
View file @ af34023e
...@@ -7,6 +7,7 @@ package org.chromium.mojo.bindings; ...@@ -7,6 +7,7 @@ package org.chromium.mojo.bindings;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.mojo.MojoTestCase; import org.chromium.mojo.MojoTestCase;
import org.chromium.mojo.TestUtils;
import org.chromium.mojo.bindings.BindingsTestUtils.CapturingErrorHandler; import org.chromium.mojo.bindings.BindingsTestUtils.CapturingErrorHandler;
import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiver; import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiver;
import org.chromium.mojo.system.Core; import org.chromium.mojo.system.Core;
...@@ -30,7 +31,7 @@ public class ConnectorTest extends MojoTestCase { ...@@ -30,7 +31,7 @@ public class ConnectorTest extends MojoTestCase {
private MessagePipeHandle mHandle; private MessagePipeHandle mHandle;
private Connector mConnector; private Connector mConnector;
private MessageWithHeader mTestMessage; private Message mTestMessage;
private RecordingMessageReceiver mReceiver; private RecordingMessageReceiver mReceiver;
private CapturingErrorHandler mErrorHandler; private CapturingErrorHandler mErrorHandler;
...@@ -50,7 +51,7 @@ public class ConnectorTest extends MojoTestCase { ...@@ -50,7 +51,7 @@ public class ConnectorTest extends MojoTestCase {
mErrorHandler = new CapturingErrorHandler(); mErrorHandler = new CapturingErrorHandler();
mConnector.setErrorHandler(mErrorHandler); mConnector.setErrorHandler(mErrorHandler);
mConnector.start(); mConnector.start();
mTestMessage = BindingsTestUtils.newRandomMessageWithHeader(DATA_LENGTH); mTestMessage = new Message(TestUtils.newRandomBuffer(DATA_LENGTH), new ArrayList<Handle>());
assertNull(mErrorHandler.exception); assertNull(mErrorHandler.exception);
assertEquals(0, mReceiver.messages.size()); assertEquals(0, mReceiver.messages.size());
} }
...@@ -77,7 +78,7 @@ public class ConnectorTest extends MojoTestCase { ...@@ -77,7 +78,7 @@ public class ConnectorTest extends MojoTestCase {
MessagePipeHandle.ReadFlags.NONE); MessagePipeHandle.ReadFlags.NONE);
assertEquals(MojoResult.OK, result.getMojoResult()); assertEquals(MojoResult.OK, result.getMojoResult());
assertEquals(DATA_LENGTH, result.getMessageSize()); assertEquals(DATA_LENGTH, result.getMessageSize());
assertEquals(mTestMessage.getMessage().buffer, received); assertEquals(mTestMessage.buffer, received);
} }
/** /**
...@@ -85,14 +86,14 @@ public class ConnectorTest extends MojoTestCase { ...@@ -85,14 +86,14 @@ public class ConnectorTest extends MojoTestCase {
*/ */
@SmallTest @SmallTest
public void testReceivingMessage() { public void testReceivingMessage() {
mHandle.writeMessage(mTestMessage.getMessage().buffer, new ArrayList<Handle>(), mHandle.writeMessage(mTestMessage.buffer, new ArrayList<Handle>(),
MessagePipeHandle.WriteFlags.NONE); MessagePipeHandle.WriteFlags.NONE);
nativeRunLoop(RUN_LOOP_TIMEOUT_MS); nativeRunLoop(RUN_LOOP_TIMEOUT_MS);
assertNull(mErrorHandler.exception); assertNull(mErrorHandler.exception);
assertEquals(1, mReceiver.messages.size()); assertEquals(1, mReceiver.messages.size());
MessageWithHeader received = mReceiver.messages.get(0); Message received = mReceiver.messages.get(0);
assertEquals(0, received.getMessage().handles.size()); assertEquals(0, received.handles.size());
assertEquals(mTestMessage.getMessage().buffer, received.getMessage().buffer); assertEquals(mTestMessage.buffer, received.buffer);
} }
/** /**
......
mojo/android/javatests/src/org/chromium/mojo/bindings/MessageHeaderTest.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase;
import org.chromium.mojo.bindings.test.mojom.imported.Point;
/**
* Testing internal classes of interfaces.
*/
public class MessageHeaderTest extends TestCase {
/**
* Testing that headers are identical after being serialized/deserialized.
*/
@SmallTest
public void testSimpleMessageHeader() {
final int xValue = 1;
final int yValue = 2;
final int type = 6;
Point p = new Point();
p.x = xValue;
p.y = yValue;
MessageWithHeader message = p.serializeWithHeader(null, new MessageHeader(type));
MessageHeader header = message.getHeader();
assertTrue(header.validateHeader(type, 0));
assertEquals(type, header.getType());
assertEquals(0, header.getFlags());
Point p2 = Point.deserialize(message.getPayload());
assertNotNull(p2);
assertEquals(p.x, p2.x);
assertEquals(p.y, p2.y);
}
/**
* Testing that headers are identical after being serialized/deserialized.
*/
@SmallTest
public void testMessageWithRequestIdHeader() {
final int xValue = 1;
final int yValue = 2;
final int type = 6;
final long requestId = 0x1deadbeafL;
Point p = new Point();
p.x = xValue;
p.y = yValue;
MessageWithHeader message = p.serializeWithHeader(null,
new MessageHeader(type, MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG, 0));
message.setRequestId(requestId);
MessageHeader header = message.getHeader();
assertTrue(header.validateHeader(type, MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG));
assertEquals(type, header.getType());
assertEquals(MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG, header.getFlags());
assertEquals(requestId, header.getRequestId());
Point p2 = Point.deserialize(message.getPayload());
assertNotNull(p2);
assertEquals(p.x, p2.x);
assertEquals(p.y, p2.y);
}
}
mojo/android/javatests/src/org/chromium/mojo/bindings/MessageWithHeaderTest.java → mojo/android/javatests/src/org/chromium/mojo/bindings/MessageTest.java
View file @ af34023e
...@@ -7,6 +7,7 @@ package org.chromium.mojo.bindings; ...@@ -7,6 +7,7 @@ package org.chromium.mojo.bindings;
import android.test.suitebuilder.annotation.SmallTest; import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.mojo.MojoTestCase; import org.chromium.mojo.MojoTestCase;
import org.chromium.mojo.TestUtils;
import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiver; import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiver;
import org.chromium.mojo.system.Core; import org.chromium.mojo.system.Core;
import org.chromium.mojo.system.DataPipe; import org.chromium.mojo.system.DataPipe;
...@@ -23,9 +24,9 @@ import java.util.Arrays; ...@@ -23,9 +24,9 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* Testing {@link MessageWithHeader}. * Testing {@link Message}.
*/ */
public class MessageWithHeaderTest extends MojoTestCase { public class MessageTest extends MojoTestCase {
private static final int DATA_SIZE = 1024; private static final int DATA_SIZE = 1024;
...@@ -42,7 +43,7 @@ public class MessageWithHeaderTest extends MojoTestCase { ...@@ -42,7 +43,7 @@ public class MessageWithHeaderTest extends MojoTestCase {
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
Core core = CoreImpl.getInstance(); Core core = CoreImpl.getInstance();
mData = BindingsTestUtils.newRandomMessageWithHeader(DATA_SIZE).getMessage().buffer; mData = TestUtils.newRandomBuffer(DATA_SIZE);
mMessageReceiver = new RecordingMessageReceiver(); mMessageReceiver = new RecordingMessageReceiver();
mHandles = core.createMessagePipe(new MessagePipeHandle.CreateOptions()); mHandles = core.createMessagePipe(new MessagePipeHandle.CreateOptions());
Pair<DataPipe.ProducerHandle, DataPipe.ConsumerHandle> datapipe = core.createDataPipe(null); Pair<DataPipe.ProducerHandle, DataPipe.ConsumerHandle> datapipe = core.createDataPipe(null);
...@@ -63,43 +64,43 @@ public class MessageWithHeaderTest extends MojoTestCase { ...@@ -63,43 +64,43 @@ public class MessageWithHeaderTest extends MojoTestCase {
} }
/** /**
* Testing {@link MessageWithHeader#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)} * Testing {@link Message#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)}
*/ */
@SmallTest @SmallTest
public void testReadAndDispatchMessage() { public void testReadAndDispatchMessage() {
mHandles.first.writeMessage(mData, mHandlesToSend, MessagePipeHandle.WriteFlags.NONE); mHandles.first.writeMessage(mData, mHandlesToSend, MessagePipeHandle.WriteFlags.NONE);
assertEquals(MojoResult.OK, assertEquals(MojoResult.OK,
MessageWithHeader.readAndDispatchMessage(mHandles.second, mMessageReceiver)); Message.readAndDispatchMessage(mHandles.second, mMessageReceiver));
assertEquals(1, mMessageReceiver.messages.size()); assertEquals(1, mMessageReceiver.messages.size());
MessageWithHeader message = mMessageReceiver.messages.get(0); Message message = mMessageReceiver.messages.get(0);
mHandlesToClose.addAll(message.getMessage().handles); mHandlesToClose.addAll(message.handles);
assertEquals(mData, message.getMessage().buffer); assertEquals(mData, message.buffer);
assertEquals(2, message.getMessage().handles.size()); assertEquals(2, message.handles.size());
for (Handle handle : message.getMessage().handles) { for (Handle handle : message.handles) {
assertTrue(handle.isValid()); assertTrue(handle.isValid());
} }
} }
/** /**
* Testing {@link MessageWithHeader#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)} * Testing {@link Message#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)} with no
* with no message available. * message available.
*/ */
@SmallTest @SmallTest
public void testReadAndDispatchMessageOnEmptyHandle() { public void testReadAndDispatchMessageOnEmptyHandle() {
assertEquals(MojoResult.SHOULD_WAIT, assertEquals(MojoResult.SHOULD_WAIT,
MessageWithHeader.readAndDispatchMessage(mHandles.second, mMessageReceiver)); Message.readAndDispatchMessage(mHandles.second, mMessageReceiver));
assertEquals(0, mMessageReceiver.messages.size()); assertEquals(0, mMessageReceiver.messages.size());
} }
/** /**
* Testing {@link MessageWithHeader#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)} * Testing {@link Message#readAndDispatchMessage(MessagePipeHandle, MessageReceiver)} on closed
* on closed handle. * handle.
*/ */
@SmallTest @SmallTest
public void testReadAndDispatchMessageOnClosedHandle() { public void testReadAndDispatchMessageOnClosedHandle() {
mHandles.first.close(); mHandles.first.close();
try { try {
MessageWithHeader.readAndDispatchMessage(mHandles.second, mMessageReceiver); Message.readAndDispatchMessage(mHandles.second, mMessageReceiver);
fail("MojoException should have been thrown"); fail("MojoException should have been thrown");
} catch (MojoException expected) { } catch (MojoException expected) {
assertEquals(MojoResult.FAILED_PRECONDITION, expected.getMojoResult()); assertEquals(MojoResult.FAILED_PRECONDITION, expected.getMojoResult());
......
mojo/android/javatests/src/org/chromium/mojo/bindings/RouterTest.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import android.test.suitebuilder.annotation.SmallTest;
import org.chromium.mojo.MojoTestCase;
import org.chromium.mojo.bindings.BindingsTestUtils.CapturingErrorHandler;
import org.chromium.mojo.bindings.BindingsTestUtils.RecordingMessageReceiverWithResponder;
import org.chromium.mojo.system.Core;
import org.chromium.mojo.system.Handle;
import org.chromium.mojo.system.MessagePipeHandle;
import org.chromium.mojo.system.MojoResult;
import org.chromium.mojo.system.Pair;
import org.chromium.mojo.system.impl.CoreImpl;
import java.nio.ByteBuffer;
import java.util.ArrayList;
/**
* Testing {@link Router}
*/
public class RouterTest extends MojoTestCase {
private static final long RUN_LOOP_TIMEOUT_MS = 25;
private MessagePipeHandle mHandle;
private Router mRouter;
private RecordingMessageReceiverWithResponder mReceiver;
private CapturingErrorHandler mErrorHandler;
/**
* @see MojoTestCase#setUp()
*/
@Override
protected void setUp() throws Exception {
super.setUp();
Core core = CoreImpl.getInstance();
Pair<MessagePipeHandle, MessagePipeHandle> handles = core.createMessagePipe(null);
mHandle = handles.first;
mRouter = new RouterImpl(handles.second);
mReceiver = new RecordingMessageReceiverWithResponder();
mRouter.setIncomingMessageReceiver(mReceiver);
mErrorHandler = new CapturingErrorHandler();
mRouter.setErrorHandler(mErrorHandler);
mRouter.start();
}
/**
* Testing sending a message via the router that expected a response.
*/
@SmallTest
public void testSendingToRouterWithResponse() {
final int requestMessageType = 0xdead;
final int responseMessageType = 0xbeaf;
// Sending a message expecting a response.
MessageHeader header = new MessageHeader(requestMessageType,
MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG, 0);
Encoder encoder = new Encoder(CoreImpl.getInstance(), header.getSize());
header.encode(encoder);
MessageWithHeader headerMessage = new MessageWithHeader(encoder.getMessage());
mRouter.acceptWithResponder(headerMessage, mReceiver);
ByteBuffer receiveBuffer = ByteBuffer.allocateDirect(header.getSize());
MessagePipeHandle.ReadMessageResult result = mHandle.readMessage(receiveBuffer, 0,
MessagePipeHandle.ReadFlags.NONE);
assertEquals(MojoResult.OK, result.getMojoResult());
MessageHeader receivedHeader = new MessageWithHeader(
new Message(receiveBuffer, new ArrayList<Handle>()))
.getHeader();
assertEquals(header.getType(), receivedHeader.getType());
assertEquals(header.getFlags(), receivedHeader.getFlags());
assertTrue(receivedHeader.getRequestId() != 0);
// Sending the response.
MessageHeader responseHeader = new MessageHeader(responseMessageType,
MessageHeader.MESSAGE_IS_RESPONSE_FLAG, receivedHeader.getRequestId());
encoder = new Encoder(CoreImpl.getInstance(), header.getSize());
responseHeader.encode(encoder);
Message responseMessage = encoder.getMessage();
mHandle.writeMessage(responseMessage.buffer, new ArrayList<Handle>(),
MessagePipeHandle.WriteFlags.NONE);
nativeRunLoop(RUN_LOOP_TIMEOUT_MS);
assertEquals(1, mReceiver.messages.size());
MessageWithHeader receivedResponseMessage = mReceiver.messages.get(0);
assertEquals(MessageHeader.MESSAGE_IS_RESPONSE_FLAG,
receivedResponseMessage.getHeader().getFlags());
assertEquals(responseMessage.buffer, receivedResponseMessage.getMessage().buffer);
}
/**
* Testing receiving a message via the router that expected a response.
*/
@SmallTest
public void testReceivingViaRouterWithResponse() {
final int requestMessageType = 0xdead;
final int responseMessageType = 0xbeef;
final int requestId = 0xdeadbeaf;
// Sending a message expecting a response.
MessageHeader header = new MessageHeader(requestMessageType,
MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG, requestId);
Encoder encoder = new Encoder(CoreImpl.getInstance(), header.getSize());
header.encode(encoder);
Message headerMessage = encoder.getMessage();
mHandle.writeMessage(headerMessage.buffer, new ArrayList<Handle>(),
MessagePipeHandle.WriteFlags.NONE);
nativeRunLoop(RUN_LOOP_TIMEOUT_MS);
assertEquals(1, mReceiver.messagesWithReceivers.size());
Pair<MessageWithHeader, MessageReceiver> receivedMessage =
mReceiver.messagesWithReceivers.get(0);
assertEquals(headerMessage.buffer, receivedMessage.first.getMessage().buffer);
// Sending the response.
MessageHeader responseHeader = new MessageHeader(responseMessageType,
MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG, requestId);
encoder = new Encoder(CoreImpl.getInstance(), header.getSize());
responseHeader.encode(encoder);
MessageWithHeader responseHeaderMessage = new MessageWithHeader(encoder.getMessage());
receivedMessage.second.accept(responseHeaderMessage);
ByteBuffer receivedResponseMessage = ByteBuffer.allocateDirect(responseHeader.getSize());
MessagePipeHandle.ReadMessageResult result = mHandle.readMessage(receivedResponseMessage, 0,
MessagePipeHandle.ReadFlags.NONE);
assertEquals(MojoResult.OK, result.getMojoResult());
assertEquals(responseHeaderMessage.getMessage().buffer, receivedResponseMessage);
}
}
mojo/bindings/java/src/org/chromium/mojo/bindings/AutoCloseableRouter.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import org.chromium.mojo.system.Core;
import org.chromium.mojo.system.MessagePipeHandle;
import java.util.concurrent.Executor;
/**
* Wrapper around {@link Router} that will close the connection when not referenced anymore.
*/
class AutoCloseableRouter implements Router {
/**
* The underlying router.
*/
private final Router mRouter;
/**
* The executor to close the underlying router.
*/
private final Executor mExecutor;
/**
* Flags to keep track if this router has been correctly closed.
*/
private boolean mClosed;
/**
* Constructor.
*/
public AutoCloseableRouter(Core core, Router router) {
mRouter = router;
mExecutor = ExecutorFactory.getExecutorForCurrentThread(core);
}
/**
* @see Router#setIncomingMessageReceiver(MessageReceiverWithResponder)
*/
@Override
public void setIncomingMessageReceiver(MessageReceiverWithResponder incomingMessageReceiver) {
mRouter.setIncomingMessageReceiver(incomingMessageReceiver);
}
/**
* @see HandleOwner#passHandle()
*/
@Override
public MessagePipeHandle passHandle() {
return mRouter.passHandle();
}
/**
* @see MessageReceiver#accept(MessageWithHeader)
*/
@Override
public boolean accept(MessageWithHeader message) {
return mRouter.accept(message);
}
/**
* @see MessageReceiverWithResponder#acceptWithResponder(MessageWithHeader, MessageReceiver)
*/
@Override
public boolean acceptWithResponder(MessageWithHeader message, MessageReceiver responder) {
return mRouter.acceptWithResponder(message, responder);
}
/**
* @see Router#start()
*/
@Override
public void start() {
mRouter.start();
}
/**
* @see Router#setErrorHandler(ConnectionErrorHandler)
*/
@Override
public void setErrorHandler(ConnectionErrorHandler errorHandler) {
mRouter.setErrorHandler(errorHandler);
}
/**
* @see java.io.Closeable#close()
*/
@Override
public void close() {
mRouter.close();
mClosed = true;
}
/**
* @see Object#finalize()
*/
@Override
protected void finalize() throws Throwable {
if (!mClosed) {
mExecutor.execute(new Runnable() {
@Override
public void run() {
close();
}
});
throw new IllegalStateException("Warning: Router objects should be explicitly closed " +
"when no longer required otherwise you may leak handles.");
}
super.finalize();
}
}
mojo/bindings/java/src/org/chromium/mojo/bindings/BindingsHelper.java
View file @ af34023e
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
package org.chromium.mojo.bindings; package org.chromium.mojo.bindings;
import org.chromium.mojo.system.AsyncWaiter;
import org.chromium.mojo.system.Handle;
/** /**
* Helper functions. * Helper functions.
*/ */
...@@ -76,17 +73,4 @@ public class BindingsHelper { ...@@ -76,17 +73,4 @@ public class BindingsHelper {
private static boolean isSurrogate(char c) { private static boolean isSurrogate(char c) {
return c >= Character.MIN_SURROGATE && c < (Character.MAX_SURROGATE + 1); return c >= Character.MIN_SURROGATE && c < (Character.MAX_SURROGATE + 1);
} }
/**
* Returns an {@link AsyncWaiter} to use with the given handle, or <code>null</code> if none if
* available.
*/
static AsyncWaiter getDefaultAsyncWaiterForHandle(Handle handle) {
if (handle.getCore() != null) {
return handle.getCore().getDefaultAsyncWaiter();
} else {
return null;
}
}
} }
mojo/bindings/java/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import org.chromium.mojo.system.MojoException;
/**
* A {@link ConnectionErrorHandler} is notified of an error happening while using the bindings over
* message pipes.
*/
interface ConnectionErrorHandler {
public void onConnectionError(MojoException e);
}
mojo/bindings/java/src/org/chromium/mojo/bindings/Connector.java
View file @ af34023e
...@@ -20,6 +20,13 @@ import org.chromium.mojo.system.MojoResult; ...@@ -20,6 +20,13 @@ import org.chromium.mojo.system.MojoResult;
*/ */
public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle> { public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle> {
/**
* An {@link ErrorHandler} is notified of error happening while using the message pipe.
*/
interface ErrorHandler {
public void onError(MojoException e);
}
/** /**
* The callback that is notified when the state of the owned handle changes. * The callback that is notified when the state of the owned handle changes.
*/ */
...@@ -48,14 +55,14 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle ...@@ -48,14 +55,14 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
/** /**
* The error handler to notify of errors. * The error handler to notify of errors.
*/ */
private ConnectionErrorHandler mErrorHandler; private ErrorHandler mErrorHandler;
/** /**
* Create a new connector over a |messagePipeHandle|. The created connector will use the default * Create a new connector over a |messagePipeHandle|. The created connector will use the default
* {@link AsyncWaiter} from the {@link Core} implementation of |messagePipeHandle|. * {@link AsyncWaiter} from the {@link Core} implementation of |messagePipeHandle|.
*/ */
public Connector(MessagePipeHandle messagePipeHandle) { public Connector(MessagePipeHandle messagePipeHandle) {
this(messagePipeHandle, BindingsHelper.getDefaultAsyncWaiterForHandle(messagePipeHandle)); this(messagePipeHandle, getDefaultAsyncWaiterForMessagePipe(messagePipeHandle));
} }
/** /**
...@@ -76,10 +83,9 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle ...@@ -76,10 +83,9 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
} }
/** /**
* Set the {@link ConnectionErrorHandler} that will be notified of errors on the owned message * Set the {@link ErrorHandler} that will be notified of errors on the owned message pipe.
* pipe.
*/ */
public void setErrorHandler(ConnectionErrorHandler errorHandler) { public void setErrorHandler(ErrorHandler errorHandler) {
mErrorHandler = errorHandler; mErrorHandler = errorHandler;
} }
...@@ -92,13 +98,13 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle ...@@ -92,13 +98,13 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
} }
/** /**
* @see MessageReceiver#accept(MessageWithHeader) * @see MessageReceiver#accept(Message)
*/ */
@Override @Override
public boolean accept(MessageWithHeader message) { public boolean accept(Message message) {
try { try {
mMessagePipeHandle.writeMessage(message.getMessage().buffer, mMessagePipeHandle.writeMessage(message.buffer, message.handles,
message.getMessage().handles, MessagePipeHandle.WriteFlags.NONE); MessagePipeHandle.WriteFlags.NONE);
return true; return true;
} catch (MojoException e) { } catch (MojoException e) {
onError(e); onError(e);
...@@ -127,6 +133,15 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle ...@@ -127,6 +133,15 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
mMessagePipeHandle.close(); mMessagePipeHandle.close();
} }
private static AsyncWaiter getDefaultAsyncWaiterForMessagePipe(
MessagePipeHandle messagePipeHandle) {
if (messagePipeHandle.getCore() != null) {
return messagePipeHandle.getCore().getDefaultAsyncWaiter();
} else {
return null;
}
}
private class AsyncWaiterCallback implements AsyncWaiter.Callback { private class AsyncWaiterCallback implements AsyncWaiter.Callback {
/** /**
...@@ -163,7 +178,7 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle ...@@ -163,7 +178,7 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
mCancellable = null; mCancellable = null;
close(); close();
if (mErrorHandler != null) { if (mErrorHandler != null) {
mErrorHandler.onConnectionError(exception); mErrorHandler.onError(exception);
} }
} }
...@@ -187,7 +202,7 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle ...@@ -187,7 +202,7 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
int result; int result;
do { do {
try { try {
result = MessageWithHeader.readAndDispatchMessage(mMessagePipeHandle, result = Message.readAndDispatchMessage(mMessagePipeHandle,
mIncomingMessageReceiver); mIncomingMessageReceiver);
} catch (MojoException e) { } catch (MojoException e) {
onError(e); onError(e);
...@@ -207,4 +222,5 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle ...@@ -207,4 +222,5 @@ public class Connector implements MessageReceiver, HandleOwner<MessagePipeHandle
mCancellable = null; mCancellable = null;
} }
} }
} }
mojo/bindings/java/src/org/chromium/mojo/bindings/Message.java
View file @ af34023e
...@@ -6,6 +6,8 @@ package org.chromium.mojo.bindings; ...@@ -6,6 +6,8 @@ package org.chromium.mojo.bindings;
import org.chromium.mojo.system.Handle; import org.chromium.mojo.system.Handle;
import org.chromium.mojo.system.MessagePipeHandle; import org.chromium.mojo.system.MessagePipeHandle;
import org.chromium.mojo.system.MessagePipeHandle.ReadMessageResult;
import org.chromium.mojo.system.MojoResult;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.List; import java.util.List;
...@@ -36,4 +38,26 @@ public final class Message { ...@@ -36,4 +38,26 @@ public final class Message {
this.buffer = buffer; this.buffer = buffer;
this.handles = handles; this.handles = handles;
} }
/**
* Read a message, and pass it to the given |MessageReceiver| if not null. If the
* |MessageReceiver| is null, the message is lost.
*
* @param receiver The {@link MessageReceiver} that will receive the read {@link Message}. Can
* be <code>null</code>, in which case the message is discarded.
*/
public static int readAndDispatchMessage(MessagePipeHandle handle, MessageReceiver receiver) {
// TODO(qsr) Allow usage of a pool of pre-allocated buffer for performance.
ReadMessageResult result = handle.readMessage(null, 0, MessagePipeHandle.ReadFlags.NONE);
if (result.getMojoResult() != MojoResult.RESOURCE_EXHAUSTED) {
return result.getMojoResult();
}
ByteBuffer buffer = ByteBuffer.allocateDirect(result.getMessageSize());
result = handle.readMessage(buffer, result.getHandlesCount(),
MessagePipeHandle.ReadFlags.NONE);
if (receiver != null && result.getMojoResult() == MojoResult.OK) {
receiver.accept(new Message(buffer, result.getHandles()));
}
return result.getMojoResult();
}
} }
mojo/bindings/java/src/org/chromium/mojo/bindings/MessageHeader.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import org.chromium.mojo.bindings.Struct.DataHeader;
import java.nio.ByteBuffer;
import java.util.Objects;
/**
* Header information for a message.
*/
public class MessageHeader {
private static final int SIMPLE_MESSAGE_SIZE = 16;
private static final int SIMPLE_MESSAGE_NUM_FIELDS = 2;
private static final DataHeader SIMPLE_MESSAGE_STRUCT_INFO =
new DataHeader(SIMPLE_MESSAGE_SIZE, SIMPLE_MESSAGE_NUM_FIELDS);
private static final int MESSAGE_WITH_REQUEST_ID_SIZE = 24;
private static final int MESSAGE_WITH_REQUEST_ID_NUM_FIELDS = 3;
private static final DataHeader MESSAGE_WITH_REQUEST_ID_STRUCT_INFO =
new DataHeader(MESSAGE_WITH_REQUEST_ID_SIZE, MESSAGE_WITH_REQUEST_ID_NUM_FIELDS);
private static final int TYPE_OFFSET = 8;
private static final int FLAGS_OFFSET = 12;
private static final int REQUEST_ID_OFFSET = 16;
/**
* Flag for a header of a message that expected a response.
*/
public static final int MESSAGE_EXPECTS_RESPONSE_FLAG = 1 << 0;
/**
* Flag for a header of a message that is a response.
*/
public static final int MESSAGE_IS_RESPONSE_FLAG = 1 << 1;
private final DataHeader mDataHeader;
private final int mType;
private final int mFlags;
private long mRequestId;
/**
* Constructor for the header of a message which does not have a response.
*/
public MessageHeader(int type) {
mDataHeader = SIMPLE_MESSAGE_STRUCT_INFO;
mType = type;
mFlags = 0;
mRequestId = 0;
}
/**
* Constructor for the header of a message which have a response or being itself a response.
*/
public MessageHeader(int type, int flags, long requestId) {
assert mustHaveRequestId(flags);
mDataHeader = MESSAGE_WITH_REQUEST_ID_STRUCT_INFO;
mType = type;
mFlags = flags;
mRequestId = requestId;
}
/**
* Constructor, parsing the header from a message. Should only be used by {@link Message}
* itself.
*/
MessageHeader(Message message) {
Decoder decoder = new Decoder(message);
mDataHeader = decoder.readDataHeader();
validateDataHeader(mDataHeader);
mType = decoder.readInt(TYPE_OFFSET);
mFlags = decoder.readInt(FLAGS_OFFSET);
if (mustHaveRequestId(mFlags)) {
if (mDataHeader.size < MESSAGE_WITH_REQUEST_ID_SIZE) {
throw new DeserializationException("Incorrect message size, expecting at least "
+ MESSAGE_WITH_REQUEST_ID_SIZE
+ " for a message with a request identifier, but got: " + mDataHeader.size);
}
mRequestId = decoder.readLong(REQUEST_ID_OFFSET);
} else {
mRequestId = 0;
}
}
/**
* Returns the size in bytes of the serialization of the header.
*/
public int getSize() {
return mDataHeader.size;
}
/**
* Returns the type of the message.
*/
public int getType() {
return mType;
}
/**
* Returns the flags associated to the message.
*/
public int getFlags() {
return mFlags;
}
/**
* Returns if the message has the given flag.
*/
public boolean hasFlag(int flag) {
return (mFlags & flag) == flag;
}
/**
* Returns if the message has a request id.
*/
public boolean hasRequestId() {
return mustHaveRequestId(mFlags);
}
/**
* Return the request id for the message. Must only be called if the message has a request id.
*/
public long getRequestId() {
assert hasRequestId();
return mRequestId;
}
/**
* Encode the header.
*/
public void encode(Encoder encoder) {
encoder.encode(mDataHeader);
encoder.encode(getType(), TYPE_OFFSET);
encoder.encode(getFlags(), FLAGS_OFFSET);
if (hasRequestId()) {
encoder.encode(getRequestId(), REQUEST_ID_OFFSET);
}
}
/**
* Returns true if the header has the expected flags. Only considers flags this class knows
* about in order to allow this class to work with future version of the header format.
*/
public boolean validateHeader(int expectedFlags) {
int knownFlags = getFlags() & (MESSAGE_EXPECTS_RESPONSE_FLAG | MESSAGE_IS_RESPONSE_FLAG);
return knownFlags == expectedFlags;
}
/**
* Returns true if the header has the expected type and flags. Only consider flags this class
* knows about in order to allow this class to work with future version of the header format.
*/
public boolean validateHeader(int expectedType, int expectedFlags) {
return getType() == expectedType && validateHeader(expectedFlags);
}
/**
* @see Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((mDataHeader == null) ? 0 : mDataHeader.hashCode());
result = prime * result + mFlags;
result = prime * result + (int) (mRequestId ^ (mRequestId >>> 32));
result = prime * result + mType;
return result;
}
/**
* @see Object#equals(Object)
*/
@Override
public boolean equals(Object object) {
if (object == this)
return true;
if (object == null)
return false;
if (getClass() != object.getClass())
return false;
MessageHeader other = (MessageHeader) object;
return (Objects.equals(mDataHeader, other.mDataHeader) &&
mFlags == other.mFlags &&
mRequestId == other.mRequestId &&
mType == other.mType);
}
/**
* Set the request id on the message contained in the given buffer.
*/
void setRequestId(ByteBuffer buffer, long requestId) {
assert mustHaveRequestId(buffer.getInt(FLAGS_OFFSET));
buffer.putLong(REQUEST_ID_OFFSET, requestId);
mRequestId = requestId;
}
/**
* Returns whether a message with the given flags must have a request Id.
*/
private static boolean mustHaveRequestId(int flags) {
return (flags & (MESSAGE_EXPECTS_RESPONSE_FLAG | MESSAGE_IS_RESPONSE_FLAG)) != 0;
}
/**
* Validate that the given {@link DataHeader} can be the data header of a message header.
*/
private static void validateDataHeader(DataHeader dataHeader) {
if (dataHeader.numFields < SIMPLE_MESSAGE_NUM_FIELDS) {
throw new DeserializationException(
"Incorrect number of fields, expecting at least " + SIMPLE_MESSAGE_NUM_FIELDS
+ ", but got: " + dataHeader.numFields);
}
if (dataHeader.size < SIMPLE_MESSAGE_SIZE) {
throw new DeserializationException(
"Incorrect message size, expecting at least " + SIMPLE_MESSAGE_SIZE
+ ", but got: " + dataHeader.size);
}
if (dataHeader.numFields == SIMPLE_MESSAGE_NUM_FIELDS
&& dataHeader.size != SIMPLE_MESSAGE_SIZE) {
throw new DeserializationException(
"Incorrect message size for a message with " + SIMPLE_MESSAGE_NUM_FIELDS
+ " fields, expecting " + SIMPLE_MESSAGE_SIZE + ", but got: "
+ dataHeader.size);
}
if (dataHeader.numFields == MESSAGE_WITH_REQUEST_ID_NUM_FIELDS
&& dataHeader.size != MESSAGE_WITH_REQUEST_ID_SIZE) {
throw new DeserializationException(
"Incorrect message size for a message with "
+ MESSAGE_WITH_REQUEST_ID_NUM_FIELDS + " fields, expecting "
+ MESSAGE_WITH_REQUEST_ID_SIZE + ", but got: " + dataHeader.size);
}
}
}
mojo/bindings/java/src/org/chromium/mojo/bindings/MessageReceiver.java
View file @ af34023e
...@@ -10,8 +10,8 @@ package org.chromium.mojo.bindings; ...@@ -10,8 +10,8 @@ package org.chromium.mojo.bindings;
public interface MessageReceiver { public interface MessageReceiver {
/** /**
* Receive a {@link MessageWithHeader}. The {@link MessageReceiver} is allowed to mutable the * Receive a {@link Message}. The {@link MessageReceiver} is allowed to mutable the message.
* message. Returns |true| if the message has been handled, |false| otherwise. * Returns |true| if the message has been handled, |false| otherwise.
*/ */
boolean accept(MessageWithHeader message); boolean accept(Message message);
} }
mojo/bindings/java/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
/**
* A {@link MessageReceiver} that can also handle the handle the response message generated from the
* given message.
*/
public interface MessageReceiverWithResponder extends MessageReceiver {
/**
* A variant on {@link #accept(MessageWithHeader)} that registers a {@link MessageReceiver}
* (known as the responder) to handle the response message generated from the given message. The
* responder's {@link #accept(MessageWithHeader)} method may be called as part of the call to
* {@link #acceptWithResponder(MessageWithHeader, MessageReceiver)}, or some time after its
* return.
*/
boolean acceptWithResponder(MessageWithHeader message, MessageReceiver responder);
}
mojo/bindings/java/src/org/chromium/mojo/bindings/MessageWithHeader.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import org.chromium.mojo.system.MessagePipeHandle;
import org.chromium.mojo.system.MessagePipeHandle.ReadMessageResult;
import org.chromium.mojo.system.MojoResult;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
/**
* Represents a {@link Message} which contains a {@link MessageHeader}. Deals with parsing the
* {@link MessageHeader} for a message.
*/
public class MessageWithHeader {
private final Message mBaseMessage;
private final MessageHeader mHeader;
private Message mPayload;
/**
* Reinterpret the given |message| as a message with the given |header|. The |message| must
* contain the |header| as the start of its raw data.
*/
public MessageWithHeader(Message baseMessage, MessageHeader header) {
assert header.equals(new org.chromium.mojo.bindings.MessageHeader(baseMessage));
this.mBaseMessage = baseMessage;
this.mHeader = header;
}
/**
* Reinterpret the given |message| as a message with a header. The |message| must contain a
* header as the start of it's raw data, which will be parsed by this constructor.
*/
public MessageWithHeader(Message baseMessage) {
this(baseMessage, new org.chromium.mojo.bindings.MessageHeader(baseMessage));
}
/**
* Returns the header of the given message. This will throw a {@link DeserializationException}
* if the start of the message is not a valid header.
*/
public MessageHeader getHeader() {
return mHeader;
}
/**
* Returns the payload of the message.
*/
public Message getPayload() {
if (mPayload == null) {
ByteBuffer truncatedBuffer = ((ByteBuffer) mBaseMessage.buffer.position(
getHeader().getSize())).slice();
truncatedBuffer.order(ByteOrder.nativeOrder());
mPayload = new Message(truncatedBuffer, mBaseMessage.handles);
}
return mPayload;
}
/**
* Returns the raw message.
*/
public Message getMessage() {
return mBaseMessage;
}
/**
* Set the request identifier on the message.
*/
void setRequestId(long requestId) {
mHeader.setRequestId(mBaseMessage.buffer, requestId);
}
/**
* Read a message, and pass it to the given |MessageReceiver| if not null. If the
* |MessageReceiver| is null, the message is lost.
*
* @param receiver The {@link MessageReceiver} that will receive the read {@link Message}. Can
* be <code>null</code>, in which case the message is discarded.
*/
public static int readAndDispatchMessage(MessagePipeHandle handle, MessageReceiver receiver) {
// TODO(qsr) Allow usage of a pool of pre-allocated buffer for performance.
ReadMessageResult result = handle.readMessage(null, 0, MessagePipeHandle.ReadFlags.NONE);
if (result.getMojoResult() != MojoResult.RESOURCE_EXHAUSTED) {
return result.getMojoResult();
}
ByteBuffer buffer = ByteBuffer.allocateDirect(result.getMessageSize());
result = handle.readMessage(buffer, result.getHandlesCount(),
MessagePipeHandle.ReadFlags.NONE);
if (receiver != null && result.getMojoResult() == MojoResult.OK) {
receiver.accept(new MessageWithHeader(new Message(buffer, result.getHandles())));
}
return result.getMojoResult();
}
}
mojo/bindings/java/src/org/chromium/mojo/bindings/Router.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import org.chromium.mojo.system.MessagePipeHandle;
/**
* A {@link Router} will handle mojo message and forward those to a {@link Connector}. It deals with
* parsing of headers and adding of request ids in order to be able to match a response to a
* request.
*/
public interface Router extends MessageReceiverWithResponder, HandleOwner<MessagePipeHandle> {
/**
* Start listening for incoming messages.
*/
public void start();
/**
* Set the {@link MessageReceiverWithResponder} that will deserialize and use the message
* received from the pipe.
*/
public void setIncomingMessageReceiver(MessageReceiverWithResponder incomingMessageReceiver);
/**
* Set the handle that will be notified of errors on the message pipe.
*/
public void setErrorHandler(ConnectionErrorHandler errorHandler);
/**
* @see java.io.Closeable#close()
*/
@Override
public void close();
}
mojo/bindings/java/src/org/chromium/mojo/bindings/RouterImpl.java deleted 100644 → 0
View file @ 376fa417
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.mojo.bindings;
import org.chromium.mojo.system.AsyncWaiter;
import org.chromium.mojo.system.MessagePipeHandle;
import java.util.HashMap;
import java.util.Map;
/**
* Implementation of {@link Router}.
*/
public class RouterImpl implements Router {
/**
* {@link MessageReceiver} used as the {@link Connector} callback.
*/
private class ResponderThunk implements MessageReceiver {
/**
* @see MessageReceiver#accept(MessageWithHeader)
*/
@Override
public boolean accept(MessageWithHeader message) {
return handleIncomingMessage(message);
}
}
/**
* The {@link Connector} which is connected to the handle.
*/
private final Connector mConnector;
/**
* The {@link MessageReceiverWithResponder} that will consume the messages received from the
* pipe.
*/
private MessageReceiverWithResponder mIncomingMessageReceiver;
/**
* The next id to use for a request id which needs a response. It is auto-incremented.
*/
private long mNextRequestId = 1;
/**
* The map from request ids to {@link MessageReceiver} of request currently in flight.
*/
private Map<Long, MessageReceiver> mResponders = new HashMap<Long, MessageReceiver>();
/**
* Constructor that will use the default {@link AsyncWaiter}.
*
* @param messagePipeHandle The {@link MessagePipeHandle} to route message for.
*/
public RouterImpl(MessagePipeHandle messagePipeHandle) {
this(messagePipeHandle, BindingsHelper.getDefaultAsyncWaiterForHandle(messagePipeHandle));
}
/**
* Constructor.
*
* @param messagePipeHandle The {@link MessagePipeHandle} to route message for.
* @param asyncWaiter the {@link AsyncWaiter} to use to get notification of new messages on the
* handle.
*/
public RouterImpl(MessagePipeHandle messagePipeHandle, AsyncWaiter asyncWaiter) {
mConnector = new Connector(messagePipeHandle, asyncWaiter);
mConnector.setIncomingMessageReceiver(new ResponderThunk());
}
/**
* @see org.chromium.mojo.bindings.Router#start()
*/
@Override
public void start() {
mConnector.start();
}
/**
* @see Router#setIncomingMessageReceiver(MessageReceiverWithResponder)
*/
@Override
public void setIncomingMessageReceiver(MessageReceiverWithResponder incomingMessageReceiver) {
this.mIncomingMessageReceiver = incomingMessageReceiver;
}
/**
* @see MessageReceiver#accept(MessageWithHeader)
*/
@Override
public boolean accept(MessageWithHeader message) {
// A message without responder is directly forwarded to the connector.
return mConnector.accept(message);
}
/**
* @see MessageReceiverWithResponder#acceptWithResponder(MessageWithHeader, MessageReceiver)
*/
@Override
public boolean acceptWithResponder(MessageWithHeader message, MessageReceiver responder) {
// Checking the message expects a response.
assert message.getHeader().hasFlag(MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG);
// Compute a request id for being able to route the response.
long requestId = mNextRequestId++;
// Reserve 0 in case we want it to convey special meaning in the future.
if (requestId == 0) {
requestId = mNextRequestId++;
}
if (mResponders.containsKey(requestId)) {
throw new IllegalStateException("Unable to find a new request identifier.");
}
message.setRequestId(requestId);
if (!mConnector.accept(message)) {
return false;
}
// Only keep the responder is the message has been accepted.
mResponders.put(requestId, responder);
return true;
}
/**
* @see org.chromium.mojo.bindings.HandleOwner#passHandle()
*/
@Override
public MessagePipeHandle passHandle() {
return mConnector.passHandle();
}
/**
* @see java.io.Closeable#close()
*/
@Override
public void close() {
mConnector.close();
}
/**
* @see Router#setErrorHandler(ConnectionErrorHandler)
*/
@Override
public void setErrorHandler(ConnectionErrorHandler errorHandler) {
mConnector.setErrorHandler(errorHandler);
}
/**
* Receive a message from the connector. Returns |true| if the message has been handled.
*/
private boolean handleIncomingMessage(MessageWithHeader message) {
MessageHeader header = message.getHeader();
if (header.hasFlag(MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG)) {
if (mIncomingMessageReceiver != null) {
return mIncomingMessageReceiver.acceptWithResponder(message, this);
}
// If we receive a request expecting a response when the client is not
// listening, then we have no choice but to tear down the pipe.
close();
return false;
} else if (header.hasFlag(MessageHeader.MESSAGE_IS_RESPONSE_FLAG)) {
long requestId = header.getRequestId();
MessageReceiver responder = mResponders.get(requestId);
if (responder == null) {
return false;
}
return responder.accept(message);
} else {
if (mIncomingMessageReceiver != null) {
return mIncomingMessageReceiver.accept(message);
}
// OK to drop the message.
}
return false;
}
}
mojo/bindings/java/src/org/chromium/mojo/bindings/Struct.java
View file @ af34023e
...@@ -42,35 +42,6 @@ public abstract class Struct { ...@@ -42,35 +42,6 @@ public abstract class Struct {
this.size = size; this.size = size;
this.numFields = numFields; this.numFields = numFields;
} }
/**
* @see Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + numFields;
result = prime * result + size;
return result;
}
/**
* @see Object#equals(Object)
*/
@Override
public boolean equals(Object object) {
if (object == this)
return true;
if (object == null)
return false;
if (getClass() != object.getClass())
return false;
DataHeader other = (DataHeader) object;
return (numFields == other.numFields &&
size == other.size);
}
} }
/** /**
...@@ -102,18 +73,4 @@ public abstract class Struct { ...@@ -102,18 +73,4 @@ public abstract class Struct {
return encoder.getMessage(); return encoder.getMessage();
} }
/**
* Returns the serialization of the struct prepended with the given header.
*
* @param header the header to prepend to the returned message.
* @param core the |Core| implementation used to generate handles. Only used if the |Struct|
* being encoded contains interfaces, can be |null| otherwise.
*/
public MessageWithHeader serializeWithHeader(Core core, MessageHeader header) {
Encoder encoder = new Encoder(core, mEncodedBaseSize + header.getSize());
header.encode(encoder);
encode(encoder);
return new MessageWithHeader(encoder.getMessage(), header);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment