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

Fix more null proto refs

This commit is contained in:
Carl Mastrangelo 2016-04-27 14:11:12 -07:00
parent 8825f355df
commit 43b73f34cb
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadWorker.java
View File

@ -35,6 +35,9 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.benchmarks.proto.Control; import io.grpc.benchmarks.proto.Control;
import io.grpc.benchmarks.proto.Control.ClientArgs;
import io.grpc.benchmarks.proto.Control.ServerArgs;
import io.grpc.benchmarks.proto.Control.ServerArgs.ArgtypeCase;
import io.grpc.benchmarks.proto.WorkerServiceGrpc; import io.grpc.benchmarks.proto.WorkerServiceGrpc;
import io.grpc.internal.ServerImpl; import io.grpc.internal.ServerImpl;
import io.grpc.netty.NettyServerBuilder; import io.grpc.netty.NettyServerBuilder;
@ -137,13 +140,14 @@ public class LoadWorker {
private LoadClient workerClient; private LoadClient workerClient;
@Override @Override
public StreamObserver<Control.ServerArgs> runServer( public StreamObserver<ServerArgs> runServer(
final StreamObserver<Control.ServerStatus> responseObserver) { final StreamObserver<Control.ServerStatus> responseObserver) {
return new StreamObserver<Control.ServerArgs>() { return new StreamObserver<ServerArgs>() {
@Override @Override
public void onNext(Control.ServerArgs value) { public void onNext(ServerArgs value) {
try { try {
if (value.getSetup() != null && workerServer == null) { ArgtypeCase argTypeCase = value.getArgtypeCase();
if (argTypeCase == ServerArgs.ArgtypeCase.SETUP && workerServer == null) {
if (serverPort != 0 && value.getSetup().getPort() == 0) { if (serverPort != 0 && value.getSetup().getPort() == 0) {
Control.ServerArgs.Builder builder = value.toBuilder(); Control.ServerArgs.Builder builder = value.toBuilder();
builder.getSetupBuilder().setPort(serverPort); builder.getSetupBuilder().setPort(serverPort);
@ -155,7 +159,7 @@ public class LoadWorker {
.setPort(workerServer.getPort()) .setPort(workerServer.getPort())
.setCores(workerServer.getCores()) .setCores(workerServer.getCores())
.build()); .build());
} else if (value.getMark() != null && workerServer != null) { } else if (argTypeCase == ArgtypeCase.MARK && workerServer != null) {
responseObserver.onNext(Control.ServerStatus.newBuilder() responseObserver.onNext(Control.ServerStatus.newBuilder()
.setStats(workerServer.getStats()) .setStats(workerServer.getStats())
.build()); .build());
@ -196,17 +200,18 @@ public class LoadWorker {
} }
@Override @Override
public StreamObserver<Control.ClientArgs> runClient( public StreamObserver<ClientArgs> runClient(
final StreamObserver<Control.ClientStatus> responseObserver) { final StreamObserver<Control.ClientStatus> responseObserver) {
return new StreamObserver<Control.ClientArgs>() { return new StreamObserver<ClientArgs>() {
@Override @Override
public void onNext(Control.ClientArgs value) { public void onNext(ClientArgs value) {
try { try {
if (value.getSetup() != null && workerClient == null) { ClientArgs.ArgtypeCase argTypeCase = value.getArgtypeCase();
if (argTypeCase == ClientArgs.ArgtypeCase.SETUP && workerClient == null) {
workerClient = new LoadClient(value.getSetup()); workerClient = new LoadClient(value.getSetup());
workerClient.start(); workerClient.start();
responseObserver.onNext(Control.ClientStatus.newBuilder().build()); responseObserver.onNext(Control.ClientStatus.newBuilder().build());
} else if (value.getMark() != null && workerClient != null) { } else if (argTypeCase == ClientArgs.ArgtypeCase.MARK && workerClient != null) {
responseObserver.onNext(Control.ClientStatus.newBuilder() responseObserver.onNext(Control.ClientStatus.newBuilder()
.setStats(workerClient.getStats()) .setStats(workerClient.getStats())
.build()); .build());