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

Update benchmark code to handle both implementations

This commit is contained in:
murgatroid99 2018-04-19 16:10:48 -07:00
parent 8176c70a94
commit cad47e4de8
6 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/package.json
View File

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

16
test/performance/benchmark_client.js
View File

@ -36,10 +36,16 @@ var Histogram = require('./histogram');
var genericService = require('./generic_service'); var genericService = require('./generic_service');
// TODO(murgatroid99): use multiple grpc implementations // TODO(murgatroid99): use multiple grpc implementations
var grpc = require('grpc'); var grpc = require('../any_grpc').client;
var serviceProto = grpc.load({ var protoLoader = require('../../packages/grpc-protobufjs');
root: __dirname + '/../packages/grpc-native-core/ext/grpc', var protoPackage = protoLoader.loadSync(
file: 'src/proto/grpc/testing/services.proto'}).grpc.testing; '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 * Create a buffer filled with size zeroes
@ -82,7 +88,7 @@ function BenchmarkClient(server_targets, channels, histogram_params,
if (security_params) { if (security_params) {
var ca_path; var ca_path;
if (security_params.use_test_ca) { 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); var ca_data = fs.readFileSync(ca_path);
creds = grpc.credentials.createSsl(ca_data); creds = grpc.credentials.createSsl(ca_data);
} else { } else {

2
test/performance/benchmark_client_express.js
View File

@ -60,7 +60,7 @@ function BenchmarkClient(server_targets, channels, histogram_params,
protocol = https; protocol = https;
this.request = _.bind(https.request, https); this.request = _.bind(https.request, https);
if (security_params.use_test_ca) { 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); var ca_data = fs.readFileSync(ca_path);
options.ca = ca_data; options.ca = ca_data;
} }

19
test/performance/benchmark_server.js
View File

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

4
test/performance/benchmark_server_express.js
View File

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

15
test/performance/worker.js
View File

@ -21,11 +21,16 @@
var console = require('console'); var console = require('console');
var WorkerServiceImpl = require('./worker_service_impl'); var WorkerServiceImpl = require('./worker_service_impl');
// TODO(murgatroid99): use multiple grpc implementations var grpc = require('../any_grpc').server;
var grpc = require('grpc'); var protoLoader = require('../../packages/grpc-protobufjs');
var serviceProto = grpc.load({ var protoPackage = protoLoader.loadSync(
root: __dirname + '/../packages/grpc-native-core/ext/grpc', 'src/proto/grpc/testing/services.proto',
file: 'src/proto/grpc/testing/services.proto'}).grpc.testing; {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) { function runServer(port, benchmark_impl) {
var server_creds = grpc.ServerCredentials.createInsecure(); var server_creds = grpc.ServerCredentials.createInsecure();