Merge pull request #9613 from murgatroid99/node_disable_libuv_core

Disable libuv core changes in Node library and bump version number
8 years ago · fa301e3674
parent d63d29330d ae998a37a2
commit fa301e3674
34 changed files with 60 additions and 70 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -42,7 +42,7 @@
 cmake_minimum_required(VERSION 2.8)

 set(PACKAGE_NAME      "grpc")
-set(PACKAGE_VERSION   "1.1.1")
+set(PACKAGE_VERSION   "1.1.2")
 set(PACKAGE_STRING    "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
--- a/4
+++ b/4
@ -442,8 +442,8 @@ Q = @
 endif

 CORE_VERSION = 2.0.0
-CPP_VERSION = 1.1.1
-CSHARP_VERSION = 1.1.1
+CPP_VERSION = 1.1.2
+CSHARP_VERSION = 1.1.2

 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
--- a/binding.gyp
+++ b/binding.gyp
@ -51,7 +51,9 @@
    'conditions': [
      ['runtime=="node"', {
        'defines': [
-          'GRPC_UV'
+          # Disabling this while bugs are ironed out. Uncomment this to
+          # re-enable libuv integration in C core.
+          # 'GRPC_UV'
        ]
      }],
      ['OS!="win" and runtime=="electron"', {
--- a/build.yaml
+++ b/build.yaml
@ -14,7 +14,7 @@ settings:
  '#10': See the expand_version.py for all the quirks here
  core_version: 2.0.0
  g_stands_for: good
-  version: 1.1.1
+  version: 1.1.2
 filegroups:
 - name: census
  public_headers:
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -37,7 +37,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-Core'
-  version = '1.1.1'
+  version = '1.1.2'
  s.version  = version
  s.summary  = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@ -36,7 +36,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-ProtoRPC'
-  version = '1.1.1'
+  version = '1.1.2'
  s.version  = version
  s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@ -36,7 +36,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-RxLibrary'
-  version = '1.1.1'
+  version = '1.1.2'
  s.version  = version
  s.summary  = 'Reactive Extensions library for iOS/OSX.'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -35,7 +35,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC'
-  version = '1.1.1'
+  version = '1.1.2'
  s.version  = version
  s.summary  = 'gRPC client library for iOS/OSX'
  s.homepage = 'http://www.grpc.io'
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc",
-  "version": "1.1.1",
+  "version": "1.1.2",
  "author": "Google Inc.",
  "description": "gRPC Library for Node",
  "homepage": "http://www.grpc.io/",
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2017-01-13</date>
 <time>16:06:07</time>
 <version>
-  <release>1.1.1</release>
-  <api>1.1.1</api>
+  <release>1.1.2</release>
+  <api>1.1.2</api>
 </version>
 <stability>
  <release>beta</release>
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@ -37,5 +37,5 @@
 #include <grpc++/grpc++.h>

 namespace grpc {
-grpc::string Version() { return "1.1.1"; }
+grpc::string Version() { return "1.1.2"; }
 }
--- a/src/csharp/Grpc.Auth/project.json
+++ b/src/csharp/Grpc.Auth/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.1",
+  "version": "1.1.2",
  "title": "gRPC C# Auth",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.1.1",
+    "Grpc.Core": "1.1.2",
    "Google.Apis.Auth": "1.16.0"
  },
  "frameworks": {
--- a/src/csharp/Grpc.Core/VersionInfo.cs
+++ b/src/csharp/Grpc.Core/VersionInfo.cs
@ -48,11 +48,11 @@ namespace Grpc.Core
        /// <summary>
        /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
        /// </summary>
-        public const string CurrentAssemblyFileVersion = "1.1.1.0";
+        public const string CurrentAssemblyFileVersion = "1.1.2.0";

        /// <summary>
        /// Current version of gRPC C#
        /// </summary>
-        public const string CurrentVersion = "1.1.1";
+        public const string CurrentVersion = "1.1.2";
    }
 }
--- a/src/csharp/Grpc.Core/project.json
+++ b/src/csharp/Grpc.Core/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.1",
+  "version": "1.1.2",
  "title": "gRPC C# Core",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
--- a/src/csharp/Grpc.HealthCheck/project.json
+++ b/src/csharp/Grpc.HealthCheck/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.1",
+  "version": "1.1.2",
  "title": "gRPC C# Healthchecking",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.1.1",
+    "Grpc.Core": "1.1.2",
    "Google.Protobuf": "3.0.0"
  },
  "frameworks": {
--- a/src/csharp/Grpc.Reflection/project.json
+++ b/src/csharp/Grpc.Reflection/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.1.1",
+  "version": "1.1.2",
  "title": "gRPC C# Reflection",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2016, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.1.1",
+    "Grpc.Core": "1.1.2",
    "Google.Protobuf": "3.0.0"
  },
  "frameworks": {
--- a/src/csharp/build_packages_dotnetcli.bat
+++ b/src/csharp/build_packages_dotnetcli.bat
@ -28,7 +28,7 @@
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@rem Current package versions
-set VERSION=1.1.1
+set VERSION=1.1.2
 set PROTOBUF_VERSION=3.0.0

@rem Adjust the location of nuget.exe
--- a/src/csharp/build_packages_dotnetcli.sh
+++ b/src/csharp/build_packages_dotnetcli.sh
@ -65,7 +65,7 @@ dotnet pack --configuration Release Grpc.Auth/project.json --output ../../artifa
 dotnet pack --configuration Release Grpc.HealthCheck/project.json --output ../../artifacts
 dotnet pack --configuration Release Grpc.Reflection/project.json --output ../../artifacts

-nuget pack Grpc.nuspec -Version "1.1.1" -OutputDirectory ../../artifacts
-nuget pack Grpc.Tools.nuspec -Version "1.1.1" -OutputDirectory ../../artifacts
+nuget pack Grpc.nuspec -Version "1.1.2" -OutputDirectory ../../artifacts
+nuget pack Grpc.Tools.nuspec -Version "1.1.2" -OutputDirectory ../../artifacts

 (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)
--- a/src/node/ext/completion_queue_threadpool.cc
+++ b/src/node/ext/completion_queue_threadpool.cc
@ -78,6 +78,8 @@ class CompletionQueueAsyncWorker : public Nan::AsyncWorker {
  void HandleErrorCallback();

 private:
+  static void TryAddWorker();
+
  grpc_event result;

  static grpc_completion_queue *queue;
@ -118,20 +120,21 @@ void CompletionQueueAsyncWorker::Execute() {

 grpc_completion_queue *CompletionQueueAsyncWorker::GetQueue() { return queue; }

-void CompletionQueueAsyncWorker::Next() {
-#ifndef GRPC_UV
-  Nan::HandleScope scope;
-  if (current_threads < max_queue_threads) {
+void CompletionQueueAsyncWorker::TryAddWorker() {
+  if (current_threads < max_queue_threads && waiting_next_calls > 0) {
    current_threads += 1;
+    waiting_next_calls -= 1;
    CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
    Nan::AsyncQueueWorker(worker);
-  } else {
-    waiting_next_calls += 1;
  }
  GPR_ASSERT(current_threads <= max_queue_threads);
  GPR_ASSERT((current_threads == max_queue_threads) ||
             (waiting_next_calls == 0));
-#endif
+}
+
+void CompletionQueueAsyncWorker::Next() {
+  waiting_next_calls += 1;
+  TryAddWorker();
 }

 void CompletionQueueAsyncWorker::Init(Local<Object> exports) {
@ -143,17 +146,8 @@ void CompletionQueueAsyncWorker::Init(Local<Object> exports) {

 void CompletionQueueAsyncWorker::HandleOKCallback() {
  Nan::HandleScope scope;
-  if (waiting_next_calls > 0) {
-    waiting_next_calls -= 1;
-    // Old worker removed, new worker added. current_threads += 0
-    CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
-    Nan::AsyncQueueWorker(worker);
-  } else {
  current_threads -= 1;
-  }
-  GPR_ASSERT(current_threads <= max_queue_threads);
-  GPR_ASSERT((current_threads == max_queue_threads) ||
-             (waiting_next_calls == 0));
+  TryAddWorker();
  Nan::Callback *callback = GetTagCallback(result.tag);
  Local<Value> argv[] = {Nan::Null(), GetTagNodeValue(result.tag)};
  callback->Call(2, argv);
@ -162,18 +156,9 @@ void CompletionQueueAsyncWorker::HandleOKCallback() {
 }

 void CompletionQueueAsyncWorker::HandleErrorCallback() {
-  if (waiting_next_calls > 0) {
-    waiting_next_calls -= 1;
-    // Old worker removed, new worker added. current_threads += 0
-    CompletionQueueAsyncWorker *worker = new CompletionQueueAsyncWorker();
-    Nan::AsyncQueueWorker(worker);
-  } else {
-    current_threads -= 1;
-  }
-  GPR_ASSERT(current_threads <= max_queue_threads);
-  GPR_ASSERT((current_threads == max_queue_threads) ||
-             (waiting_next_calls == 0));
  Nan::HandleScope scope;
+  current_threads -= 1;
+  TryAddWorker();
  Nan::Callback *callback = GetTagCallback(result.tag);
  Local<Value> argv[] = {Nan::Error(ErrorMessage())};

@ -189,6 +174,7 @@ grpc_completion_queue *GetCompletionQueue() {
 }

 void CompletionQueueNext() {
+  gpr_log(GPR_DEBUG, "Called CompletionQueueNext");
  CompletionQueueAsyncWorker::Next();
 }

--- a/src/node/health_check/package.json
+++ b/src/node/health_check/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc-health-check",
-  "version": "1.1.1",
+  "version": "1.1.2",
  "author": "Google Inc.",
  "description": "Health check service for use with gRPC",
  "repository": {
@ -15,7 +15,7 @@
    }
  ],
  "dependencies": {
-    "grpc": "^1.1.1",
+    "grpc": "^1.1.2",
    "lodash": "^3.9.3",
    "google-protobuf": "^3.0.0"
  },
--- a/src/node/tools/package.json
+++ b/src/node/tools/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc-tools",
-  "version": "1.1.1",
+  "version": "1.1.2",
  "author": "Google Inc.",
  "description": "Tools for developing with gRPC on Node.js",
  "homepage": "http://www.grpc.io/",
--- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@ -42,7 +42,7 @@ Pod::Spec.new do |s|
  # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
  # before them.
  s.name     = '!ProtoCompiler-gRPCPlugin'
-  v = '1.1.1'
+  v = '1.1.2'
  s.version  = v
  s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
  s.description = <<-DESC
--- a/src/objective-c/GRPCClient/private/version.h
+++ b/src/objective-c/GRPCClient/private/version.h
@ -38,4 +38,4 @@
 // `tools/buildgen/generate_projects.sh`.


-#define GRPC_OBJC_VERSION_STRING @"1.1.1"
+#define GRPC_OBJC_VERSION_STRING @"1.1.2"
--- a/src/php/composer.json
+++ b/src/php/composer.json
@ -5,7 +5,7 @@
  "keywords": ["rpc"],
  "homepage": "http://grpc.io",
  "license": "BSD-3-Clause",
-  "version": "1.1.1",
+  "version": "1.1.2",
  "require": {
    "php": ">=5.5.0",
    "ext-grpc": "*",
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!

-VERSION='1.1.1'
+VERSION='1.1.2'
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!

-VERSION='1.1.1'
+VERSION='1.1.2'
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!

-VERSION='1.1.1'
+VERSION='1.1.2'
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!

-VERSION='1.1.1'
+VERSION='1.1.2'
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@ -29,5 +29,5 @@

 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@ -29,6 +29,6 @@

 module GRPC
  module Tools
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
  end
 end
--- a/templates/binding.gyp.template
+++ b/templates/binding.gyp.template
@ -53,7 +53,9 @@
      'conditions': [
        ['runtime=="node"', {
          'defines': [
-            'GRPC_UV'
+            # Disabling this while bugs are ironed out. Uncomment this to
+            # re-enable libuv integration in C core.
+            # 'GRPC_UV'
          ]
        }],
        ['OS!="win" and runtime=="electron"', {
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

-VERSION='1.1.1'
+VERSION='1.1.2'
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.1.1
+PROJECT_NUMBER         = 1.1.2

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 1.1.1
+PROJECT_NUMBER         = 1.1.2

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a