From 5a95666f6e3f1cae3fdd790d992a45c0b64c3b13 Mon Sep 17 00:00:00 2001 From: Yilun Chong Date: Wed, 8 Aug 2018 11:24:09 -0700 Subject: [PATCH] fix filename and newline --- benchmarks/Makefile.am | 10 +++++----- .../js/{BenchmarkSuite.js => benchmark_suite.js} | 2 +- benchmarks/js/{JsBenchmark.js => js_benchmark.js} | 5 +++-- .../{GeneratePbjsFiles.js => generate_pbjs_files.js} | 3 ++- ...{ProtobufJsBenchmark.js => protobufjs_benchmark.js} | 7 ++++--- 5 files changed, 15 insertions(+), 12 deletions(-) rename benchmarks/js/{BenchmarkSuite.js => benchmark_suite.js} (94%) rename benchmarks/js/{JsBenchmark.js => js_benchmark.js} (97%) rename benchmarks/protobuf.js/{GeneratePbjsFiles.js => generate_pbjs_files.js} (99%) rename benchmarks/protobuf.js/{ProtobufJsBenchmark.js => protobufjs_benchmark.js} (94%) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 4bf20d5e62..b3b7a5df68 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -555,18 +555,18 @@ pbjs_preparation: cd protobuf.js && npm install && npm run build cd tmp/protobuf.js && npm install benchmark cp protobuf.js/* tmp/protobuf.js - cp js/BenchmarkSuite.js tmp/protobuf.js + cp js/benchmark_suite.js tmp/protobuf.js touch pbjs_preparation pbjs_middleman: pbjs_preparation - export OLDDIR=$$(pwd) && cd tmp/protobuf.js && node GeneratePbjsFiles.js --target static-module --include_path=$$OLDDIR -o GeneratedBundleCode.js $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) $(benchmarks_protoc_inputs_proto2) + export OLDDIR=$$(pwd) && cd tmp/protobuf.js && node generate_pbjs_files.js --target static-module --include_path=$$OLDDIR -o generated_bundle_code.js $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) $(benchmarks_protoc_inputs_proto2) touch pbjs_middleman pbjs-benchmark: pbjs_middleman @echo '#! /bin/bash' > pbjs-benchmark @echo 'cd tmp/protobuf.js' >> pbjs-benchmark - @echo 'sed -i "s/protobufjs/.\/protobuf.js/g" GeneratedBundleCode.js' >> pbjs-benchmark - @echo 'node ProtobufJsBenchmark.js $$@' >> pbjs-benchmark + @echo 'sed -i "s/protobufjs/.\/protobuf.js/g" generated_bundle_code.js' >> pbjs-benchmark + @echo 'env NODE_PATH=".:./node_modules:$$NODE_PATH" node protobufjs_benchmark.js $$@' >> pbjs-benchmark @chmod +x pbjs-benchmark pbjs: pbjs-benchmark @@ -591,7 +591,7 @@ js-benchmark: js_middleman @echo '#! /bin/bash' > js-benchmark @echo 'export TOP_JS_SRCDIR=$$(cd $(top_srcdir)/js && pwd)' >> js-benchmark @echo 'cd tmp/js' >> js-benchmark - @echo 'env NODE_PATH="$$TOP_JS_SRCDIR:." node --max-old-space-size=4096 JsBenchmark.js $$@' >> js-benchmark + @echo 'env NODE_PATH="$$TOP_JS_SRCDIR:.:./node_modules:$$NODE_PATH" node --max-old-space-size=4096 js_benchmark.js $$@' >> js-benchmark @chmod +x js-benchmark js: js-benchmark diff --git a/benchmarks/js/BenchmarkSuite.js b/benchmarks/js/benchmark_suite.js similarity index 94% rename from benchmarks/js/BenchmarkSuite.js rename to benchmarks/js/benchmark_suite.js index 73ab373cb3..c95024b2e2 100644 --- a/benchmarks/js/BenchmarkSuite.js +++ b/benchmarks/js/benchmark_suite.js @@ -1,4 +1,4 @@ -var benchmark = require("./node_modules/benchmark"); +var benchmark = require("benchmark"); function newBenchmark(messageName, filename, language) { var benches = []; diff --git a/benchmarks/js/JsBenchmark.js b/benchmarks/js/js_benchmark.js similarity index 97% rename from benchmarks/js/JsBenchmark.js rename to benchmarks/js/js_benchmark.js index bf182449e4..14905e312d 100644 --- a/benchmarks/js/JsBenchmark.js +++ b/benchmarks/js/js_benchmark.js @@ -6,7 +6,7 @@ require('./datasets/google_message4/benchmark_message4_pb.js'); require('./benchmarks_pb.js'); var fs = require('fs'); -var benchmarkSuite = require("./BenchmarkSuite.js"); +var benchmarkSuite = require("./benchmark_suite.js"); function getNewPrototype(name) { @@ -66,4 +66,5 @@ process.argv.forEach(function(filename, index) { + senarios.benches[1] * totalBytes / 1024 / 1024 + "MB/s" ); console.log(""); }); -console.log("#####################################################"); \ No newline at end of file +console.log("#####################################################"); + diff --git a/benchmarks/protobuf.js/GeneratePbjsFiles.js b/benchmarks/protobuf.js/generate_pbjs_files.js similarity index 99% rename from benchmarks/protobuf.js/GeneratePbjsFiles.js rename to benchmarks/protobuf.js/generate_pbjs_files.js index d0e9c66df2..11945bf9e6 100644 --- a/benchmarks/protobuf.js/GeneratePbjsFiles.js +++ b/benchmarks/protobuf.js/generate_pbjs_files.js @@ -21,4 +21,5 @@ pbjs.main(argv, function(err, output){ if (err) { console.log(err); } -}); \ No newline at end of file +}); + diff --git a/benchmarks/protobuf.js/ProtobufJsBenchmark.js b/benchmarks/protobuf.js/protobufjs_benchmark.js similarity index 94% rename from benchmarks/protobuf.js/ProtobufJsBenchmark.js rename to benchmarks/protobuf.js/protobufjs_benchmark.js index 7a1a7d56b9..2629e9f46f 100644 --- a/benchmarks/protobuf.js/ProtobufJsBenchmark.js +++ b/benchmarks/protobuf.js/protobufjs_benchmark.js @@ -1,7 +1,7 @@ -var root = require("./GeneratedBundleCode.js"); +var root = require("./generated_bundle_code.js"); var fs = require('fs'); var benchmark = require("./node_modules/benchmark"); -var benchmarkSuite = require("./BenchmarkSuite.js"); +var benchmarkSuite = require("./benchmark_suite.js"); function getNewPrototype(name) { @@ -62,4 +62,5 @@ process.argv.forEach(function(filename, index) { + senarios.benches[1] * totalBytes / 1024 / 1024 + "MB/s" ); console.log(""); }); -console.log("#####################################################"); \ No newline at end of file +console.log("#####################################################"); +