Inicio Explorar Ayuda
Iniciar sesión
carto
/
grpc
2
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

Merge branch 'master' into cq_create_api_changes

Sree Kuchibhotla hace 8 años
padre
74f419fe74 739cecb0bc
commit
67647d4b1d
Se han modificado 38 ficheros con 1076 adiciones y 151 borrados
Dividir vista Mostrar estadísticas de diff
  1. 30 0
      .vscode/launch.json
  2. 2 0
      BUILD
  3. 5 3
      CMakeLists.txt
  4. 5 7
      Makefile
  5. 6 0
      WORKSPACE
  6. 1 1
      binding.gyp
  7. 1 1
      build.yaml
  8. 1 1
      config.m4
  9. 1 1
      gRPC-Core.podspec
  10. 1 1
      grpc.gemspec
  11. 1 1
      package.xml
  12. 49 10
      src/core/lib/channel/http_client_filter.c
  13. 44 16
      src/core/lib/channel/http_server_filter.c
  14. 20 5
      src/core/lib/security/util/b64.c
  15. 13 1
      src/core/lib/security/util/b64.h
  16. 22 23
      src/objective-c/tests/CronetUnitTests/CronetUnitTests.m
  17. 0 20
      src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/AllTests.xcscheme
  18. 1 3
      src/objective-c/tests/build_one_example.sh
  19. 14 6
      src/objective-c/tests/run_tests.sh
  20. 1 1
      src/python/grpcio/grpc_core_dependencies.py
  21. 37 26
      test/core/iomgr/ev_epoll_linux_test.c
  22. 2 0
      tools/distrib/check_copyright.py
  23. 63 0
      tools/grpcz/BUILD
  24. 318 0
      tools/grpcz/census.proto
  25. 181 0
      tools/grpcz/grpcz_client.cc
  26. 156 0
      tools/grpcz/monitoring.proto
  27. 45 0
      tools/jenkins/comment_on_pr.sh
  28. 5 0
      tools/jenkins/run_performance.sh
  29. 1 1
      tools/run_tests/generated/sources_and_headers.json
  30. 23 13
      tools/run_tests/run_microbenchmark.py
  31. 2 2
      vsprojects/vcxproj/grpc/grpc.vcxproj
  32. 3 3
      vsprojects/vcxproj/grpc/grpc.vcxproj.filters
  33. 2 0
      vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
  34. 9 0
      vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
  35. 2 0
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
  36. 9 0
      vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
  37. 0 2
      vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
  38. 0 3
      vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters

+ 30 - 0
.vscode/launch.json
Ver fichero 

@@ -0,0 +1,30 @@
 
+{
 
+    "version": "0.2.0",
 
+    "configurations": [
 
+        {
 
+            "type": "node",
 
+            "request": "launch",
 
+            "name": "Mocha Tests",
 
+            "cwd": "${workspaceRoot}",
 
+            "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha",
 
+            "windows": {
 
+                "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/mocha.cmd"
 
+            },
 
+            "runtimeArgs": [
 
+                "-u",
 
+                "tdd",
 
+                "--timeout",
 
+                "999999",
 
+                "--colors",
 
+                "${workspaceRoot}/src/node/test"
 
+            ],
 
+            "internalConsoleOptions": "openOnSessionStart"
 
+        },
 
+        {
 
+            "type": "node",
 
+            "request": "attach",
 
+            "name": "Attach to Process",
 
+            "port": 5858
 
+        }
 
+    ]
 
+}

+ 2 - 0
BUILD
Ver fichero 

