Merge pull request #286 from murgatroid99/cross_impl_perf_tests

Update benchmark code to handle both implementations

packages/grpc-js-core/src/channel.ts

@@ -191,6 +191,7 @@ export class Http2Channel extends EventEmitter implements Channel {
                              ConnectivityState.TRANSIENT_FAILURE);
     };
     subChannel.once('close', this.subChannelCloseCallback);
+    subChannel.once('error', this.subChannelCloseCallback);
   }
 
   constructor(

packages/grpc-js-core/src/index.ts

@@ -85,3 +85,8 @@ export {
  * @param client The client to close.
  */
 export const closeClient = (client: Client) => client.close();
+
+export const waitForClientReady =
+    (client: Client, deadline: Date|number,
+     callback: (error: Error|null) => void) =>
+        client.waitForReady(deadline, callback);

test/package.json

@@ -14,7 +14,9 @@
     }
   ],
   "dependencies": {
+    "express": "^4.16.3",
     "google-auth-library": "^0.9.2",
-    "lodash": "^4.17.4"
+    "lodash": "^4.17.4",
+    "poisson-process": "^1.0.0"
   }
 }

test/performance/benchmark_client.js

@@ -36,10 +36,16 @@ var Histogram = require('./histogram');
 var genericService = require('./generic_service');
 
 // TODO(murgatroid99): use multiple grpc implementations
-var grpc = require('grpc');
-var serviceProto = grpc.load({
-  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
-  file: 'src/proto/grpc/testing/services.proto'}).grpc.testing;
+var grpc = require('../any_grpc').client;
+var protoLoader = require('../../packages/grpc-protobufjs');
+var protoPackage = protoLoader.loadSync(
+    'src/proto/grpc/testing/services.proto',
+    {keepCase: true,
+     defaults: true,
+     enums: String,
+     oneofs: true,
+     include: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
+var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
 
 /**
  * Create a buffer filled with size zeroes
@@ -82,7 +88,7 @@ function BenchmarkClient(server_targets, channels, histogram_params,
   if (security_params) {
     var ca_path;
     if (security_params.use_test_ca) {
-      ca_path = path.join(__dirname, '../test/data/ca.pem');
+      ca_path = path.join(__dirname, '../data/ca.pem');
       var ca_data = fs.readFileSync(ca_path);
       creds = grpc.credentials.createSsl(ca_data);
     } else {

test/performance/benchmark_client_express.js

@@ -60,7 +60,7 @@ function BenchmarkClient(server_targets, channels, histogram_params,
     protocol = https;
     this.request = _.bind(https.request, https);
     if (security_params.use_test_ca) {
-      ca_path = path.join(__dirname, '../test/data/ca.pem');
+      ca_path = path.join(__dirname, '../data/ca.pem');
       var ca_data = fs.readFileSync(ca_path);
       options.ca = ca_data;
     }

test/performance/benchmark_server.js

@@ -30,11 +30,16 @@ var util = require('util');
 
 var genericService = require('./generic_service');
 
-// TODO(murgatroid99): use multiple grpc implementations
-var grpc = require('grpc');
-var serviceProto = grpc.load({
-  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
-  file: 'src/proto/grpc/testing/services.proto'}).grpc.testing;
+var grpc = require('../any_grpc').server;
+var protoLoader = require('../../packages/grpc-protobufjs');
+var protoPackage = protoLoader.loadSync(
+    'src/proto/grpc/testing/services.proto',
+    {keepCase: true,
+     defaults: true,
+     enums: String,
+     oneofs: true,
+     include: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
+var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
 
 /**
  * Create a buffer filled with size zeroes
@@ -106,8 +111,8 @@ function BenchmarkServer(host, port, tls, generic, response_size) {
   var server_creds;
   var host_override;
   if (tls) {
-    var key_path = path.join(__dirname, '../test/data/server1.key');
-    var pem_path = path.join(__dirname, '../test/data/server1.pem');
+    var key_path = path.join(__dirname, '../data/server1.key');
+    var pem_path = path.join(__dirname, '../data/server1.pem');
 
     var key_data = fs.readFileSync(key_path);
     var pem_data = fs.readFileSync(pem_path);

test/performance/benchmark_server_express.js

@@ -47,8 +47,8 @@ function BenchmarkServer(host, port, tls, generic, response_size) {
   this.input_port = port;
   if (tls) {
     var credentials = {};
-    var key_path = path.join(__dirname, '../test/data/server1.key');
-    var pem_path = path.join(__dirname, '../test/data/server1.pem');
+    var key_path = path.join(__dirname, '../data/server1.key');
+    var pem_path = path.join(__dirname, '../data/server1.pem');
 
     var key_data = fs.readFileSync(key_path);
     var pem_data = fs.readFileSync(pem_path);

test/performance/worker.js

@@ -21,11 +21,16 @@
 var console = require('console');
 var WorkerServiceImpl = require('./worker_service_impl');
 
-// TODO(murgatroid99): use multiple grpc implementations
-var grpc = require('grpc');
-var serviceProto = grpc.load({
-  root: __dirname + '/../packages/grpc-native-core/ext/grpc',
-  file: 'src/proto/grpc/testing/services.proto'}).grpc.testing;
+var grpc = require('../any_grpc').server;
+var protoLoader = require('../../packages/grpc-protobufjs');
+var protoPackage = protoLoader.loadSync(
+    'src/proto/grpc/testing/services.proto',
+    {keepCase: true,
+     defaults: true,
+     enums: String,
+     oneofs: true,
+     include: [__dirname + '/../../packages/grpc-native-core/deps/grpc']});
+var serviceProto = grpc.loadPackageDefinition(protoPackage).grpc.testing;
 
 function runServer(port, benchmark_impl) {
   var server_creds = grpc.ServerCredentials.createInsecure();