grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More exposed APIs to support internal transition. (#8303) 

All maked with Internal to make it clear these APIs shouldn't
be used normally.
This commit is contained in:
markb74 2021-07-05 13:12:49 +02:00 committed by GitHub
parent 0cabf5672a
commit d4ecc7cdb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java
View File

@ -46,7 +46,7 @@ public class AndroidComponentAddress extends SocketAddress { // NOTE: Only tempo
private final Intent bindIntent; // An "explicit" Intent. In other words, getComponent() != null. private final Intent bindIntent; // An "explicit" Intent. In other words, getComponent() != null.
private AndroidComponentAddress(Intent bindIntent) { protected AndroidComponentAddress(Intent bindIntent) {
checkArgument(bindIntent.getComponent() != null, "Missing required component"); checkArgument(bindIntent.getComponent() != null, "Missing required component");
this.bindIntent = bindIntent; this.bindIntent = bindIntent;
} }

30
binder/src/main/java/io/grpc/binder/internal/BinderTransport.java
View File

@ -33,6 +33,7 @@ import com.google.common.util.concurrent.ListenableFuture;
import io.grpc.Attributes; import io.grpc.Attributes;
import io.grpc.CallOptions; import io.grpc.CallOptions;
import io.grpc.Grpc; import io.grpc.Grpc;
import io.grpc.Internal;
import io.grpc.InternalChannelz.SocketStats; import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalLogId; import io.grpc.InternalLogId;
import io.grpc.Metadata; import io.grpc.Metadata;
@ -105,13 +106,16 @@ public abstract class BinderTransport
* Attribute used to store the Android UID of the remote app. This is guaranteed to be set on any * Attribute used to store the Android UID of the remote app. This is guaranteed to be set on any
* active transport. * active transport.
*/ */
static final Attributes.Key<Integer> REMOTE_UID = Attributes.Key.create("remote-uid"); @Internal
public static final Attributes.Key<Integer> REMOTE_UID = Attributes.Key.create("remote-uid");
/** The authority of the server. */ /** The authority of the server. */
static final Attributes.Key<String> SERVER_AUTHORITY = Attributes.Key.create("server-authority"); @Internal
public static final Attributes.Key<String> SERVER_AUTHORITY = Attributes.Key.create("server-authority");
/** A transport attribute to hold the {@link InboundParcelablePolicy}. */ /** A transport attribute to hold the {@link InboundParcelablePolicy}. */
static final Attributes.Key<InboundParcelablePolicy> INBOUND_PARCELABLE_POLICY = @Internal
public static final Attributes.Key<InboundParcelablePolicy> INBOUND_PARCELABLE_POLICY =
Attributes.Key.create("inbound-parcelable-policy"); Attributes.Key.create("inbound-parcelable-policy");
/** /**
@ -120,10 +124,12 @@ public abstract class BinderTransport
* <p>Should this change, we should still endeavor to support earlier wire-format versions. If * <p>Should this change, we should still endeavor to support earlier wire-format versions. If
* that's not possible, {@link EARLIEST_SUPPORTED_WIRE_FORMAT_VERSION} should be updated below. * that's not possible, {@link EARLIEST_SUPPORTED_WIRE_FORMAT_VERSION} should be updated below.
*/ */
static final int WIRE_FORMAT_VERSION = 1; @Internal
public static final int WIRE_FORMAT_VERSION = 1;
/** The version code of the earliest wire format we support. */ /** The version code of the earliest wire format we support. */
static final int EARLIEST_SUPPORTED_WIRE_FORMAT_VERSION = 1; @Internal
public static final int EARLIEST_SUPPORTED_WIRE_FORMAT_VERSION = 1;
/** The max number of "in-flight" bytes before we start buffering transactions. */ /** The max number of "in-flight" bytes before we start buffering transactions. */
private static final int TRANSACTION_BYTES_WINDOW = 128 * 1024; private static final int TRANSACTION_BYTES_WINDOW = 128 * 1024;
@ -136,10 +142,12 @@ public abstract class BinderTransport
* the binder. and from the host s Followed by: int wire_protocol_version IBinder * the binder. and from the host s Followed by: int wire_protocol_version IBinder
* client_transports_callback_binder * client_transports_callback_binder
*/ */
static final int SETUP_TRANSPORT = IBinder.FIRST_CALL_TRANSACTION; @Internal
public static final int SETUP_TRANSPORT = IBinder.FIRST_CALL_TRANSACTION;
/** Send to shutdown the transport from either end. */ /** Send to shutdown the transport from either end. */
static final int SHUTDOWN_TRANSPORT = IBinder.FIRST_CALL_TRANSACTION + 1; @Internal
public static final int SHUTDOWN_TRANSPORT = IBinder.FIRST_CALL_TRANSACTION + 1;
/** Send to acknowledge receipt of rpc bytes, for flow control. */ /** Send to acknowledge receipt of rpc bytes, for flow control. */
static final int ACKNOWLEDGE_BYTES = IBinder.FIRST_CALL_TRANSACTION + 2; static final int ACKNOWLEDGE_BYTES = IBinder.FIRST_CALL_TRANSACTION + 2;
@ -544,6 +552,7 @@ public abstract class BinderTransport
/** Concrete client-side transport implementation. */ /** Concrete client-side transport implementation. */
@ThreadSafe @ThreadSafe
@Internal
public static final class BinderClientTransport extends BinderTransport public static final class BinderClientTransport extends BinderTransport
implements ConnectionClientTransport, Bindable.Observer { implements ConnectionClientTransport, Bindable.Observer {
@ -799,12 +808,13 @@ public abstract class BinderTransport
} }
/** Concrete server-side transport implementation. */ /** Concrete server-side transport implementation. */
static final class BinderServerTransport extends BinderTransport implements ServerTransport { @Internal
public static final class BinderServerTransport extends BinderTransport implements ServerTransport {
private final List<ServerStreamTracer.Factory> streamTracerFactories; private final List<ServerStreamTracer.Factory> streamTracerFactories;
@Nullable private ServerTransportListener serverTransportListener; @Nullable private ServerTransportListener serverTransportListener;
BinderServerTransport( public BinderServerTransport(
ObjectPool<ScheduledExecutorService> executorServicePool, ObjectPool<ScheduledExecutorService> executorServicePool,
Attributes attributes, Attributes attributes,
List<ServerStreamTracer.Factory> streamTracerFactories, List<ServerStreamTracer.Factory> streamTracerFactories,
@ -814,7 +824,7 @@ public abstract class BinderTransport
setOutgoingBinder(callbackBinder); setOutgoingBinder(callbackBinder);
} }
synchronized void setServerTransportListener(ServerTransportListener serverTransportListener) { public synchronized void setServerTransportListener(ServerTransportListener serverTransportListener) {
this.serverTransportListener = serverTransportListener; this.serverTransportListener = serverTransportListener;
if (isShutdown()) { if (isShutdown()) {
setState(TransportState.SHUTDOWN_TERMINATED); setState(TransportState.SHUTDOWN_TERMINATED);

6
binder/src/main/java/io/grpc/binder/internal/BoundClientAddress.java
View File

@ -16,17 +16,19 @@
package io.grpc.binder.internal; package io.grpc.binder.internal;
import io.grpc.Internal;
import java.net.SocketAddress; import java.net.SocketAddress;
/** An address to represent a binding from a remote client. */ /** An address to represent a binding from a remote client. */
final class BoundClientAddress extends SocketAddress { @Internal
public final class BoundClientAddress extends SocketAddress {
private static final long serialVersionUID = 0L; private static final long serialVersionUID = 0L;
/** The UID of the address. For incoming binder transactions, this is all the info we have. */ /** The UID of the address. For incoming binder transactions, this is all the info we have. */
private final int uid; private final int uid;
BoundClientAddress(int uid) { public BoundClientAddress(int uid) {
this.uid = uid; this.uid = uid;
} }

11
binder/src/main/java/io/grpc/binder/internal/LeakSafeOneWayBinder.java
View File

@ -18,6 +18,7 @@ package io.grpc.binder.internal;
import android.os.Binder; import android.os.Binder;
import android.os.Parcel; import android.os.Parcel;
import io.grpc.Internal;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -34,21 +35,23 @@ import javax.annotation.Nullable;
* <p>Since two-way transactions block the calling thread on a remote process, this class only * <p>Since two-way transactions block the calling thread on a remote process, this class only
* supports one-way calls. * supports one-way calls.
*/ */
final class LeakSafeOneWayBinder extends Binder { @Internal
public final class LeakSafeOneWayBinder extends Binder {
private static final Logger logger = Logger.getLogger(LeakSafeOneWayBinder.class.getName()); private static final Logger logger = Logger.getLogger(LeakSafeOneWayBinder.class.getName());
interface TransactionHandler { @Internal
public interface TransactionHandler {
boolean handleTransaction(int code, Parcel data); boolean handleTransaction(int code, Parcel data);
} }
@Nullable private TransactionHandler handler; @Nullable private TransactionHandler handler;
LeakSafeOneWayBinder(TransactionHandler handler) { public LeakSafeOneWayBinder(TransactionHandler handler) {
this.handler = handler; this.handler = handler;
} }
void detach() { public void detach() {
handler = null; handler = null;
} }