Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge github.com:grpc/grpc into credit

Browse Source
changes/59/217559/1
Craig Tiller 10 years ago
parent 7ab4fee9e7 47f523b508
commit 9f80dc31fb
5 changed files with 117 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile
  2. 66
      src/node/examples/pubsub/pubsub_demo.js
  3. 66
      src/node/examples/route_guide_client.js
  4. 70
      src/node/examples/route_guide_server.js
  5. 4
      templates/Makefile.template

4
Makefile
Unescape View File

@ -257,7 +257,7 @@ HAS_SYSTEM_ZLIB = false
HAS_SYSTEM_PROTOBUF = false HAS_SYSTEM_PROTOBUF = false
endif endif
HAS_PROTOC = $(shell $(PROTOC_CMD) && echo true || echo false) HAS_PROTOC = $(shell $(PROTOC_CMD) > /dev/null && echo true || echo false)
ifeq ($(HAS_PROTOC),true) ifeq ($(HAS_PROTOC),true)
HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
else else
@ -2101,7 +2101,7 @@ install-certs: etc/roots.pem
$(Q) $(INSTALL) etc/roots.pem $(prefix)/share/grpc/roots.pem $(Q) $(INSTALL) etc/roots.pem $(prefix)/share/grpc/roots.pem
verify-install: verify-install:
ifeq ($(SYSTEM_OK),true) ifeq ($(INSTALL_OK),true)
@echo "Your system looks ready to go." @echo "Your system looks ready to go."
@echo @echo
else else

66
src/node/examples/pubsub/pubsub_demo.js
Unescape View File