@@ -511,6 +511,7 @@ grpc_cc_library(
 
         "src/core/lib/json/json_reader.c",
 
         "src/core/lib/json/json_string.c",
 
         "src/core/lib/json/json_writer.c",
 
+        "src/core/lib/security/util/b64.c",
 
         "src/core/lib/slice/percent_encoding.c",
 
         "src/core/lib/slice/slice.c",
 
         "src/core/lib/slice/slice_buffer.c",
 
@@ -629,6 +630,7 @@ grpc_cc_library(
 
         "src/core/lib/json/json_common.h",
 
         "src/core/lib/json/json_reader.h",
 
         "src/core/lib/json/json_writer.h",
 
+        "src/core/lib/security/util/b64.h",
 
         "src/core/lib/slice/percent_encoding.h",
 
         "src/core/lib/slice/slice_hash_table.h",
 
         "src/core/lib/slice/slice_internal.h",

+ 5 - 3
CMakeLists.txt
Ver fichero 

@@ -993,6 +993,7 @@ add_library(grpc
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -1075,7 +1076,6 @@ add_library(grpc
 
   src/core/lib/security/transport/security_handshaker.c
 
   src/core/lib/security/transport/server_auth_filter.c
 
   src/core/lib/security/transport/tsi_error.c
 
-  src/core/lib/security/util/b64.c
 
   src/core/lib/security/util/json_util.c
 
   src/core/lib/surface/init_secure.c
 
   src/core/lib/tsi/fake_transport_security.c
 
@@ -1314,6 +1314,7 @@ add_library(grpc_cronet
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -1419,7 +1420,6 @@ add_library(grpc_cronet
 
   src/core/lib/security/transport/security_handshaker.c
 
   src/core/lib/security/transport/server_auth_filter.c
 
   src/core/lib/security/transport/tsi_error.c
 
-  src/core/lib/security/util/b64.c
 
   src/core/lib/security/util/json_util.c
 
   src/core/lib/surface/init_secure.c
 
   src/core/lib/tsi/fake_transport_security.c
 
@@ -1622,6 +1622,7 @@ add_library(grpc_test_util
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -1881,6 +1882,7 @@ add_library(grpc_unsecure
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -2511,6 +2513,7 @@ add_library(grpc++_cronet
 
   src/core/lib/json/json_reader.c
 
   src/core/lib/json/json_string.c
 
   src/core/lib/json/json_writer.c
 
+  src/core/lib/security/util/b64.c
 
   src/core/lib/slice/percent_encoding.c
 
   src/core/lib/slice/slice.c
 
   src/core/lib/slice/slice_buffer.c
 
@@ -11360,7 +11363,6 @@ add_executable(stress_test
 
   test/cpp/interop/interop_client.cc
 
   test/cpp/interop/stress_interop_client.cc
 
   test/cpp/interop/stress_test.cc
 
-  test/cpp/util/create_test_channel.cc
 
   test/cpp/util/metrics_server.cc
 
   third_party/googletest/src/gtest-all.cc
 
 )

+ 5 - 7
Makefile
Ver fichero 

@@ -2887,6 +2887,7 @@ LIBGRPC_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -2969,7 +2970,6 @@ LIBGRPC_SRC = \
 
     src/core/lib/security/transport/security_handshaker.c \
 
     src/core/lib/security/transport/server_auth_filter.c \
 
     src/core/lib/security/transport/tsi_error.c \
 
-    src/core/lib/security/util/b64.c \
 
     src/core/lib/security/util/json_util.c \
 
     src/core/lib/surface/init_secure.c \
 
     src/core/lib/tsi/fake_transport_security.c \
 
@@ -3206,6 +3206,7 @@ LIBGRPC_CRONET_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -3311,7 +3312,6 @@ LIBGRPC_CRONET_SRC = \
 
     src/core/lib/security/transport/security_handshaker.c \
 
     src/core/lib/security/transport/server_auth_filter.c \
 
     src/core/lib/security/transport/tsi_error.c \
 
-    src/core/lib/security/util/b64.c \
 
     src/core/lib/security/util/json_util.c \
 
     src/core/lib/surface/init_secure.c \
 
     src/core/lib/tsi/fake_transport_security.c \
 
@@ -3513,6 +3513,7 @@ LIBGRPC_TEST_UTIL_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -3744,6 +3745,7 @@ LIBGRPC_UNSECURE_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -4360,6 +4362,7 @@ LIBGRPC++_CRONET_SRC = \
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -15744,7 +15747,6 @@ STRESS_TEST_SRC = \
 
     test/cpp/interop/interop_client.cc \
 
     test/cpp/interop/stress_interop_client.cc \
 
     test/cpp/interop/stress_test.cc \
 
-    test/cpp/util/create_test_channel.cc \
 
     test/cpp/util/metrics_server.cc \
 
 
 STRESS_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(STRESS_TEST_SRC))))
 
@@ -15790,8 +15792,6 @@ $(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_interop_client.o:  $(LIBDIR)/$(CONFI
 
 
 $(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_test.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
 
 
-$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
 
-
 
 $(OBJDIR)/$(CONFIG)/test/cpp/util/metrics_server.o:  $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc++_test_config.a
 
 
 deps_stress_test: $(STRESS_TEST_OBJS:.o=.dep)
 
@@ -15804,7 +15804,6 @@ endif
 
 $(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
 
 $(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_interop_client.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
 
 $(OBJDIR)/$(CONFIG)/test/cpp/interop/stress_test.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
 
-$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
 
 $(OBJDIR)/$(CONFIG)/test/cpp/util/metrics_server.o: $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/test.pb.cc $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc
 
 
 
@@ -18806,7 +18805,6 @@ src/core/lib/security/transport/security_connector.c: $(OPENSSL_DEP)
 
 src/core/lib/security/transport/security_handshaker.c: $(OPENSSL_DEP)
 
 src/core/lib/security/transport/server_auth_filter.c: $(OPENSSL_DEP)
 
 src/core/lib/security/transport/tsi_error.c: $(OPENSSL_DEP)
 
-src/core/lib/security/util/b64.c: $(OPENSSL_DEP)
 
 src/core/lib/security/util/json_util.c: $(OPENSSL_DEP)
 
 src/core/lib/surface/init_secure.c: $(OPENSSL_DEP)
 
 src/core/lib/tsi/fake_transport_security.c: $(OPENSSL_DEP)

+ 6 - 0
WORKSPACE
Ver fichero 

@@ -72,6 +72,12 @@ local_repository(
 
     path = "third_party/gflags",
 
 )
 
 
+git_repository(
 
+    name   = "mongoose_repo",
 
+    commit = "4120a97945b41195a6223a600dae8e3b19bed19e",
 
+    remote = "https://github.com/makdharma/mongoose.git"
 
+)
 
+
 
 new_local_repository(
 
     name = "submodule_cares",
 
     path = "third_party/cares",

+ 1 - 1
binding.gyp
Ver fichero 

@@ -700,6 +700,7 @@
 
         'src/core/lib/json/json_reader.c',
 
         'src/core/lib/json/json_string.c',
 
         'src/core/lib/json/json_writer.c',
 
+        'src/core/lib/security/util/b64.c',
 
         'src/core/lib/slice/percent_encoding.c',
 
         'src/core/lib/slice/slice.c',
 
         'src/core/lib/slice/slice_buffer.c',
 
@@ -782,7 +783,6 @@
 
         'src/core/lib/security/transport/security_handshaker.c',
 
         'src/core/lib/security/transport/server_auth_filter.c',
 
         'src/core/lib/security/transport/tsi_error.c',
 
-        'src/core/lib/security/util/b64.c',
 
         'src/core/lib/security/util/json_util.c',
 
         'src/core/lib/surface/init_secure.c',
 
         'src/core/lib/tsi/fake_transport_security.c',

+ 1 - 1
build.yaml
Ver fichero 

@@ -369,6 +369,7 @@ filegroups:
 
   - src/core/lib/json/json_reader.c
 
   - src/core/lib/json/json_string.c
 
   - src/core/lib/json/json_writer.c
 
+  - src/core/lib/security/util/b64.c
 
   - src/core/lib/slice/percent_encoding.c
 
   - src/core/lib/slice/slice.c
 
   - src/core/lib/slice/slice_buffer.c
 
@@ -4135,7 +4136,6 @@ targets:
 
   - test/cpp/interop/interop_client.cc
 
   - test/cpp/interop/stress_interop_client.cc
 
   - test/cpp/interop/stress_test.cc
 
-  - test/cpp/util/create_test_channel.cc
 
   - test/cpp/util/metrics_server.cc
 
   deps:
 
   - grpc++_test_util

+ 1 - 1
config.m4
Ver fichero 

@@ -168,6 +168,7 @@ if test "$PHP_GRPC" != "no"; then
 
     src/core/lib/json/json_reader.c \
 
     src/core/lib/json/json_string.c \
 
     src/core/lib/json/json_writer.c \
 
+    src/core/lib/security/util/b64.c \
 
     src/core/lib/slice/percent_encoding.c \
 
     src/core/lib/slice/slice.c \
 
     src/core/lib/slice/slice_buffer.c \
 
@@ -250,7 +251,6 @@ if test "$PHP_GRPC" != "no"; then
 
     src/core/lib/security/transport/security_handshaker.c \
 
     src/core/lib/security/transport/server_auth_filter.c \
 
     src/core/lib/security/transport/tsi_error.c \
 
-    src/core/lib/security/util/b64.c \
 
     src/core/lib/security/util/json_util.c \
 
     src/core/lib/surface/init_secure.c \
 
     src/core/lib/tsi/fake_transport_security.c \

+ 1 - 1
gRPC-Core.podspec
Ver fichero 

@@ -543,6 +543,7 @@ Pod::Spec.new do |s|
 
                       'src/core/lib/json/json_reader.c',
 
                       'src/core/lib/json/json_string.c',
 
                       'src/core/lib/json/json_writer.c',
 
+                      'src/core/lib/security/util/b64.c',
 
                       'src/core/lib/slice/percent_encoding.c',
 
                       'src/core/lib/slice/slice.c',
 
                       'src/core/lib/slice/slice_buffer.c',
 
@@ -625,7 +626,6 @@ Pod::Spec.new do |s|
 
                       'src/core/lib/security/transport/security_handshaker.c',
 
                       'src/core/lib/security/transport/server_auth_filter.c',
 
                       'src/core/lib/security/transport/tsi_error.c',
 
-                      'src/core/lib/security/util/b64.c',
 
                       'src/core/lib/security/util/json_util.c',
 
                       'src/core/lib/surface/init_secure.c',
 
                       'src/core/lib/tsi/fake_transport_security.c',

+ 1 - 1
grpc.gemspec
Ver fichero 

@@ -459,6 +459,7 @@ Gem::Specification.new do |s|
 
   s.files += %w( src/core/lib/json/json_reader.c )
 
   s.files += %w( src/core/lib/json/json_string.c )
 
   s.files += %w( src/core/lib/json/json_writer.c )
 
+  s.files += %w( src/core/lib/security/util/b64.c )
 
   s.files += %w( src/core/lib/slice/percent_encoding.c )
 
   s.files += %w( src/core/lib/slice/slice.c )
 
   s.files += %w( src/core/lib/slice/slice_buffer.c )
 
@@ -541,7 +542,6 @@ Gem::Specification.new do |s|
 
   s.files += %w( src/core/lib/security/transport/security_handshaker.c )
 
   s.files += %w( src/core/lib/security/transport/server_auth_filter.c )
 
   s.files += %w( src/core/lib/security/transport/tsi_error.c )
 
-  s.files += %w( src/core/lib/security/util/b64.c )
 
   s.files += %w( src/core/lib/security/util/json_util.c )
 
   s.files += %w( src/core/lib/surface/init_secure.c )
 
   s.files += %w( src/core/lib/tsi/fake_transport_security.c )

+ 1 - 1
package.xml
Ver fichero 

@@ -468,6 +468,7 @@
 
     <file baseinstalldir="/" name="src/core/lib/json/json_reader.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/json/json_string.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/json/json_writer.c" role="src" />
 
+    <file baseinstalldir="/" name="src/core/lib/security/util/b64.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/slice/percent_encoding.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/slice/slice.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/slice/slice_buffer.c" role="src" />
 
@@ -550,7 +551,6 @@
 
     <file baseinstalldir="/" name="src/core/lib/security/transport/security_handshaker.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/security/transport/server_auth_filter.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/security/transport/tsi_error.c" role="src" />
 
-    <file baseinstalldir="/" name="src/core/lib/security/util/b64.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/security/util/json_util.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/surface/init_secure.c" role="src" />
 
     <file baseinstalldir="/" name="src/core/lib/tsi/fake_transport_security.c" role="src" />

+ 49 - 10
src/core/lib/channel/http_client_filter.c
Ver fichero 

@@ -36,6 +36,7 @@
 
 #include <grpc/support/string_util.h>
 
 #include <string.h>
 
 #include "src/core/lib/profiling/timers.h"
 
+#include "src/core/lib/security/util/b64.h"
 
 #include "src/core/lib/slice/percent_encoding.h"
 
 #include "src/core/lib/slice/slice_internal.h"
 
 #include "src/core/lib/slice/slice_string_helpers.h"
 
@@ -56,7 +57,6 @@ typedef struct call_data {
 
   grpc_linked_mdelem te_trailers;
 
   grpc_linked_mdelem content_type;
 
   grpc_linked_mdelem user_agent;
 
-  grpc_linked_mdelem payload_bin;
 
 
   grpc_metadata_batch *recv_initial_metadata;
 
   grpc_metadata_batch *recv_trailing_metadata;
 
@@ -292,19 +292,58 @@ static grpc_error *hc_mutate_op(grpc_exec_ctx *exec_ctx,
 
       continue_send_message(exec_ctx, elem);
 
 
       if (calld->send_message_blocked == false) {
 
-        /* when all the send_message data is available, then create a MDELEM and
 
-        append to headers */
 
-        grpc_mdelem payload_bin = grpc_mdelem_from_slices(
 
-            exec_ctx, GRPC_MDSTR_GRPC_PAYLOAD_BIN,
 
-            grpc_slice_from_copied_buffer((const char *)calld->payload_bytes,
 
-                                          op->send_message->length));
 
-        error =
 
-            grpc_metadata_batch_add_tail(exec_ctx, op->send_initial_metadata,
 
-                                         &calld->payload_bin, payload_bin);
 
+        /* when all the send_message data is available, then modify the path
 
+         * MDELEM by appending base64 encoded query to the path */
 
+        const int k_url_safe = 1;
 
+        const int k_multi_line = 0;
 
+        const unsigned char k_query_separator = '?';
 
+
 
+        grpc_slice path_slice =
 
+            GRPC_MDVALUE(op->send_initial_metadata->idx.named.path->md);
 
+        /* sum up individual component's lengths and allocate enough memory to
 
+         * hold combined path+query */
 
+        size_t estimated_len = GRPC_SLICE_LENGTH(path_slice);
 
+        estimated_len++; /* for the '?' */
 
+        estimated_len += grpc_base64_estimate_encoded_size(
 
+            op->send_message->length, k_url_safe, k_multi_line);
 
+        estimated_len += 1; /* for the trailing 0 */
 
+        grpc_slice path_with_query_slice = grpc_slice_malloc(estimated_len);
 
+
 
+        /* memcopy individual pieces into this slice */
 
+        uint8_t *write_ptr =
 
+            (uint8_t *)GRPC_SLICE_START_PTR(path_with_query_slice);
 
+        uint8_t *original_path = (uint8_t *)GRPC_SLICE_START_PTR(path_slice);
 
+        memcpy(write_ptr, original_path, GRPC_SLICE_LENGTH(path_slice));
 
+        write_ptr += GRPC_SLICE_LENGTH(path_slice);
 
+
 
+        *write_ptr = k_query_separator;
 
+        write_ptr++; /* for the '?' */
 
+
 
+        grpc_base64_encode_core((char *)write_ptr, calld->payload_bytes,
 
+                                op->send_message->length, k_url_safe,
 
+                                k_multi_line);
 
+
 
+        /* remove trailing unused memory and add trailing 0 to terminate string
 
+         */
 
+        char *t = (char *)GRPC_SLICE_START_PTR(path_with_query_slice);
 
+        /* safe to use strlen since base64_encode will always add '\0' */
 
+        size_t path_length = strlen(t) + 1;
 
+        *(t + path_length) = '\0';
 
+        path_with_query_slice =
 
+            grpc_slice_sub(path_with_query_slice, 0, path_length);
 
+
 
+        /* substitute previous path with the new path+query */
 
+        grpc_mdelem mdelem_path_and_query = grpc_mdelem_from_slices(
 
+            exec_ctx, GRPC_MDSTR_PATH, path_with_query_slice);
 
+        grpc_metadata_batch *b = op->send_initial_metadata;
 
+        error = grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path,
 
+                                               mdelem_path_and_query);
 
         if (error != GRPC_ERROR_NONE) return error;
 
+
 
         calld->on_complete = op->on_complete;
 
         op->on_complete = &calld->hc_on_complete;
 
         op->send_message = NULL;
 
+        grpc_slice_unref_internal(exec_ctx, path_with_query_slice);
 
       } else {
 
         /* Not all data is available. Fall back to POST. */
 
         gpr_log(GPR_DEBUG,

+ 44 - 16
src/core/lib/channel/http_server_filter.c
Ver fichero 

@@ -37,6 +37,7 @@
 
 #include <grpc/support/log.h>
 
 #include <string.h>
 
 #include "src/core/lib/profiling/timers.h"
 
+#include "src/core/lib/security/util/b64.h"
 
 #include "src/core/lib/slice/percent_encoding.h"
 
 #include "src/core/lib/slice/slice_internal.h"
 
 #include "src/core/lib/slice/slice_string_helpers.h"
 
@@ -51,8 +52,8 @@ typedef struct call_data {
 
   grpc_linked_mdelem status;
 
   grpc_linked_mdelem content_type;
 
 
-  /* did this request come with payload-bin */
 
-  bool seen_payload_bin;
 
+  /* did this request come with path query containing request payload */
 
+  bool seen_path_with_query;
 
   /* flag to ensure payload_bin is delivered only once */
 
   bool payload_bin_delivered;
 
 
@@ -61,7 +62,7 @@ typedef struct call_data {
 
   bool *recv_cacheable_request;
 
   /** Closure to call when finished with the hs_on_recv hook */
 
   grpc_closure *on_done_recv;
 
-  /** Closure to call when we retrieve read message from the payload-bin header
 
+  /** Closure to call when we retrieve read message from the path URI
 
    */
 
   grpc_closure *recv_message_ready;
 
   grpc_closure *on_complete;
 
@@ -205,6 +206,43 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx,
 
               grpc_error_set_str(
 
                   GRPC_ERROR_CREATE_FROM_STATIC_STRING("Missing header"),
 
                   GRPC_ERROR_STR_KEY, grpc_slice_from_static_string(":path")));
 
+  } else if (*calld->recv_cacheable_request == true) {
 
+    /* We have a cacheable request made with GET verb. The path contains the
 
+     * query parameter which is base64 encoded request payload. */
 
+    const char k_query_separator = '?';
 
+    grpc_slice path_slice = GRPC_MDVALUE(b->idx.named.path->md);
 
+    uint8_t *path_ptr = (uint8_t *)GRPC_SLICE_START_PTR(path_slice);
 
+    size_t path_length = GRPC_SLICE_LENGTH(path_slice);
 
+    /* offset of the character '?' */
 
+    size_t offset = 0;
 
+    for (offset = 0; *path_ptr != k_query_separator && offset < path_length;
 
+         path_ptr++, offset++)
 
+      ;
 
+    if (offset < path_length) {
 
+      grpc_slice query_slice =
 
+          grpc_slice_sub(path_slice, offset + 1, path_length);
 
+
 
+      /* substitute path metadata with just the path (not query) */
 
+      grpc_mdelem mdelem_path_without_query = grpc_mdelem_from_slices(
 
+          exec_ctx, GRPC_MDSTR_PATH, grpc_slice_sub(path_slice, 0, offset));
 
+
 
+      grpc_metadata_batch_substitute(exec_ctx, b, b->idx.named.path,
 
+                                     mdelem_path_without_query);
 
+
 
+      /* decode payload from query and add to the slice buffer to be returned */
 
+      const int k_url_safe = 1;
 
+      grpc_slice_buffer_add(
 
+          &calld->read_slice_buffer,
 
+          grpc_base64_decode(exec_ctx,
 
+                             (const char *)GRPC_SLICE_START_PTR(query_slice),
 
+                             k_url_safe));
 
+      grpc_slice_buffer_stream_init(&calld->read_stream,
 
+                                    &calld->read_slice_buffer, 0);
 
+      calld->seen_path_with_query = true;
 
+      grpc_slice_unref_internal(exec_ctx, query_slice);
 
+    } else {
 
+      gpr_log(GPR_ERROR, "GET request without QUERY");
 
+    }
 
   }
 
 
   if (b->idx.named.host != NULL && b->idx.named.authority == NULL) {
 
@@ -228,16 +266,6 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx,
 
             GRPC_ERROR_STR_KEY, grpc_slice_from_static_string(":authority")));
 
   }
 
 
-  if (b->idx.named.grpc_payload_bin != NULL) {
 
-    calld->seen_payload_bin = true;
 
-    grpc_slice_buffer_add(&calld->read_slice_buffer,
 
-                          grpc_slice_ref_internal(
 
-                              GRPC_MDVALUE(b->idx.named.grpc_payload_bin->md)));
 
-    grpc_slice_buffer_stream_init(&calld->read_stream,
 
-                                  &calld->read_slice_buffer, 0);
 
-    grpc_metadata_batch_remove(exec_ctx, b, b->idx.named.grpc_payload_bin);
 
-  }
 
-
 
   return error;
 
 }
 
 
@@ -258,8 +286,8 @@ static void hs_on_complete(grpc_exec_ctx *exec_ctx, void *user_data,
 
                            grpc_error *err) {
 
   grpc_call_element *elem = user_data;
 
   call_data *calld = elem->call_data;
 
-  /* Call recv_message_ready if we got the payload via the header field */
 
-  if (calld->seen_payload_bin && calld->recv_message_ready != NULL) {
 
+  /* Call recv_message_ready if we got the payload via the path field */
 
+  if (calld->seen_path_with_query && calld->recv_message_ready != NULL) {
 
     *calld->pp_recv_message = calld->payload_bin_delivered
 
                                   ? NULL
 
                                   : (grpc_byte_stream *)&calld->read_stream;
 
@@ -274,7 +302,7 @@ static void hs_recv_message_ready(grpc_exec_ctx *exec_ctx, void *user_data,
 
                                   grpc_error *err) {
 
   grpc_call_element *elem = user_data;
 
   call_data *calld = elem->call_data;
 
-  if (calld->seen_payload_bin) {
 
+  if (calld->seen_path_with_query) {
 
     /* do nothing. This is probably a GET request, and payload will be returned
 
     in hs_on_complete callback. */
 
   } else {

+ 20 - 5
src/core/lib/security/util/b64.c
Ver fichero 

@@ -71,15 +71,31 @@ static const char base64_url_safe_chars[] =
 
 
 char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe,
 
                          int multiline) {
 
-  const unsigned char *data = vdata;
 
-  const char *base64_chars =
 
-      url_safe ? base64_url_safe_chars : base64_url_unsafe_chars;
 
+  size_t result_projected_size =
 
+      grpc_base64_estimate_encoded_size(data_size, url_safe, multiline);
 
+  char *result = gpr_malloc(result_projected_size);
 
+  grpc_base64_encode_core(result, vdata, data_size, url_safe, multiline);
 
+  return result;
 
+}
 
+
 
+size_t grpc_base64_estimate_encoded_size(size_t data_size, int url_safe,
 
+                                         int multiline) {
 
   size_t result_projected_size =
 
       4 * ((data_size + 3) / 3) +
 
       2 * (multiline ? (data_size / (3 * GRPC_BASE64_MULTILINE_NUM_BLOCKS))
 
                      : 0) +
 
       1;
 
-  char *result = gpr_malloc(result_projected_size);
 
+  return result_projected_size;
 
+}
 
+
 
+void grpc_base64_encode_core(char *result, const void *vdata, size_t data_size,
 
+                             int url_safe, int multiline) {
 
+  const unsigned char *data = vdata;
 
+  const char *base64_chars =
 
+      url_safe ? base64_url_safe_chars : base64_url_unsafe_chars;
 
+  const size_t result_projected_size =
 
+      grpc_base64_estimate_encoded_size(data_size, url_safe, multiline);
 
+
 
   char *current = result;
 
   size_t num_blocks = 0;
 
   size_t i = 0;
 
@@ -119,7 +135,6 @@ char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe,
 
   GPR_ASSERT(current >= result);
 
   GPR_ASSERT((uintptr_t)(current - result) < result_projected_size);
 
   result[current - result] = '\0';
 
-  return result;
 
 }
 
 
 grpc_slice grpc_base64_decode(grpc_exec_ctx *exec_ctx, const char *b64,

+ 13 - 1
src/core/lib/security/util/b64.h
Ver fichero 

@@ -37,10 +37,22 @@
 
 #include <grpc/slice.h>
 
 
 /* Encodes data using base64. It is the caller's responsability to free
 
-   the returned char * using gpr_free. Returns NULL on NULL input. */
 
+   the returned char * using gpr_free. Returns NULL on NULL input.
 
+   TODO(makdharma) : change the flags to bool from int */
 
 char *grpc_base64_encode(const void *data, size_t data_size, int url_safe,
 
                          int multiline);
 
 
+/* estimate the upper bound on size of base64 encoded data. The actual size
 
+ * is guaranteed to be less than or equal to the size returned here. */
 
+size_t grpc_base64_estimate_encoded_size(size_t data_size, int url_safe,
 
+                                         int multiline);
 
+
 
+/* Encodes data using base64 and write it to memory pointed to by result. It is
 
+ * the caller's responsiblity to allocate enough memory in |result| to fit the
 
+ * encoded data. */
 
+void grpc_base64_encode_core(char *result, const void *vdata, size_t data_size,
 
+                             int url_safe, int multiline);
 
+
 
 /* Decodes data according to the base64 specification. Returns an empty
 
    slice in case of failure. */
 
 grpc_slice grpc_base64_decode(grpc_exec_ctx *exec_ctx, const char *b64,

+ 22 - 23
src/objective-c/tests/CronetUnitTests/CronetUnitTests.m
Ver fichero 

@@ -187,6 +187,18 @@ unsigned int parse_h2_length(const char *field) {
 
   grpc_metadata_array_init(&request_metadata_recv);
 
   grpc_call_details_init(&call_details);
 
 
+  int sl = socket(AF_INET, SOCK_STREAM, 0);
 
+  GPR_ASSERT(sl >= 0);
 
+
 
+  // Make an TCP endpoint to accept the connection
 
+  struct sockaddr_in s_addr;
 
+  memset(&s_addr, 0, sizeof(s_addr));
 
+  s_addr.sin_family = AF_INET;
 
+  s_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 
+  s_addr.sin_port = htons(port);
 
+  GPR_ASSERT(0 == bind(sl, (struct sockaddr *)&s_addr, sizeof(s_addr)));
 
+  GPR_ASSERT(0 == listen(sl, 5));
 
+
 
   memset(ops, 0, sizeof(ops));
 
   op = ops;
 
   op->op = GRPC_OP_SEND_INITIAL_METADATA;
 
@@ -226,17 +238,6 @@ unsigned int parse_h2_length(const char *field) {
 
 
   dispatch_async(
 
       dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
-        int sl = socket(AF_INET, SOCK_STREAM, 0);
 
-        GPR_ASSERT(sl >= 0);
 
-
 
-        // Make and TCP endpoint to accept the connection
 
-        struct sockaddr_in s_addr;
 
-        memset(&s_addr, 0, sizeof(s_addr));
 
-        s_addr.sin_family = AF_INET;
 
-        s_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 
-        s_addr.sin_port = htons(port);
 
-        GPR_ASSERT(0 == bind(sl, (struct sockaddr *)&s_addr, sizeof(s_addr)));
 
-        GPR_ASSERT(0 == listen(sl, 5));
 
         int s = accept(sl, NULL, NULL);
 
         GPR_ASSERT(s >= 0);
 
 
@@ -324,17 +325,18 @@ unsigned int parse_h2_length(const char *field) {
 
   __weak XCTestExpectation *expectation =
 
       [self expectationWithDescription:@"Coalescing"];
 
 
+  int sl = socket(AF_INET, SOCK_STREAM, 0);
 
+  GPR_ASSERT(sl >= 0);
 
+  struct sockaddr_in s_addr;
 
+  memset(&s_addr, 0, sizeof(s_addr));
 
+  s_addr.sin_family = AF_INET;
 
+  s_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 
+  s_addr.sin_port = htons(port);
 
+  GPR_ASSERT(0 == bind(sl, (struct sockaddr *)&s_addr, sizeof(s_addr)));
 
+  GPR_ASSERT(0 == listen(sl, 5));
 
+
 
   dispatch_async(
 
       dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
 
-        int sl = socket(AF_INET, SOCK_STREAM, 0);
 
-        GPR_ASSERT(sl >= 0);
 
-        struct sockaddr_in s_addr;
 
-        memset(&s_addr, 0, sizeof(s_addr));
 
-        s_addr.sin_family = AF_INET;
 
-        s_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 
-        s_addr.sin_port = htons(port);
 
-        GPR_ASSERT(0 == bind(sl, (struct sockaddr *)&s_addr, sizeof(s_addr)));
 
-        GPR_ASSERT(0 == listen(sl, 5));
 
         int s = accept(sl, NULL, NULL);
 
         GPR_ASSERT(s >= 0);
 
         struct timeval tv;
 
@@ -389,9 +391,6 @@ unsigned int parse_h2_length(const char *field) {
 
         [expectation fulfill];
 
       });
 
 
-  // Guarantees that server is listening to the port before client connects.
 
-  sleep(1);
 
-
 
   memset(ops, 0, sizeof(ops));
 
   op = ops;
 
   op->op = GRPC_OP_SEND_INITIAL_METADATA;

+ 0 - 20
src/objective-c/tests/Tests.xcodeproj/xcshareddata/xcschemes/AllTests.xcscheme
Ver fichero 

@@ -49,26 +49,6 @@
 
                </Test>
 
             </SkippedTests>
 
          </TestableReference>
 
-         <TestableReference
 
-            skipped = "NO">
 
-            <BuildableReference
 
-               BuildableIdentifier = "primary"
 
-               BlueprintIdentifier = "5E8A5DA31D3840B4000F8BC4"
 
-               BuildableName = "CoreCronetEnd2EndTests.xctest"
 
-               BlueprintName = "CoreCronetEnd2EndTests"
 
-               ReferencedContainer = "container:Tests.xcodeproj">
 
-            </BuildableReference>
 
-         </TestableReference>
 
-         <TestableReference
 
-            skipped = "NO">
 
-            <BuildableReference
 
-               BuildableIdentifier = "primary"
 
-               BlueprintIdentifier = "5EAD6D231E27047400002378"
 
-               BuildableName = "CronetUnitTests.xctest"
 
-               BlueprintName = "CronetUnitTests"
 
-               ReferencedContainer = "container:Tests.xcodeproj">
 
-            </BuildableReference>
 
-         </TestableReference>
 
       </Testables>
 
       <MacroExpansion>
 
          <BuildableReference

+ 1 - 3
src/objective-c/tests/build_one_example.sh
Ver fichero 

@@ -57,6 +57,4 @@ xcodebuild \
 
     build \
 
     -workspace *.xcworkspace \
 
     -scheme $SCHEME \
 
-    -destination name="iPhone 6" \
 
-    | egrep "$XCODEBUILD_FILTER" \
 
-    | egrep -v "(GPBDictionary|GPBArray)" -
 
+    -destination name="iPhone 6" | xcpretty

+ 14 - 6
src/objective-c/tests/run_tests.sh
Ver fichero 

@@ -58,14 +58,22 @@ xcodebuild \
 
     -workspace Tests.xcworkspace \
 
     -scheme AllTests \
 
     -destination name="iPhone 6" \
 
-    test \
 
-    | egrep "$XCODEBUILD_FILTER" \
 
-    | egrep -v "(GPBDictionary|GPBArray)" -
 
+    test | xcpretty
 
+
 
+xcodebuild \
 
+    -workspace Tests.xcworkspace \
 
+    -scheme CoreCronetEnd2EndTests \
 
+    -destination name="iPhone 6" \
 
+    test | xcpretty
 
+
 
+xcodebuild \
 
+    -workspace Tests.xcworkspace \
 
+    -scheme CronetUnitTests \
 
+    -destination name="iPhone 6" \
 
+    test | xcpretty
 
 
 xcodebuild \
 
     -workspace Tests.xcworkspace \
 
     -scheme InteropTestsRemoteWithCronet \
 
     -destination name="iPhone 6" \
 
-    test \
 
-    | egrep "$XCODEBUILD_FILTER" \
 
-    | egrep -v "(GPBDictionary|GPBArray)" -
 
+    test | xcpretty

+ 1 - 1
src/python/grpcio/grpc_core_dependencies.py
Ver fichero 

@@ -162,6 +162,7 @@ CORE_SOURCE_FILES = [
 
   'src/core/lib/json/json_reader.c',
 
   'src/core/lib/json/json_string.c',
 
   'src/core/lib/json/json_writer.c',
 
+  'src/core/lib/security/util/b64.c',
 
   'src/core/lib/slice/percent_encoding.c',
 
   'src/core/lib/slice/slice.c',
 
   'src/core/lib/slice/slice_buffer.c',
 
@@ -244,7 +245,6 @@ CORE_SOURCE_FILES = [
 
   'src/core/lib/security/transport/security_handshaker.c',
 
   'src/core/lib/security/transport/server_auth_filter.c',
 
   'src/core/lib/security/transport/tsi_error.c',
 
-  'src/core/lib/security/util/b64.c',
 
   'src/core/lib/security/util/json_util.c',
 
   'src/core/lib/surface/init_secure.c',
 
   'src/core/lib/tsi/fake_transport_security.c',

+ 37 - 26
test/core/iomgr/ev_epoll_linux_test.c
Ver fichero 

@@ -139,23 +139,25 @@ static void increment(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {
 
  * polling_island_merge()[ev_epoll_linux.c], where the parent relationship was
 
  * inverted.
 
  */
 
+
 
+#define NUM_FDS 2
 
+#define NUM_POLLSETS 2
 
+#define NUM_CLOSURES 4
 
+
 
 static void test_pollset_queue_merge_items() {
 
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
 
-  const int num_fds = 2;
 
-  const int num_pollsets = 2;
 
-  const int num_closures = 4;
 
-  test_fd tfds[num_fds];
 
-  int fds[num_fds];
 
-  test_pollset pollsets[num_pollsets];
 
-  grpc_closure closures[num_closures];
 
+  test_fd tfds[NUM_FDS];
 
+  int fds[NUM_FDS];
 
+  test_pollset pollsets[NUM_POLLSETS];
 
+  grpc_closure closures[NUM_CLOSURES];
 
   int i;
 
   int result = 0;
 
 
-  test_fd_init(tfds, fds, num_fds);
 
-  test_pollset_init(pollsets, num_pollsets);
 
+  test_fd_init(tfds, fds, NUM_FDS);
 
+  test_pollset_init(pollsets, NUM_POLLSETS);
 
 
   /* Two distinct polling islands, each with their own FD and pollset. */
 
-  for (i = 0; i < num_fds; i++) {
 
+  for (i = 0; i < NUM_FDS; i++) {
 
     grpc_pollset_add_fd(&exec_ctx, pollsets[i].pollset, tfds[i].fd);
 
     grpc_exec_ctx_flush(&exec_ctx);
 
   }
 
@@ -173,7 +175,7 @@ static void test_pollset_queue_merge_items() {
 
   grpc_closure_init(
 
       closures + 3, increment, &result,
 
       grpc_workqueue_scheduler(grpc_fd_get_polling_island(tfds[1].fd)));
 
-  for (i = 0; i < num_closures; ++i) {
 
+  for (i = 0; i < NUM_CLOSURES; ++i) {
 
     grpc_closure_sched(&exec_ctx, closures + i, GRPC_ERROR_NONE);
 
   }
 
 
@@ -186,7 +188,7 @@ static void test_pollset_queue_merge_items() {
 
    * the merged polling island.
 
    */
 
   grpc_pollset_worker *worker = NULL;
 
-  for (i = 0; i < num_closures; ++i) {
 
+  for (i = 0; i < NUM_CLOSURES; ++i) {
 
     const gpr_timespec deadline = gpr_time_add(
 
         gpr_now(GPR_CLOCK_MONOTONIC), gpr_time_from_seconds(2, GPR_TIMESPAN));
 
     gpr_mu_lock(pollsets[1].mu);
 
@@ -196,13 +198,17 @@ static void test_pollset_queue_merge_items() {
 
                           gpr_now(GPR_CLOCK_MONOTONIC), deadline));
 
     gpr_mu_unlock(pollsets[1].mu);
 
   }
 
-  GPR_ASSERT(result == num_closures);
 
+  GPR_ASSERT(result == NUM_CLOSURES);
 
 
-  test_fd_cleanup(&exec_ctx, tfds, num_fds);
 
-  test_pollset_cleanup(&exec_ctx, pollsets, num_pollsets);
 
+  test_fd_cleanup(&exec_ctx, tfds, NUM_FDS);
 
+  test_pollset_cleanup(&exec_ctx, pollsets, NUM_POLLSETS);
 
   grpc_exec_ctx_finish(&exec_ctx);
 
 }
 
 
+#undef NUM_FDS
 
+#undef NUM_POLLSETS
 
+#undef NUM_CLOSURES
 
+
 
 /*
 
  * Cases to test:
 
  *  case 1) Polling islands of both fd and pollset are NULL
 
@@ -213,18 +219,20 @@ static void test_pollset_queue_merge_items() {
 
  *     case 4.2) Polling islands of fd and pollset are NOT-equal (This results
 
  *     in a merge)
 
  * */
 
+
 
+#define NUM_FDS 8
 
+#define NUM_POLLSETS 4
 
+
 
 static void test_add_fd_to_pollset() {
 
   grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
 
-  const int num_fds = 8;
 
-  const int num_pollsets = 4;
 
-  test_fd tfds[num_fds];
 
-  int fds[num_fds];
 
-  test_pollset pollsets[num_pollsets];
 
+  test_fd tfds[NUM_FDS];
 
+  int fds[NUM_FDS];
 
+  test_pollset pollsets[NUM_POLLSETS];
 
   void *expected_pi = NULL;
 
   int i;
 
 
-  test_fd_init(tfds, fds, num_fds);
 
-  test_pollset_init(pollsets, num_pollsets);
 
+  test_fd_init(tfds, fds, NUM_FDS);
 
+  test_pollset_init(pollsets, NUM_POLLSETS);
 
 
   /*Step 1.
 
    * Create three polling islands (This will exercise test case 1 and 2) with
 
@@ -285,22 +293,25 @@ static void test_add_fd_to_pollset() {
 
 
   /* Compare Fd:0's polling island with that of all other Fds */
 
   expected_pi = grpc_fd_get_polling_island(tfds[0].fd);
 
-  for (i = 1; i < num_fds; i++) {
 
+  for (i = 1; i < NUM_FDS; i++) {
 
     GPR_ASSERT(grpc_are_polling_islands_equal(
 
         expected_pi, grpc_fd_get_polling_island(tfds[i].fd)));
 
   }
 
 
   /* Compare Fd:0's polling island with that of all other pollsets */
 
-  for (i = 0; i < num_pollsets; i++) {
 
+  for (i = 0; i < NUM_POLLSETS; i++) {
 
     GPR_ASSERT(grpc_are_polling_islands_equal(
 
         expected_pi, grpc_pollset_get_polling_island(pollsets[i].pollset)));
 
   }
 
 
-  test_fd_cleanup(&exec_ctx, tfds, num_fds);
 
-  test_pollset_cleanup(&exec_ctx, pollsets, num_pollsets);
 
+  test_fd_cleanup(&exec_ctx, tfds, NUM_FDS);
 
+  test_pollset_cleanup(&exec_ctx, pollsets, NUM_POLLSETS);
 
   grpc_exec_ctx_finish(&exec_ctx);
 
 }
 
 
+#undef NUM_FDS
 
+#undef NUM_POLLSETS
 
+
 
 int main(int argc, char **argv) {
 
   const char *poll_strategy = NULL;
 
   grpc_test_init(argc, argv);

+ 2 - 0
tools/distrib/check_copyright.py
Ver fichero 

@@ -111,6 +111,8 @@ _EXEMPT = frozenset((
 
 
   # An older file originally from outside gRPC.
 
   'src/php/tests/bootstrap.php',
 
+  # census.proto copied from github
 
+  'tools/grpcz/census.proto',
 
 ))

+ 63 - 0
tools/grpcz/BUILD
Ver fichero 

@@ -0,0 +1,63 @@
 
+# Copyright 2017, Google Inc.
 
+# All rights reserved.
 
+#
 
+# Redistribution and use in source and binary forms, with or without
 
+# modification, are permitted provided that the following conditions are
 
+# met:
 
+#
 
+#     * Redistributions of source code must retain the above copyright
 
+# notice, this list of conditions and the following disclaimer.
 
+#     * Redistributions in binary form must reproduce the above
 
+# copyright notice, this list of conditions and the following disclaimer
 
+# in the documentation and/or other materials provided with the
 
+# distribution.
 
+#     * Neither the name of Google Inc. nor the names of its
 
+# contributors may be used to endorse or promote products derived from
 
+# this software without specific prior written permission.
 
+#
 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
+# 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.
 
+
 
+licenses(["notice"])  # 3-clause BSD
 
+
 
+package(default_visibility = ["//visibility:public"])
 
+
 
+load("//:bazel/grpc_build_system.bzl", "grpc_proto_library")
 
+
 
+grpc_proto_library (
 
+    name = "monitoring_proto",
 
+    srcs = [
 
+        "monitoring.proto",
 
+    ],
 
+    deps = [
 
+        ":census_proto",
 
+    ],
 
+    well_known_protos = "@submodule_protobuf//:well_known_protos",
 
+)
 
+
 
+grpc_proto_library (
 
+    name = "census_proto",
 
+    srcs = [
 
+        "census.proto",
 
+    ],
 
+    well_known_protos = "@submodule_protobuf//:well_known_protos",
 
+)
 
+
 
+cc_binary(
 
+    name = "grpcz_client",
 
+    srcs = ["grpcz_client.cc",],
 
+    deps = [
 
+        "//external:gflags",
 
+        "monitoring_proto",
 
+        "@mongoose_repo//:mongoose_lib",
 
+    ],
 
+)

+ 318 - 0
tools/grpcz/census.proto
Ver fichero 

@@ -0,0 +1,318 @@
 
+// Copyright 2017, Google Inc.
 
+// Licensed under the Apache License, Version 2.0 (the "License");
 
+// you may not use this file except in compliance with the License.
 
+// You may obtain a copy of the License at
 
+//     http://www.apache.org/licenses/LICENSE-2.0
 
+// Unless required by applicable law or agreed to in writing, software
 
+// distributed under the License is distributed on an "AS IS" BASIS,
 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
+// See the License for the specific language governing permissions and
 
+// limitations under the License.
 
+
 
+//TODO(ericgribkoff) Depend on this directly from the instrumentation-proto
 
+//repository.
 
+
 
+syntax = "proto3";
 
+
 
+package google.instrumentation;
 
+
 
+option java_package = "com.google.instrumentation.stats.proto";
 
+option java_outer_classname = "CensusProto";
 
+
 
+// All the census protos.
 
+//
 
+// Nomenclature notes:
 
+//   * Capitalized names below (like View) are protos.
 
+//   * Protos which describe types are named with a Descriptor suffix (e.g.
 
+//     MesurementDescriptor).
 
+//
 
+// Census lets you define the type and description of the data being measured
 
+// (e.g. the latency of an RPC or the number of CPU cycles spent on an
 
+// operation using MeasurementDescriptor. As individual measurements (a double
 
+// value) for are recorded, they are aggregated together into an
 
+// Aggregation. There are two Aggregation types available: Distribution
 
+// (describes the distribution of all measurements, possibly with a histogram)
 
+// and IntervalStats (the count and mean of measurements across specified time
 
+// periods). An Aggregation is described by an AggregationDescriptor.
 
+//
 
+// You can define how your measurements (described by a MeasurementDescriptor)
 
+// are broken down by Tag values and which Aggregations to use through a
 
+// ViewDescriptor. The output (all measurements broken down by tag values into
 
+// specific Aggregations) is called a View.
 
+
 
+
 
+// The following two types are copied from
 
+// google/protobuf/{duration,timestamp}.proto. Ideally, we would be able to
 
+// import them, but this causes compilation issues on C-based systems
 
+// (e.g. https://koti.kapsi.fi/jpa/nanopb/), which cannot process the C++
 
+// headers generated from the standard protobuf distribution. See the relevant
 
+// proto files for full documentation of these types.
 
+
 
+message Duration {
 
+  // Signed seconds of the span of time. Must be from -315,576,000,000
 
+  // to +315,576,000,000 inclusive.
 
+  int64 seconds = 1;
 
+
 
+  // Signed fractions of a second at nanosecond resolution of the span
 
+  // of time. Durations less than one second are represented with a 0
 
+  // `seconds` field and a positive or negative `nanos` field. For durations
 
+  // of one second or more, a non-zero value for the `nanos` field must be
 
+  // of the same sign as the `seconds` field. Must be from -999,999,999
 
+  // to +999,999,999 inclusive.
 
+  int32 nanos = 2;
 
+}
 
+
 
+message Timestamp {
 
+  // Represents seconds of UTC time since Unix epoch
 
+  // 1970-01-01T00:00:00Z. Must be from from 0001-01-01T00:00:00Z to
 
+  // 9999-12-31T23:59:59Z inclusive.
 
+  int64 seconds = 1;
 
+
 
+  // Non-negative fractions of a second at nanosecond resolution. Negative
 
+  // second values with fractions must still have non-negative nanos values
 
+  // that count forward in time. Must be from 0 to 999,999,999
 
+  // inclusive.
 
+  int32 nanos = 2;
 
+}
 
+
 
+// MeasurementDescriptor describes a data point (measurement) type.
 
+message MeasurementDescriptor {
 
+  // A descriptive name, e.g. rpc_latency, cpu. Must be unique.
 
+  string name = 1;
 
+
 
+  // More detailed description of the resource, used in documentation.
 
+  string description = 2;
 
+
 
+  // Fundamental units of measurement supported by Census
 
+  // TODO(aveitch): expand this to include other S.I. units?
 
+  enum BasicUnit {
 
+    UNKNOWN = 0;    // Implementations should not use this
 
+    SCALAR = 1;     // Dimensionless
 
+    BITS = 2;       // A single bit
 
+    BYTES = 3;      // An 8-bit byte
 
+    SECONDS = 4;    // S.I. unit
 
+    CORES = 5;      // CPU core usage
 
+    MAX_UNITS = 6;  // Last defined value; implementations should only use
 
+                    // this for validation.
 
+  }
 
+
 
+  // MeasurementUnit lets you build compound units of the form
 
+  //   10^n * (A * B * ...) / (X * Y * ...),
 
+  // where the elements in the numerator and denominator are all BasicUnits.  A
 
+  // MeasurementUnit must have at least one BasicUnit in its numerator.
 
+  //
 
+  // To specify multiplication in the numerator or denominator, simply specify
 
+  // multiple numerator or denominator fields.  For example:
 
+  //
 
+  // - byte-seconds (i.e. bytes * seconds):
 
+  //     numerator: BYTES
 
+  //     numerator: SECS
 
+  //
 
+  // - events/sec^2 (i.e. rate of change of events/sec):
 
+  //     numerator: SCALAR
 
+  //     denominator: SECS
 
+  //     denominator: SECS
 
+  //
 
+  // To specify multiples (in power of 10) of units, specify a non-zero
 
+  // 'power10' value, for example:
 
+  //
 
+  // - MB/s (i.e. megabytes / s):
 
+  //     power10: 6
 
+  //     numerator: BYTES
 
+  //     denominator: SECS
 
+  //
 
+  // - nanoseconds
 
+  //     power10: -9
 
+  //     numerator: SECS
 
+  message MeasurementUnit {
 
+    int32 power10 = 1;
 
+    repeated BasicUnit numerators = 2;
 
+    repeated BasicUnit denominators = 3;
 
+  }
 
+
 
+  // The units used by this type of measurement.
 
+  MeasurementUnit unit = 3;
 
+}
 
+
 
+// An aggregation summarizes a series of individual measurements. There are
 
+// two types of aggregation (IntervalAggregation and DistributionAggregation),
 
+// unique types of each can be set using descriptors for each.
 
+
 
+// DistributionAggregation contains summary statistics for a population of
 
+// values and, optionally, a histogram representing the distribution of those
 
+// values across a specified set of histogram buckets, as defined in
 
+// DistributionAggregationDescriptor.bucket_bounds.
 
+//
 
+// The summary statistics are the count, mean, minimum, and the maximum of the
 
+// set of population of values.
 
+//
 
+// Although it is not forbidden, it is generally a bad idea to include
 
+// non-finite values (infinities or NaNs) in the population of values, as this
 
+// will render the `mean` field meaningless.
 
+message DistributionAggregation {
 
+  // The number of values in the population. Must be non-negative.
 
+  int64 count = 1;
 
+
 
+  // The arithmetic mean of the values in the population. If `count` is zero
 
+  // then this field must be zero.
 
+  double mean = 2;
 
+
 
+  // The sum of the values in the population.  If `count` is zero then this
 
+  // field must be zero.
 
+  double sum = 3;
 
+
 
+  // Describes a range of population values.
 
+  message Range {
 
+    // The minimum of the population values.
 
+    double min = 1;
 
+    // The maximum of the population values.
 
+    double max = 2;
 
+  }
 
+
 
+  // The range of the population values. If `count` is zero, this field will not
 
+  // be defined.
 
+  Range range = 4;
 
+
 
+  // A Distribution may optionally contain a histogram of the values in the
 
+  // population. The histogram is given in `bucket_count` as counts of values
 
+  // that fall into one of a sequence of non-overlapping buckets, as described
 
+  // by `DistributionAggregationDescriptor.bucket_boundaries`. The sum of the
 
+  // values in `bucket_counts` must equal the value in `count`.
 
+  //
 
+  // Bucket counts are given in order under the numbering scheme described
 
+  // above (the underflow bucket has number 0; the finite buckets, if any,
 
+  // have numbers 1 through N-2; the overflow bucket has number N-1).
 
+  //
 
+  // The size of `bucket_count` must be no greater than N as defined in
 
+  // `bucket_boundaries`.
 
+  //
 
+  // Any suffix of trailing zero bucket_count fields may be omitted.
 
+  repeated int64 bucket_counts = 5;
 
+
 
+  // Tags associated with this DistributionAggregation. These will be filled
 
+  // in based on the View specification.
 
+  repeated Tag tags = 6;
 
+}
 
+
 
+message DistributionAggregationDescriptor {
 
+  // A Distribution may optionally contain a histogram of the values in the
 
+  // population. The bucket boundaries for that histogram are described by
 
+  // `bucket_bounds`. This defines `size(bucket_bounds) + 1` (= N)
 
+  // buckets. The boundaries for bucket index i are:
 
+  //
 
+  // [-infinity, bucket_bounds[i]) for i == 0
 
+  // [bucket_bounds[i-1], bucket_bounds[i]) for 0 < i < N-2
 
+  // [bucket_bounds[i-1], +infinity) for i == N-1
 
+  //
 
+  // i.e. an underflow bucket (number 0), zero or more finite buckets (1
 
+  // through N - 2, and an overflow bucket (N - 1), with inclusive lower
 
+  // bounds and exclusive upper bounds.
 
+  //
 
+  // If `bucket_bounds` has no elements (zero size), then there is no
 
+  // histogram associated with the Distribution. If `bucket_bounds` has only
 
+  // one element, there are no finite buckets, and that single element is the
 
+  // common boundary of the overflow and underflow buckets. The values must
 
+  // be monotonically increasing.
 
+  repeated double bucket_bounds = 1;
 
+}
 
+
 
+// An IntervalAggreation records summary stats over various time
 
+// windows. These stats are approximate, with the degree of accuracy
 
+// controlled by setting the n_sub_intervals parameter in the
 
+// IntervalAggregationDescriptor.
 
+message IntervalAggregation {
 
+  // Summary statistic over a single time interval.
 
+  message Interval {
 
+    // The interval duration. Must be positive.
 
+    Duration interval_size = 1;
 
+    // Approximate number of measurements recorded in this interval.
 
+    double count = 2;
 
+    // The cumulative sum of measurements in this interval.
 
+    double sum = 3;
 
+  }
 
+
 
+  // Full set of intervals for this aggregation.
 
+  repeated Interval intervals = 1;
 
+
 
+  // Tags associated with this IntervalAggregation. These will be filled in
 
+  // based on the View specification.
 
+  repeated Tag tags = 2;
 
+}
 
+
 
+// An IntervalAggreationDescriptor specifies time intervals for an
 
+// IntervalAggregation.
 
+message IntervalAggregationDescriptor {
 
+  // Number of internal sub-intervals to use when collecting stats for each
 
+  // interval. The max error in interval measurements will be approximately
 
+  // 1/n_sub_intervals (although in practice, this will only be approached in
 
+  // the presence of very large and bursty workload changes), and underlying
 
+  // memory usage will be roughly proportional to the value of this
 
+  // field. Must be in the range [2, 20]. A value of 5 will be used if this is
 
+  // unspecified.
 
+  int32 n_sub_intervals = 1;
 
+
 
+  // The size of each interval, as a time duration. Must have at least one
 
+  // element.
 
+  repeated Duration interval_sizes = 2;
 
+}
 
+
 
+// A Tag: key-value pair.
 
+message Tag {
 
+  string key = 1;
 
+  string value = 2;
 
+}
 
+
 
+// A ViewDescriptor specifies an AggregationDescriptor and a set of tag
 
+// keys. Views instantiated from this descriptor will contain Aggregations
 
+// broken down by the unique set of matching tag values for each measurement.
 
+message ViewDescriptor {
 
+  // Name of view. Must be unique.
 
+  string name = 1;
 
+
 
+  // More detailed description, for documentation purposes.
 
+  string description = 2;
 
+
 
+  // Name of a MeasurementDescriptor to be used for this view.
 
+  string measurement_descriptor_name = 3;
 
+
 
+  // Aggregation type to associate with View.
 
+  oneof aggregation {
 
+    IntervalAggregationDescriptor interval_aggregation = 4;
 
+    DistributionAggregationDescriptor distribution_aggregation = 5;
 
+  }
 
+
 
+  // Tag keys to match with a given measurement. If no keys are specified,
 
+  // then all stats are recorded. Keys must be unique.
 
+  repeated string tag_keys = 6;
 
+}
 
+
 
+// DistributionView contains all aggregations for a view specified using a
 
+// DistributionAggregationDescriptor.
 
+message DistributionView {
 
+  // Aggregations - each will have a unique set of tag values for the tag_keys
 
+  // associated with the corresponding View.
 
+  repeated DistributionAggregation aggregations = 1;
 
+
 
+  // Start and end timestamps over which aggregations was accumulated.
 
+  Timestamp start = 2;
 
+  Timestamp end = 3;
 
+}
 
+
 
+// IntervalView contains all aggregations for a view specified using a
 
+// IntervalAggregationDescriptor.
 
+message IntervalView {
 
+  // Aggregations - each will have a unique set of tag values for the tag_keys
 
+  // associated with the corresponding View.
 
+  repeated IntervalAggregation aggregations = 1;
 
+}
 
+
 
+// A View contains the aggregations based on a ViewDescriptor.
 
+message View {
 
+  // ViewDescriptor name associated with this set of View.
 
+  string view_name = 1;
 
+
 
+  oneof view {
 
+    DistributionView distribution_view = 2;
 
+    IntervalView interval_view = 3;
 
+  }
 
+}

+ 181 - 0
tools/grpcz/grpcz_client.cc
Ver fichero 

@@ -0,0 +1,181 @@
 
+/*
 
+ *
 
+ * Copyright 2017, Google Inc.
 
+ * All rights reserved.
 
+ *
 
+ * Redistribution and use in source and binary forms, with or without
 
+ * modification, are permitted provided that the following conditions are
 
+ * met:
 
+ *
 
+ *     * Redistributions of source code must retain the above copyright
 
+ * notice, this list of conditions and the following disclaimer.
 
+ *     * Redistributions in binary form must reproduce the above
 
+ * copyright notice, this list of conditions and the following disclaimer
 
+ * in the documentation and/or other materials provided with the
 
+ * distribution.
 
+ *     * Neither the name of Google Inc. nor the names of its
 
+ * contributors may be used to endorse or promote products derived from
 
+ * this software without specific prior written permission.
 
+ *
 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
+ * 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.
 
+ *
 
+ */
 
+
 
+#include <string>
 
+
 
+#include <google/protobuf/util/json_util.h>
 
+#include <grpc++/grpc++.h>
 
+#include <grpc/support/log.h>
 
+
 
+#include "gflags/gflags.h"
 
+#include "mongoose.h"
 
+
 
+// TODO (makdharma): remove local copies of these protos
 
+#include "tools/grpcz/census.grpc.pb.h"
 
+#include "tools/grpcz/monitoring.grpc.pb.h"
 
+
 
+DEFINE_string(
 
+    grpcz_server, "127.0.0.1:8080",
 
+    "Unix domain socket path (e.g. unix://tmp/grpcz.sock) or IP address"
 
+    "(host:port) where grpcz server is running.");
 
+DEFINE_string(http_port, "8000",
 
+              "Port id for accessing the HTTP server that renders /grpcz page");
 
+DEFINE_bool(print_to_console, false,
 
+            "print the JSON retreived from grpcz server and quit");
 
+
 
+using grpc::Channel;
 
+using grpc::ClientContext;
 
+using grpc::Status;
 
+
 
+using ::grpc::instrumentation::v1alpha::CanonicalRpcStats;
 
+using ::grpc::instrumentation::v1alpha::Monitoring;
 
+
 
+static const std::string static_html_header =
 
+    "<!DOCTYPE html> <html> <head> <style> \
 
+table { border-collapse: collapse; width: 100%; } \
 
+table, td, th { border: 1px solid black; } \
 
+</style> </head> <body>\
 
+<div id='stats' data-stats='";
 
+
 
+static const std::string static_html_footer =
 
+    "' class='hidden'></div>\
 
+<h1>GRPCZ Statistics</h1> <div id='table'> </div> \
 
+<script> \
 
+  var canonical_stats = JSON.parse(\
 
+            document.getElementById('stats').getAttribute('data-stats')); \
 
+  var table = document.createElement('table'); \
 
+  if (canonical_stats['Error Message'] != undefined) { \
 
+     document.getElementById('table').innerHTML = canonical_stats['Error Message']; } \
 
+  else {\
 
+  for (var key in canonical_stats) { \
 
+    name = canonical_stats[key]['view']['viewName']; \
 
+    distribution = canonical_stats[key]['view']['distributionView']; \
 
+    interval = canonical_stats[key]['view']['intervalView']; \
 
+    value = (interval == undefined) ? \
 
+      JSON.stringify(distribution, null, ' ') : \
 
+      JSON.stringify(interval, null, ' '); \
 
+    var row = table.insertRow(-1); \
 
+    var col1 = row.insertCell(0); \
 
+    var col2 = row.insertCell(1); \
 
+    col1.innerHTML = name; \
 
+    col2.innerHTML = '<pre>' + value + '</pre>'; \
 
+  } \
 
+  document.getElementById('table').appendChild(table); \
 
+  }\
 
+</script> </body> </html>";
 
+
 
+class GrpczClient {
 
+ public:
 
+  GrpczClient(std::shared_ptr<Channel> channel)
 
+      : stub_(Monitoring::NewStub(channel)) {}
 
+
 
+  std::string GetStatsAsJson() {
 
+    const ::google::protobuf::Empty request;
 
+    CanonicalRpcStats reply;
 
+    ClientContext context;
 
+    Status status = stub_->GetCanonicalRpcStats(&context, request, &reply);
 
+
 
+    if (status.ok()) {
 
+      std::string json_str;
 
+      ::google::protobuf::util::MessageToJsonString(reply, &json_str);
 
+      return json_str;
 
+    } else {
 
+      static const std::string error_message_json =
 
+          "{\"Error Message\":\"" + status.error_message() + "\"}";
 
+      gpr_log(GPR_DEBUG, "%d: %s", status.error_code(),
 
+              status.error_message().c_str());
 
+      return error_message_json;
 
+    }
 
+  }
 
+
 
+ private:
 
+  std::unique_ptr<Monitoring::Stub> stub_;
 
+};
 
+
 
+static struct mg_serve_http_opts s_http_server_opts;
 
+std::unique_ptr<GrpczClient> g_grpcz_client;
 
+
 
+static void ev_handler(struct mg_connection *nc, int ev, void *p) {
 
+  if (ev == MG_EV_HTTP_REQUEST) {
 
+    mg_serve_http(nc, (struct http_message *)p, s_http_server_opts);
 
+  }
 
+}
 
+
 
+static void grpcz_handler(struct mg_connection *nc, int ev, void *ev_data) {
 
+  (void)ev;
 
+  (void)ev_data;
 
+  gpr_log(GPR_INFO, "fetching grpcz stats from %s", FLAGS_grpcz_server.c_str());
 
+  std::string json_str = g_grpcz_client->GetStatsAsJson();
 
+  std::string rendered_html =
 
+      static_html_header + json_str + static_html_footer;
 
+  mg_printf(nc, "HTTP/1.0 200 OK\r\n\r\n%s", rendered_html.c_str());
 
+  nc->flags |= MG_F_SEND_AND_CLOSE;
 
+}
 
+
 
+int main(int argc, char **argv) {
 
+  gflags::ParseCommandLineFlags(&argc, &argv, true);
 
+
 
+  // Create a client
 
+  g_grpcz_client.reset(new GrpczClient(grpc::CreateChannel(
 
+      FLAGS_grpcz_server, grpc::InsecureChannelCredentials())));
 
+  if (FLAGS_print_to_console) {
 
+    // using GPR_ERROR since this is the default verbosity. _DEBUG or _INFO
 
+    // won't print unless GRPC_VERBOSITY env var is set appropriately, which
 
+    // might confuse users of this utility.
 
+    gpr_log(GPR_ERROR, "%s\n", g_grpcz_client->GetStatsAsJson().c_str());
 
+    return 0;
 
+  }
 
+
 
+  // Set up a mongoose webserver handler
 
+  struct mg_mgr mgr;
 
+  mg_mgr_init(&mgr, NULL);
 
+  gpr_log(GPR_INFO, "Starting grpcz web server on port %s\n",
 
+          FLAGS_http_port.c_str());
 
+
 
+  struct mg_connection *nc = mg_bind(&mgr, FLAGS_http_port.c_str(), ev_handler);
 
+  if (nc == NULL) {
 
+    gpr_log(GPR_ERROR, "Failed to create listener on port %s\n",
 
+            FLAGS_http_port.c_str());
 
+    return -1;
 
+  }
 
+  mg_register_http_endpoint(nc, "/grpcz", grpcz_handler);
 
+  mg_set_protocol_http_websocket(nc);
 
+
 
+  // Poll in a loop and serve /grpcz pages
 
+  for (;;) {
 
+    static const int k_sleep_millis = 100;
 
+    mg_mgr_poll(&mgr, k_sleep_millis);
 
+  }
 
+  mg_mgr_free(&mgr);
 
+  return 0;
 
+}

+ 156 - 0
tools/grpcz/monitoring.proto
Ver fichero 

@@ -0,0 +1,156 @@
 
+// Copyright 2017, Google Inc.
 
+// All rights reserved.
 
+//
 
+// Redistribution and use in source and binary forms, with or without
 
+// modification, are permitted provided that the following conditions are
 
+// met:
 
+//
 
+//     * Redistributions of source code must retain the above copyright
 
+// notice, this list of conditions and the following disclaimer.
 
+//     * Redistributions in binary form must reproduce the above
 
+// copyright notice, this list of conditions and the following disclaimer
 
+// in the documentation and/or other materials provided with the
 
+// distribution.
 
+//     * Neither the name of Google Inc. nor the names of its
 
+// contributors may be used to endorse or promote products derived from
 
+// this software without specific prior written permission.
 
+//
 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
+// 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.
 
+
 
+// This file defines an interface for exporting monitoring information
 
+// out of gRPC servers.
 
+syntax = "proto3";
 
+
 
+// TODO(ericgribkoff) Figure out how to manage the external Census proto
 
+// dependency.
 
+import "tools/grpcz/census.proto";
 
+import "google/protobuf/any.proto";
 
+import "google/protobuf/empty.proto";
 
+
 
+package grpc.instrumentation.v1alpha;
 
+
 
+option java_multiple_files = true;
 
+option java_package = "io.grpc.instrumentation.v1alpha";
 
+option java_outer_classname = "MonitoringProto";
 
+
 
+service Monitoring {
 
+  // Return canonical RPC stats
 
+  rpc GetCanonicalRpcStats(google.protobuf.Empty) returns (CanonicalRpcStats) {
 
+  }
 
+
 
+  // Query the server for specific stats
 
+  rpc GetStats(StatsRequest) returns (StatsResponse) {
 
+  }
 
+
 
+  // Request the server to stream back snapshots of the requested stats
 
+  rpc WatchStats(StatsRequest) returns (stream StatsResponse) {
 
+  }
 
+
 
+
 
+  // Return request traces.
 
+  rpc GetRequestTraces(TraceRequest) returns(TraceResponse) {
 
+  // TODO(aveitch): Please define the messages here
 
+  }
 
+
 
+  // Return application-defined groups of monitoring data.
 
+  // This is a low level facility to allow extension of the monitoring API to
 
+  // application-specific monitoring data. Frameworks may use this to define
 
+  // additional groups of monitoring data made available by servers.
 
+  rpc GetCustomMonitoringData(MonitoringDataGroup)
 
+    returns (CustomMonitoringData) {
 
+  }
 
+
 
+}
 
+
 
+// Canonical RPC stats exported by gRPC.
 
+message CanonicalRpcStats {
 
+  StatsResponse rpc_client_errors = 1;
 
+  StatsResponse rpc_client_completed_rpcs = 2;
 
+  StatsResponse rpc_client_started_rpcs = 3;
 
+  StatsResponse rpc_client_elapsed_time = 4;
 
+  StatsResponse rpc_client_server_elapsed_time = 5;
 
+  StatsResponse rpc_client_request_bytes = 6;
 
+  StatsResponse rpc_client_response_bytes = 7;
 
+  StatsResponse rpc_client_request_count = 8;
 
+  StatsResponse rpc_client_response_count = 9;
 
+  StatsResponse rpc_server_errors = 10;
 
+  StatsResponse rpc_server_completed_rpcs = 11;
 
+  StatsResponse rpc_server_server_elapsed_time = 12;
 
+  StatsResponse rpc_server_request_bytes = 13;
 
+  StatsResponse rpc_server_response_bytes = 14;
 
+  StatsResponse rpc_server_request_count = 15;
 
+  StatsResponse rpc_server_response_count = 16;
 
+  StatsResponse rpc_server_elapsed_time = 17;
 
+  //TODO(ericgribkoff) Add minute-hour interval stats.
 
+}
 
+
 
+// This message is sent when requesting a set of stats (Census Views) from
 
+// a client system, as part of the MonitoringService API's.
 
+message StatsRequest {
 
+  // An optional set of ViewDescriptor names. Only Views using these
 
+  // descriptors will be sent back in the response. If no names are provided,
 
+  // then all Views present in the client system will be included in every
 
+  // response. If measurement_names is also provided, then Views matching the
 
+  // intersection of the two are returned.
 
+  // TODO(aveitch): Consider making this a list of regexes or prefix matches in
 
+  // the future.
 
+  repeated string view_names = 1;
 
+
 
+  // An optional set of MeasurementDescriptor names. Only Views using these
 
+  // descriptors will be sent back in the response. If no names are provided,
 
+  // then all Views present in the client system will be included in every
 
+  // response. If view_names is also provided, then Views matching the
 
+  // intersection of the two are returned.
 
+  // TODO(aveitch): Consider making this a list of regexes or prefix matches in
 
+  // the future.
 
+  repeated string measurement_names = 2;
 
+
 
+  // By default, the MeasurementDescriptors and ViewDescriptors corresponding to
 
+  // the Views that are returned in a StatsResponse will be included in the
 
+  // first such response. Set this to true to have them not sent.
 
+  bool dont_include_descriptors_in_first_response = 3;
 
+}
 
+
 
+// This message contains all information relevant to a single View. It is the
 
+// return type for GetStats and WatchStats, and used in CanonicalRpcStats.
 
+message StatsResponse {
 
+  // A StatsResponse can optionally contain the MeasurementDescriptor and
 
+  // ViewDescriptor for the View. These will be sent in the first WatchStats
 
+  // response, or all GetStats and GetCanonicalRpcStats responses. These will
 
+  // not be set for {Get,Watch}Stats if
 
+  // dont_include_descriptors_in_first_response is set to true in the
 
+  // StatsRequest.
 
+  google.instrumentation.MeasurementDescriptor measurement_descriptor = 1;
 
+  google.instrumentation.ViewDescriptor view_descriptor = 2;
 
+
 
+  // The View data.
 
+  google.instrumentation.View view = 3;
 
+}
 
+
 
+message TraceRequest {
 
+  // TODO(aveitch): Complete definition of this type
 
+}
 
+
 
+message TraceResponse {
 
+  // TODO(aveitch): Complete definition of this type
 
+}
 
+
 
+message MonitoringDataGroup {
 
+  string name = 1;  // name of a group of monitoring data
 
+}
 
+
 
+// The wrapper for custom monitoring data.
 
+message CustomMonitoringData {
 
+  // can be any application specific monitoring data
 
+  google.protobuf.Any contents = 1;
 
+}

+ 45 - 0
tools/jenkins/comment_on_pr.sh
Ver fichero 

@@ -0,0 +1,45 @@
 
+#!/usr/bin/env bash
 
+# Copyright 2017, Google Inc.
 
+# All rights reserved.
 
+#
 
+# Redistribution and use in source and binary forms, with or without
 
+# modification, are permitted provided that the following conditions are
 
+# met:
 
+#
 
+#     * Redistributions of source code must retain the above copyright
 
+# notice, this list of conditions and the following disclaimer.
 
+#     * Redistributions in binary form must reproduce the above
 
+# copyright notice, this list of conditions and the following disclaimer
 
+# in the documentation and/or other materials provided with the
 
+# distribution.
 
+#     * Neither the name of Google Inc. nor the names of its
 
+# contributors may be used to endorse or promote products derived from
 
+# this software without specific prior written permission.
 
+#
 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
+# 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.
 
+#
 
+# This script is invoked by Jenkins to comment $1 on pull requests
 
+# when triggered by a build
 
+
 
+set -e
 
+
 
+if [ -z "$1" ] || [ -z $JENKINS_OAUTH_TOKEN ] || [ -z $ghprbPullId ]; then
 
+  echo "Insufficient arguments or environment variables provided."
 
+  exit 1
 
+fi
 
+
 
+# Format the comment message to JSON
 
+COMMENT_MESSAGE="{\"body\":\"$1\"}"
 
+
 
+curl -k -H "Authorization: token $JENKINS_OAUTH_TOKEN" -H "Content-Type: application/json" \
 
+  -d "$COMMENT_MESSAGE" https://api.github.com/repos/grpc/grpc/issues/$ghprbPullId/comments

+ 5 - 0
tools/jenkins/run_performance.sh
Ver fichero 

@@ -31,7 +31,12 @@
 
 # This script is invoked by Jenkins and runs performance smoke test.
 
 set -ex
 
 
+# List of benchmarks that provide good signal for analyzing performance changes in pull requests
 
+BENCHMARKS_TO_RUN="bm_closure bm_cq bm_call_create bm_error bm_chttp2_hpack bm_chttp2_transport bm_pollset bm_metadata"
 
+
 
 # Enter the gRPC repo root
 
 cd $(dirname $0)/../..
 
 
 tools/run_tests/run_performance_tests.py -l c++ node ruby csharp python --netperf --category smoketest
 
+# todo(mattkwong): Change performance test to use microbenchmarking
 
+# tools/run_tests/run_microbenchmark.py -c summary --diff_perf origin/$ghprbTargetBranch -b $BENCHMARKS_TO_RUN

+ 1 - 1
tools/run_tests/generated/sources_and_headers.json
Ver fichero 

@@ -3810,7 +3810,6 @@
 
       "test/cpp/interop/stress_interop_client.cc", 
       "test/cpp/interop/stress_interop_client.h", 
       "test/cpp/interop/stress_test.cc", 
-      "test/cpp/util/create_test_channel.cc", 
       "test/cpp/util/create_test_channel.h", 
       "test/cpp/util/metrics_server.cc", 
       "test/cpp/util/metrics_server.h"
 
@@ -7787,6 +7786,7 @@
 
       "src/core/lib/json/json_string.c", 
       "src/core/lib/json/json_writer.c", 
       "src/core/lib/json/json_writer.h", 
+      "src/core/lib/security/util/b64.c", 
       "src/core/lib/slice/percent_encoding.c", 
       "src/core/lib/slice/percent_encoding.h", 
       "src/core/lib/slice/slice.c",

+ 23 - 13
tools/run_tests/run_microbenchmark.py
Ver fichero 

@@ -38,6 +38,19 @@ import argparse
 
 import python_utils.jobset as jobset
 
 import python_utils.start_port_server as start_port_server
 
 
+_AVAILABLE_BENCHMARK_TESTS = ['bm_fullstack_unary_ping_pong',
 
+                              'bm_fullstack_streaming_ping_pong',
 
+                              'bm_fullstack_streaming_pump',
 
+                              'bm_closure',
 
+                              'bm_cq',
 
+                              'bm_call_create',
 
+                              'bm_error',
 
+                              'bm_chttp2_hpack',
 
+                              'bm_chttp2_transport',
 
+                              'bm_pollset',
 
+                              'bm_metadata',
 
+                              'bm_fullstack_trickle']
 
+
 
 flamegraph_dir = os.path.join(os.path.expanduser('~'), 'FlameGraph')
 
 
 os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
 
@@ -201,19 +214,8 @@ argp.add_argument('-c', '--collect',
 
                   default=sorted(collectors.keys()),
 
                   help='Which collectors should be run against each benchmark')
 
 argp.add_argument('-b', '--benchmarks',
 
-                  default=['bm_fullstack_unary_ping_pong',
 
-                           'bm_fullstack_streaming_ping_pong',
 
-                           'bm_fullstack_streaming_pump',
 
-                           'bm_closure',
 
-                           'bm_cq',
 
-                           'bm_call_create',
 
-                           'bm_error',
 
-                           'bm_chttp2_hpack',
 
-                           'bm_chttp2_transport',
 
-                           'bm_pollset',
 
-                           'bm_metadata',
 
-                           'bm_fullstack_trickle',
 
-                           ],
 
+                  choices=_AVAILABLE_BENCHMARK_TESTS,
 
+                  default=_AVAILABLE_BENCHMARK_TESTS,
 
                   nargs='+',
 
                   type=str,
 
                   help='Which microbenchmarks should be run')
 
@@ -237,6 +239,7 @@ try:
 
     for bm_name in args.benchmarks:
 
       collectors[collect](bm_name, args)
 
   if args.diff_perf:
 
+    git_comment = 'Performance differences between this PR and %s\\n' % args.diff_perf
 
     if 'summary' not in args.collect:
 
       for bm_name in args.benchmarks:
 
         run_summary(bm_name, 'opt', bm_name)
 
@@ -264,7 +267,14 @@ try:
 
       if diff:
 
         heading('Performance diff: %s' % bm_name)
 
         text(diff)
 
+        git_comment += '```\\nPerformance diff: %s\\n%s\\n```\\n' % (bm_name, diff.replace('\n', '\\n'))
 
 finally:
 
+  if args.diff_perf:
 
+    subprocess.call(['tools/jenkins/comment_on_pr.sh "%s"' % git_comment.replace('`', '\`')],
 
+                    stdout=subprocess.PIPE,
 
+                    shell=True)
 
+  if not os.path.exists('reports'):
 
+    os.makedirs('reports')
 
   index_html += "</body>\n</html>\n"
 
   with open('reports/index.html', 'w') as f:
 
     f.write(index_html)

+ 2 - 2
vsprojects/vcxproj/grpc/grpc.vcxproj
Ver fichero 

@@ -675,6 +675,8 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\slice.c">
 
@@ -839,8 +841,6 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.c">
 
     </ClCompile>
 
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
-    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_secure.c">

+ 3 - 3
vsprojects/vcxproj/grpc/grpc.vcxproj.filters
Ver fichero 

@@ -259,6 +259,9 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
       <Filter>src\core\lib\json</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+      <Filter>src\core\lib\security\util</Filter>
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
       <Filter>src\core\lib\slice</Filter>
 
     </ClCompile>
 
@@ -505,9 +508,6 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\transport\tsi_error.c">
 
       <Filter>src\core\lib\security\transport</Filter>
 
     </ClCompile>
 
-    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
-      <Filter>src\core\lib\security\util</Filter>
 
-    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\json_util.c">
 
       <Filter>src\core\lib\security\util</Filter>
 
     </ClCompile>

+ 2 - 0
vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
Ver fichero 

@@ -516,6 +516,8 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\slice.c">

+ 9 - 0
vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
Ver fichero 

@@ -316,6 +316,9 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
       <Filter>src\core\lib\json</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+      <Filter>src\core\lib\security\util</Filter>
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
       <Filter>src\core\lib\slice</Filter>
 
     </ClCompile>
 
@@ -941,6 +944,12 @@
 
     <Filter Include="src\core\lib\json">
 
       <UniqueIdentifier>{89bc8f83-e29a-ddab-8f6b-22df11cdc867}</UniqueIdentifier>
 
     </Filter>
 
+    <Filter Include="src\core\lib\security">
 
+      <UniqueIdentifier>{83d9c8a0-c579-769e-e2df-270c67b8c159}</UniqueIdentifier>
 
+    </Filter>
 
+    <Filter Include="src\core\lib\security\util">
 
+      <UniqueIdentifier>{d55417ff-35a3-ef69-80c4-e6a95673728b}</UniqueIdentifier>
 
+    </Filter>
 
     <Filter Include="src\core\lib\slice">
 
       <UniqueIdentifier>{4d172bbc-20c4-6e7d-872a-2d287b589aa0}</UniqueIdentifier>
 
     </Filter>

+ 2 - 0
vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
Ver fichero 

@@ -642,6 +642,8 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\slice.c">

+ 9 - 0
vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
Ver fichero 

@@ -262,6 +262,9 @@
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\json\json_writer.c">
 
       <Filter>src\core\lib\json</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="$(SolutionDir)\..\src\core\lib\security\util\b64.c">
 
+      <Filter>src\core\lib\security\util</Filter>
 
+    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\src\core\lib\slice\percent_encoding.c">
 
       <Filter>src\core\lib\slice</Filter>
 
     </ClCompile>
 
@@ -1352,6 +1355,12 @@
 
     <Filter Include="src\core\lib\json">
 
       <UniqueIdentifier>{681cdaeb-c47f-8853-d985-bf13c2873947}</UniqueIdentifier>
 
     </Filter>
 
+    <Filter Include="src\core\lib\security">
 
+      <UniqueIdentifier>{02c849c5-66eb-e42f-c9f7-2cf7cc9db06a}</UniqueIdentifier>
 
+    </Filter>
 
+    <Filter Include="src\core\lib\security\util">
 
+      <UniqueIdentifier>{c22aef1f-8b7b-6b5c-9e22-321b11f6352d}</UniqueIdentifier>
 
+    </Filter>
 
     <Filter Include="src\core\lib\slice">
 
       <UniqueIdentifier>{74c81ab7-e329-a362-3890-4c41b90f0511}</UniqueIdentifier>
 
     </Filter>

+ 0 - 2
vsprojects/vcxproj/test/stress_test/stress_test.vcxproj
Ver fichero 

@@ -205,8 +205,6 @@
 
     </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\stress_test.cc">
 
     </ClCompile>
 
-    <ClCompile Include="$(SolutionDir)\..\test\cpp\util\create_test_channel.cc">
 
-    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\test\cpp\util\metrics_server.cc">
 
     </ClCompile>
 
   </ItemGroup>

+ 0 - 3
vsprojects/vcxproj/test/stress_test/stress_test.vcxproj.filters
Ver fichero 

@@ -22,9 +22,6 @@
 
     <ClCompile Include="$(SolutionDir)\..\test\cpp\interop\stress_test.cc">
 
       <Filter>test\cpp\interop</Filter>
 
     </ClCompile>
 
-    <ClCompile Include="$(SolutionDir)\..\test\cpp\util\create_test_channel.cc">
 
-      <Filter>test\cpp\util</Filter>
 
-    </ClCompile>
 
     <ClCompile Include="$(SolutionDir)\..\test\cpp\util\metrics_server.cc">
 
       <Filter>test\cpp\util</Filter>
 
     </ClCompile>