@ -1,31 +1,37 @@
// Copyright 2015, Google Inc. /*
// All rights reserved. *
// * Copyright 2015, Google Inc.
// Redistribution and use in source and binary forms, with or without * All rights reserved.
// modification, are permitted provided that the following conditions are *
// met: * Redistribution and use in source and binary forms, with or without
// * modification, are permitted provided that the following conditions are
// * Redistributions of source code must retain the above copyright * met:
// notice, this list of conditions and the following disclaimer. *
// * Redistributions in binary form must reproduce the above * * Redistributions of source code must retain the above copyright
// copyright notice, this list of conditions and the following disclaimer * notice, this list of conditions and the following disclaimer.
// in the documentation and/or other materials provided with the * * Redistributions in binary form must reproduce the above
// distribution. * copyright notice, this list of conditions and the following disclaimer
// * Neither the name of Google Inc. nor the names of its * in the documentation and/or other materials provided with the
// contributors may be used to endorse or promote products derived from * distribution.
// this software without specific prior written permission. * * Neither the name of Google Inc. nor the names of its
// * contributors may be used to endorse or promote products derived from
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * this software without specific prior written permission.
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
'use strict';
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
@ -270,7 +276,9 @@ function main(callback) {
if (require.main === module) { if (require.main === module) {
main(function(err) { main(function(err) {
if (err) throw err; if (err) {
throw err;
}
}); });
} }

66
src/node/examples/route_guide_client.js
Unescape View File

@ -1,31 +1,37 @@
// Copyright 2015, Google Inc. /*
// All rights reserved. *
// * Copyright 2015, Google Inc.
// Redistribution and use in source and binary forms, with or without * All rights reserved.
// modification, are permitted provided that the following conditions are *
// met: * Redistribution and use in source and binary forms, with or without
// * modification, are permitted provided that the following conditions are
// * Redistributions of source code must retain the above copyright * met:
// notice, this list of conditions and the following disclaimer. *
// * Redistributions in binary form must reproduce the above * * Redistributions of source code must retain the above copyright
// copyright notice, this list of conditions and the following disclaimer * notice, this list of conditions and the following disclaimer.
// in the documentation and/or other materials provided with the * * Redistributions in binary form must reproduce the above
// distribution. * copyright notice, this list of conditions and the following disclaimer
// * Neither the name of Google Inc. nor the names of its * in the documentation and/or other materials provided with the
// contributors may be used to endorse or promote products derived from * distribution.
// this software without specific prior written permission. * * Neither the name of Google Inc. nor the names of its
// * contributors may be used to endorse or promote products derived from
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * this software without specific prior written permission.
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
'use strict';
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
@ -110,7 +116,9 @@ function runRecordRoute(callback) {
string: 'db_path' string: 'db_path'
}); });
fs.readFile(path.resolve(argv.db_path), function(err, data) { fs.readFile(path.resolve(argv.db_path), function(err, data) {
if (err) callback(err); if (err) {
callback(err);
}
var feature_list = JSON.parse(data); var feature_list = JSON.parse(data);
var num_points = 10; var num_points = 10;

70
src/node/examples/route_guide_server.js
Unescape View File

@ -1,31 +1,37 @@
// Copyright 2015, Google Inc. /*
// All rights reserved. *
// * Copyright 2015, Google Inc.
// Redistribution and use in source and binary forms, with or without * All rights reserved.
// modification, are permitted provided that the following conditions are *
// met: * Redistribution and use in source and binary forms, with or without
// * modification, are permitted provided that the following conditions are
// * Redistributions of source code must retain the above copyright * met:
// notice, this list of conditions and the following disclaimer. *
// * Redistributions in binary form must reproduce the above * * Redistributions of source code must retain the above copyright
// copyright notice, this list of conditions and the following disclaimer * notice, this list of conditions and the following disclaimer.
// in the documentation and/or other materials provided with the * * Redistributions in binary form must reproduce the above
// distribution. * copyright notice, this list of conditions and the following disclaimer
// * Neither the name of Google Inc. nor the names of its * in the documentation and/or other materials provided with the
// contributors may be used to endorse or promote products derived from * distribution.
// this software without specific prior written permission. * * Neither the name of Google Inc. nor the names of its
// * contributors may be used to endorse or promote products derived from
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * this software without specific prior written permission.
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT *
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
'use strict';
var fs = require('fs'); var fs = require('fs');
var parseArgs = require('minimist'); var parseArgs = require('minimist');
@ -163,7 +169,7 @@ function recordRoute(call, callback) {
} }
/* For each point after the first, add the incremental distance from the /* For each point after the first, add the incremental distance from the
* previous point to the total distance value */ * previous point to the total distance value */
if (previous != null) { if (previous !== null) {
distance += getDistance(previous, point); distance += getDistance(previous, point);
} }
previous = point; previous = point;
@ -173,7 +179,7 @@ function recordRoute(call, callback) {
point_count: point_count, point_count: point_count,
feature_count: feature_count, feature_count: feature_count,
// Cast the distance to an integer // Cast the distance to an integer
distance: distance|0, distance: Math.floor(distance),
// End the timer // End the timer
elapsed_time: process.hrtime(start_time)[0] elapsed_time: process.hrtime(start_time)[0]
}); });
@ -240,7 +246,9 @@ if (require.main === module) {
string: 'db_path' string: 'db_path'
}); });
fs.readFile(path.resolve(argv.db_path), function(err, data) { fs.readFile(path.resolve(argv.db_path), function(err, data) {
if (err) throw err; if (err) {
throw err;
}
feature_list = JSON.parse(data); feature_list = JSON.parse(data);
routeServer.listen(); routeServer.listen();
}); });

4
templates/Makefile.template
Unescape View File

@ -274,7 +274,7 @@ HAS_SYSTEM_ZLIB = false
HAS_SYSTEM_PROTOBUF = false HAS_SYSTEM_PROTOBUF = false
endif endif
HAS_PROTOC = $(shell $(PROTOC_CMD) && echo true || echo false) HAS_PROTOC = $(shell $(PROTOC_CMD) > /dev/null && echo true || echo false)
ifeq ($(HAS_PROTOC),true) ifeq ($(HAS_PROTOC),true)
HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false) HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
else else
@ -830,7 +830,7 @@ install-certs: etc/roots.pem
$(Q) $(INSTALL) etc/roots.pem $(prefix)/share/grpc/roots.pem $(Q) $(INSTALL) etc/roots.pem $(prefix)/share/grpc/roots.pem
verify-install: verify-install:
ifeq ($(SYSTEM_OK),true) ifeq ($(INSTALL_OK),true)
@echo "Your system looks ready to go." @echo "Your system looks ready to go."
@echo @echo
else else

Write Preview
Loading…
Cancel
Save