grpc 1.0.0 → 1.0.1.pre1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of grpc might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Makefile +68 -326
- data/src/core/lib/iomgr/tcp_server_posix.c +3 -1
- data/src/core/lib/iomgr/tcp_windows.c +1 -0
- data/src/core/lib/surface/version.c +1 -1
- data/src/ruby/ext/grpc/extconf.rb +4 -0
- data/src/ruby/lib/grpc/generic/active_call.rb +0 -4
- data/src/ruby/lib/grpc/generic/rpc_server.rb +0 -1
- data/src/ruby/lib/grpc/grpc.rb +8 -3
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/pb/test/server.rb +26 -39
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dd0153561f4fe7e8ae091ccc3599ebaae4e1c86a
|
|
4
|
+
data.tar.gz: bc95b741a153af5ab886a1cfe05b5bc101dee0d0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 67d8354a66c107ba830520437cee9bb1a0a0c39fcbec5c4800a14c1d6dfa065596367384416feb8f833abb7bd4ba162b47e21ff5e07f16bb4fff5edf79646807
|
|
7
|
+
data.tar.gz: 24c51eb078500bc478f32f61a2db6794a2aa96a1a6d68bbf72f8338a23b086bdfe008b42ed074a4badd820bef5a126f06a6769bcd0b4e0dd32cb47ccd3d2ad4c
|
data/Makefile
CHANGED
|
@@ -415,7 +415,7 @@ E = @echo
|
|
|
415
415
|
Q = @
|
|
416
416
|
endif
|
|
417
417
|
|
|
418
|
-
VERSION = 1.0.
|
|
418
|
+
VERSION = 1.0.1-pre1
|
|
419
419
|
|
|
420
420
|
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
|
|
421
421
|
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
|
|
@@ -1082,9 +1082,7 @@ server_registered_method_bad_client_test: $(BINDIR)/$(CONFIG)/server_registered_
|
|
|
1082
1082
|
simple_request_bad_client_test: $(BINDIR)/$(CONFIG)/simple_request_bad_client_test
|
|
1083
1083
|
unknown_frame_bad_client_test: $(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test
|
|
1084
1084
|
window_overflow_bad_client_test: $(BINDIR)/$(CONFIG)/window_overflow_bad_client_test
|
|
1085
|
-
bad_ssl_alpn_server: $(BINDIR)/$(CONFIG)/bad_ssl_alpn_server
|
|
1086
1085
|
bad_ssl_cert_server: $(BINDIR)/$(CONFIG)/bad_ssl_cert_server
|
|
1087
|
-
bad_ssl_alpn_test: $(BINDIR)/$(CONFIG)/bad_ssl_alpn_test
|
|
1088
1086
|
bad_ssl_cert_test: $(BINDIR)/$(CONFIG)/bad_ssl_cert_test
|
|
1089
1087
|
h2_census_test: $(BINDIR)/$(CONFIG)/h2_census_test
|
|
1090
1088
|
h2_compress_test: $(BINDIR)/$(CONFIG)/h2_compress_test
|
|
@@ -1298,9 +1296,7 @@ buildtests_c: privatelibs_c \
|
|
|
1298
1296
|
$(BINDIR)/$(CONFIG)/simple_request_bad_client_test \
|
|
1299
1297
|
$(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test \
|
|
1300
1298
|
$(BINDIR)/$(CONFIG)/window_overflow_bad_client_test \
|
|
1301
|
-
$(BINDIR)/$(CONFIG)/bad_ssl_alpn_server \
|
|
1302
1299
|
$(BINDIR)/$(CONFIG)/bad_ssl_cert_server \
|
|
1303
|
-
$(BINDIR)/$(CONFIG)/bad_ssl_alpn_test \
|
|
1304
1300
|
$(BINDIR)/$(CONFIG)/bad_ssl_cert_test \
|
|
1305
1301
|
$(BINDIR)/$(CONFIG)/h2_census_test \
|
|
1306
1302
|
$(BINDIR)/$(CONFIG)/h2_compress_test \
|
|
@@ -1687,8 +1683,6 @@ test_c: buildtests_c
|
|
|
1687
1683
|
$(Q) $(BINDIR)/$(CONFIG)/unknown_frame_bad_client_test || ( echo test unknown_frame_bad_client_test failed ; exit 1 )
|
|
1688
1684
|
$(E) "[RUN] Testing window_overflow_bad_client_test"
|
|
1689
1685
|
$(Q) $(BINDIR)/$(CONFIG)/window_overflow_bad_client_test || ( echo test window_overflow_bad_client_test failed ; exit 1 )
|
|
1690
|
-
$(E) "[RUN] Testing bad_ssl_alpn_test"
|
|
1691
|
-
$(Q) $(BINDIR)/$(CONFIG)/bad_ssl_alpn_test || ( echo test bad_ssl_alpn_test failed ; exit 1 )
|
|
1692
1686
|
$(E) "[RUN] Testing bad_ssl_cert_test"
|
|
1693
1687
|
$(Q) $(BINDIR)/$(CONFIG)/bad_ssl_cert_test || ( echo test bad_ssl_cert_test failed ; exit 1 )
|
|
1694
1688
|
|
|
@@ -3357,125 +3351,38 @@ endif
|
|
|
3357
3351
|
|
|
3358
3352
|
|
|
3359
3353
|
LIBGRPC++_SRC = \
|
|
3354
|
+
src/cpp/client/insecure_credentials.cc \
|
|
3360
3355
|
src/cpp/client/secure_credentials.cc \
|
|
3361
3356
|
src/cpp/common/auth_property_iterator.cc \
|
|
3362
3357
|
src/cpp/common/secure_auth_context.cc \
|
|
3363
3358
|
src/cpp/common/secure_channel_arguments.cc \
|
|
3364
3359
|
src/cpp/common/secure_create_auth_context.cc \
|
|
3360
|
+
src/cpp/server/insecure_server_credentials.cc \
|
|
3365
3361
|
src/cpp/server/secure_server_credentials.cc \
|
|
3366
|
-
src/cpp/client/
|
|
3362
|
+
src/cpp/client/channel_cc.cc \
|
|
3367
3363
|
src/cpp/client/client_context.cc \
|
|
3368
3364
|
src/cpp/client/create_channel.cc \
|
|
3369
3365
|
src/cpp/client/create_channel_internal.cc \
|
|
3370
3366
|
src/cpp/client/create_channel_posix.cc \
|
|
3371
|
-
src/cpp/client/
|
|
3367
|
+
src/cpp/client/credentials_cc.cc \
|
|
3372
3368
|
src/cpp/client/generic_stub.cc \
|
|
3373
|
-
src/cpp/client/insecure_credentials.cc \
|
|
3374
3369
|
src/cpp/common/channel_arguments.cc \
|
|
3375
|
-
src/cpp/common/
|
|
3370
|
+
src/cpp/common/completion_queue_cc.cc \
|
|
3376
3371
|
src/cpp/common/core_codegen.cc \
|
|
3377
3372
|
src/cpp/common/rpc_method.cc \
|
|
3378
3373
|
src/cpp/server/async_generic_service.cc \
|
|
3379
3374
|
src/cpp/server/create_default_thread_pool.cc \
|
|
3380
3375
|
src/cpp/server/dynamic_thread_pool.cc \
|
|
3381
|
-
src/cpp/server/insecure_server_credentials.cc \
|
|
3382
|
-
src/cpp/server/server.cc \
|
|
3383
3376
|
src/cpp/server/server_builder.cc \
|
|
3377
|
+
src/cpp/server/server_cc.cc \
|
|
3384
3378
|
src/cpp/server/server_context.cc \
|
|
3385
3379
|
src/cpp/server/server_credentials.cc \
|
|
3386
3380
|
src/cpp/server/server_posix.cc \
|
|
3387
|
-
src/cpp/util/
|
|
3388
|
-
src/cpp/util/
|
|
3381
|
+
src/cpp/util/byte_buffer_cc.cc \
|
|
3382
|
+
src/cpp/util/slice_cc.cc \
|
|
3389
3383
|
src/cpp/util/status.cc \
|
|
3390
3384
|
src/cpp/util/string_ref.cc \
|
|
3391
|
-
src/cpp/util/
|
|
3392
|
-
src/core/lib/channel/channel_args.c \
|
|
3393
|
-
src/core/lib/channel/channel_stack.c \
|
|
3394
|
-
src/core/lib/channel/channel_stack_builder.c \
|
|
3395
|
-
src/core/lib/channel/compress_filter.c \
|
|
3396
|
-
src/core/lib/channel/connected_channel.c \
|
|
3397
|
-
src/core/lib/channel/http_client_filter.c \
|
|
3398
|
-
src/core/lib/channel/http_server_filter.c \
|
|
3399
|
-
src/core/lib/compression/compression.c \
|
|
3400
|
-
src/core/lib/compression/message_compress.c \
|
|
3401
|
-
src/core/lib/debug/trace.c \
|
|
3402
|
-
src/core/lib/http/format_request.c \
|
|
3403
|
-
src/core/lib/http/httpcli.c \
|
|
3404
|
-
src/core/lib/http/parser.c \
|
|
3405
|
-
src/core/lib/iomgr/closure.c \
|
|
3406
|
-
src/core/lib/iomgr/endpoint.c \
|
|
3407
|
-
src/core/lib/iomgr/endpoint_pair_posix.c \
|
|
3408
|
-
src/core/lib/iomgr/endpoint_pair_windows.c \
|
|
3409
|
-
src/core/lib/iomgr/error.c \
|
|
3410
|
-
src/core/lib/iomgr/ev_epoll_linux.c \
|
|
3411
|
-
src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
|
|
3412
|
-
src/core/lib/iomgr/ev_poll_posix.c \
|
|
3413
|
-
src/core/lib/iomgr/ev_posix.c \
|
|
3414
|
-
src/core/lib/iomgr/exec_ctx.c \
|
|
3415
|
-
src/core/lib/iomgr/executor.c \
|
|
3416
|
-
src/core/lib/iomgr/iocp_windows.c \
|
|
3417
|
-
src/core/lib/iomgr/iomgr.c \
|
|
3418
|
-
src/core/lib/iomgr/iomgr_posix.c \
|
|
3419
|
-
src/core/lib/iomgr/iomgr_windows.c \
|
|
3420
|
-
src/core/lib/iomgr/load_file.c \
|
|
3421
|
-
src/core/lib/iomgr/network_status_tracker.c \
|
|
3422
|
-
src/core/lib/iomgr/polling_entity.c \
|
|
3423
|
-
src/core/lib/iomgr/pollset_set_windows.c \
|
|
3424
|
-
src/core/lib/iomgr/pollset_windows.c \
|
|
3425
|
-
src/core/lib/iomgr/resolve_address_posix.c \
|
|
3426
|
-
src/core/lib/iomgr/resolve_address_windows.c \
|
|
3427
|
-
src/core/lib/iomgr/sockaddr_utils.c \
|
|
3428
|
-
src/core/lib/iomgr/socket_utils_common_posix.c \
|
|
3429
|
-
src/core/lib/iomgr/socket_utils_linux.c \
|
|
3430
|
-
src/core/lib/iomgr/socket_utils_posix.c \
|
|
3431
|
-
src/core/lib/iomgr/socket_windows.c \
|
|
3432
|
-
src/core/lib/iomgr/tcp_client_posix.c \
|
|
3433
|
-
src/core/lib/iomgr/tcp_client_windows.c \
|
|
3434
|
-
src/core/lib/iomgr/tcp_posix.c \
|
|
3435
|
-
src/core/lib/iomgr/tcp_server_posix.c \
|
|
3436
|
-
src/core/lib/iomgr/tcp_server_windows.c \
|
|
3437
|
-
src/core/lib/iomgr/tcp_windows.c \
|
|
3438
|
-
src/core/lib/iomgr/time_averaged_stats.c \
|
|
3439
|
-
src/core/lib/iomgr/timer.c \
|
|
3440
|
-
src/core/lib/iomgr/timer_heap.c \
|
|
3441
|
-
src/core/lib/iomgr/udp_server.c \
|
|
3442
|
-
src/core/lib/iomgr/unix_sockets_posix.c \
|
|
3443
|
-
src/core/lib/iomgr/unix_sockets_posix_noop.c \
|
|
3444
|
-
src/core/lib/iomgr/wakeup_fd_eventfd.c \
|
|
3445
|
-
src/core/lib/iomgr/wakeup_fd_nospecial.c \
|
|
3446
|
-
src/core/lib/iomgr/wakeup_fd_pipe.c \
|
|
3447
|
-
src/core/lib/iomgr/wakeup_fd_posix.c \
|
|
3448
|
-
src/core/lib/iomgr/workqueue_posix.c \
|
|
3449
|
-
src/core/lib/iomgr/workqueue_windows.c \
|
|
3450
|
-
src/core/lib/json/json.c \
|
|
3451
|
-
src/core/lib/json/json_reader.c \
|
|
3452
|
-
src/core/lib/json/json_string.c \
|
|
3453
|
-
src/core/lib/json/json_writer.c \
|
|
3454
|
-
src/core/lib/surface/alarm.c \
|
|
3455
|
-
src/core/lib/surface/api_trace.c \
|
|
3456
|
-
src/core/lib/surface/byte_buffer.c \
|
|
3457
|
-
src/core/lib/surface/byte_buffer_reader.c \
|
|
3458
|
-
src/core/lib/surface/call.c \
|
|
3459
|
-
src/core/lib/surface/call_details.c \
|
|
3460
|
-
src/core/lib/surface/call_log_batch.c \
|
|
3461
|
-
src/core/lib/surface/channel.c \
|
|
3462
|
-
src/core/lib/surface/channel_init.c \
|
|
3463
|
-
src/core/lib/surface/channel_ping.c \
|
|
3464
|
-
src/core/lib/surface/channel_stack_type.c \
|
|
3465
|
-
src/core/lib/surface/completion_queue.c \
|
|
3466
|
-
src/core/lib/surface/event_string.c \
|
|
3467
|
-
src/core/lib/surface/lame_client.c \
|
|
3468
|
-
src/core/lib/surface/metadata_array.c \
|
|
3469
|
-
src/core/lib/surface/server.c \
|
|
3470
|
-
src/core/lib/surface/validate_metadata.c \
|
|
3471
|
-
src/core/lib/surface/version.c \
|
|
3472
|
-
src/core/lib/transport/byte_stream.c \
|
|
3473
|
-
src/core/lib/transport/connectivity_state.c \
|
|
3474
|
-
src/core/lib/transport/metadata.c \
|
|
3475
|
-
src/core/lib/transport/metadata_batch.c \
|
|
3476
|
-
src/core/lib/transport/static_metadata.c \
|
|
3477
|
-
src/core/lib/transport/transport.c \
|
|
3478
|
-
src/core/lib/transport/transport_op_string.c \
|
|
3385
|
+
src/cpp/util/time_cc.cc \
|
|
3479
3386
|
src/cpp/codegen/codegen_init.cc \
|
|
3480
3387
|
|
|
3481
3388
|
PUBLIC_HEADERS_CXX += \
|
|
@@ -3526,34 +3433,6 @@ PUBLIC_HEADERS_CXX += \
|
|
|
3526
3433
|
include/grpc++/support/stub_options.h \
|
|
3527
3434
|
include/grpc++/support/sync_stream.h \
|
|
3528
3435
|
include/grpc++/support/time.h \
|
|
3529
|
-
include/grpc/byte_buffer.h \
|
|
3530
|
-
include/grpc/byte_buffer_reader.h \
|
|
3531
|
-
include/grpc/compression.h \
|
|
3532
|
-
include/grpc/grpc.h \
|
|
3533
|
-
include/grpc/grpc_posix.h \
|
|
3534
|
-
include/grpc/grpc_security_constants.h \
|
|
3535
|
-
include/grpc/status.h \
|
|
3536
|
-
include/grpc/impl/codegen/byte_buffer.h \
|
|
3537
|
-
include/grpc/impl/codegen/byte_buffer_reader.h \
|
|
3538
|
-
include/grpc/impl/codegen/compression_types.h \
|
|
3539
|
-
include/grpc/impl/codegen/connectivity_state.h \
|
|
3540
|
-
include/grpc/impl/codegen/grpc_types.h \
|
|
3541
|
-
include/grpc/impl/codegen/propagation_bits.h \
|
|
3542
|
-
include/grpc/impl/codegen/status.h \
|
|
3543
|
-
include/grpc/impl/codegen/alloc.h \
|
|
3544
|
-
include/grpc/impl/codegen/atm.h \
|
|
3545
|
-
include/grpc/impl/codegen/atm_gcc_atomic.h \
|
|
3546
|
-
include/grpc/impl/codegen/atm_gcc_sync.h \
|
|
3547
|
-
include/grpc/impl/codegen/atm_windows.h \
|
|
3548
|
-
include/grpc/impl/codegen/log.h \
|
|
3549
|
-
include/grpc/impl/codegen/port_platform.h \
|
|
3550
|
-
include/grpc/impl/codegen/slice.h \
|
|
3551
|
-
include/grpc/impl/codegen/slice_buffer.h \
|
|
3552
|
-
include/grpc/impl/codegen/sync.h \
|
|
3553
|
-
include/grpc/impl/codegen/sync_generic.h \
|
|
3554
|
-
include/grpc/impl/codegen/sync_posix.h \
|
|
3555
|
-
include/grpc/impl/codegen/sync_windows.h \
|
|
3556
|
-
include/grpc/impl/codegen/time.h \
|
|
3557
3436
|
include/grpc++/impl/codegen/async_stream.h \
|
|
3558
3437
|
include/grpc++/impl/codegen/async_unary_call.h \
|
|
3559
3438
|
include/grpc++/impl/codegen/call.h \
|
|
@@ -3584,6 +3463,27 @@ PUBLIC_HEADERS_CXX += \
|
|
|
3584
3463
|
include/grpc++/impl/codegen/sync_no_cxx11.h \
|
|
3585
3464
|
include/grpc++/impl/codegen/sync_stream.h \
|
|
3586
3465
|
include/grpc++/impl/codegen/time.h \
|
|
3466
|
+
include/grpc/impl/codegen/byte_buffer.h \
|
|
3467
|
+
include/grpc/impl/codegen/byte_buffer_reader.h \
|
|
3468
|
+
include/grpc/impl/codegen/compression_types.h \
|
|
3469
|
+
include/grpc/impl/codegen/connectivity_state.h \
|
|
3470
|
+
include/grpc/impl/codegen/grpc_types.h \
|
|
3471
|
+
include/grpc/impl/codegen/propagation_bits.h \
|
|
3472
|
+
include/grpc/impl/codegen/status.h \
|
|
3473
|
+
include/grpc/impl/codegen/alloc.h \
|
|
3474
|
+
include/grpc/impl/codegen/atm.h \
|
|
3475
|
+
include/grpc/impl/codegen/atm_gcc_atomic.h \
|
|
3476
|
+
include/grpc/impl/codegen/atm_gcc_sync.h \
|
|
3477
|
+
include/grpc/impl/codegen/atm_windows.h \
|
|
3478
|
+
include/grpc/impl/codegen/log.h \
|
|
3479
|
+
include/grpc/impl/codegen/port_platform.h \
|
|
3480
|
+
include/grpc/impl/codegen/slice.h \
|
|
3481
|
+
include/grpc/impl/codegen/slice_buffer.h \
|
|
3482
|
+
include/grpc/impl/codegen/sync.h \
|
|
3483
|
+
include/grpc/impl/codegen/sync_generic.h \
|
|
3484
|
+
include/grpc/impl/codegen/sync_posix.h \
|
|
3485
|
+
include/grpc/impl/codegen/sync_windows.h \
|
|
3486
|
+
include/grpc/impl/codegen/time.h \
|
|
3587
3487
|
|
|
3588
3488
|
LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
|
|
3589
3489
|
|
|
@@ -3620,18 +3520,18 @@ endif
|
|
|
3620
3520
|
|
|
3621
3521
|
|
|
3622
3522
|
ifeq ($(SYSTEM),MINGW32)
|
|
3623
|
-
$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION).$(SHARED_EXT): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc.$(SHARED_EXT) $(
|
|
3523
|
+
$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION).$(SHARED_EXT): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/grpc.$(SHARED_EXT) $(OPENSSL_DEP)
|
|
3624
3524
|
$(E) "[LD] Linking $@"
|
|
3625
3525
|
$(Q) mkdir -p `dirname $@`
|
|
3626
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared grpc++.def -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBGRPC++_OBJS) $(LDLIBS) $(ZLIB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) -lgrpc-imp
|
|
3526
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared grpc++.def -Wl,--output-def=$(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION).def -Wl,--out-implib=$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION)-dll.a -o $(LIBDIR)/$(CONFIG)/grpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBGRPC++_OBJS) $(LDLIBS) $(ZLIB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) -lgrpc-imp
|
|
3627
3527
|
else
|
|
3628
|
-
$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).$(SHARED_EXT): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT) $(
|
|
3528
|
+
$(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).$(SHARED_EXT): $(LIBGRPC++_OBJS) $(ZLIB_DEP) $(PROTOBUF_DEP) $(LIBDIR)/$(CONFIG)/libgrpc.$(SHARED_EXT) $(OPENSSL_DEP)
|
|
3629
3529
|
$(E) "[LD] Linking $@"
|
|
3630
3530
|
$(Q) mkdir -p `dirname $@`
|
|
3631
3531
|
ifeq ($(SYSTEM),Darwin)
|
|
3632
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++$(SHARED_VERSION).$(SHARED_EXT) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBGRPC++_OBJS) $(LDLIBS) $(ZLIB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) -lgrpc
|
|
3532
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -install_name $(SHARED_PREFIX)grpc++$(SHARED_VERSION).$(SHARED_EXT) -dynamiclib -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBGRPC++_OBJS) $(LDLIBS) $(ZLIB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) -lgrpc
|
|
3633
3533
|
else
|
|
3634
|
-
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBGRPC++_OBJS) $(LDLIBS) $(ZLIB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) -lgrpc
|
|
3534
|
+
$(Q) $(LDXX) $(LDFLAGS) -L$(LIBDIR)/$(CONFIG) -shared -Wl,-soname,libgrpc++.so.1 -o $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBGRPC++_OBJS) $(LDLIBS) $(ZLIB_MERGE_LIBS) $(LDLIBSXX) $(LDLIBS_PROTOBUF) -lgrpc
|
|
3635
3535
|
$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).so.1
|
|
3636
3536
|
$(Q) ln -sf $(SHARED_PREFIX)grpc++$(SHARED_VERSION).$(SHARED_EXT) $(LIBDIR)/$(CONFIG)/libgrpc++$(SHARED_VERSION).so
|
|
3637
3537
|
endif
|
|
@@ -3776,7 +3676,7 @@ endif
|
|
|
3776
3676
|
|
|
3777
3677
|
|
|
3778
3678
|
LIBGRPC++_TEST_CONFIG_SRC = \
|
|
3779
|
-
test/cpp/util/
|
|
3679
|
+
test/cpp/util/test_config_cc.cc \
|
|
3780
3680
|
|
|
3781
3681
|
PUBLIC_HEADERS_CXX += \
|
|
3782
3682
|
|
|
@@ -3943,120 +3843,33 @@ $(OBJDIR)/$(CONFIG)/src/cpp/codegen/codegen_init.o: $(GENDIR)/src/proto/grpc/tes
|
|
|
3943
3843
|
|
|
3944
3844
|
|
|
3945
3845
|
LIBGRPC++_UNSECURE_SRC = \
|
|
3846
|
+
src/cpp/client/insecure_credentials.cc \
|
|
3946
3847
|
src/cpp/common/insecure_create_auth_context.cc \
|
|
3947
|
-
src/cpp/
|
|
3848
|
+
src/cpp/server/insecure_server_credentials.cc \
|
|
3849
|
+
src/cpp/client/channel_cc.cc \
|
|
3948
3850
|
src/cpp/client/client_context.cc \
|
|
3949
3851
|
src/cpp/client/create_channel.cc \
|
|
3950
3852
|
src/cpp/client/create_channel_internal.cc \
|
|
3951
3853
|
src/cpp/client/create_channel_posix.cc \
|
|
3952
|
-
src/cpp/client/
|
|
3854
|
+
src/cpp/client/credentials_cc.cc \
|
|
3953
3855
|
src/cpp/client/generic_stub.cc \
|
|
3954
|
-
src/cpp/client/insecure_credentials.cc \
|
|
3955
3856
|
src/cpp/common/channel_arguments.cc \
|
|
3956
|
-
src/cpp/common/
|
|
3857
|
+
src/cpp/common/completion_queue_cc.cc \
|
|
3957
3858
|
src/cpp/common/core_codegen.cc \
|
|
3958
3859
|
src/cpp/common/rpc_method.cc \
|
|
3959
3860
|
src/cpp/server/async_generic_service.cc \
|
|
3960
3861
|
src/cpp/server/create_default_thread_pool.cc \
|
|
3961
3862
|
src/cpp/server/dynamic_thread_pool.cc \
|
|
3962
|
-
src/cpp/server/insecure_server_credentials.cc \
|
|
3963
|
-
src/cpp/server/server.cc \
|
|
3964
3863
|
src/cpp/server/server_builder.cc \
|
|
3864
|
+
src/cpp/server/server_cc.cc \
|
|
3965
3865
|
src/cpp/server/server_context.cc \
|
|
3966
3866
|
src/cpp/server/server_credentials.cc \
|
|
3967
3867
|
src/cpp/server/server_posix.cc \
|
|
3968
|
-
src/cpp/util/
|
|
3969
|
-
src/cpp/util/
|
|
3868
|
+
src/cpp/util/byte_buffer_cc.cc \
|
|
3869
|
+
src/cpp/util/slice_cc.cc \
|
|
3970
3870
|
src/cpp/util/status.cc \
|
|
3971
3871
|
src/cpp/util/string_ref.cc \
|
|
3972
|
-
src/cpp/util/
|
|
3973
|
-
src/core/lib/channel/channel_args.c \
|
|
3974
|
-
src/core/lib/channel/channel_stack.c \
|
|
3975
|
-
src/core/lib/channel/channel_stack_builder.c \
|
|
3976
|
-
src/core/lib/channel/compress_filter.c \
|
|
3977
|
-
src/core/lib/channel/connected_channel.c \
|
|
3978
|
-
src/core/lib/channel/http_client_filter.c \
|
|
3979
|
-
src/core/lib/channel/http_server_filter.c \
|
|
3980
|
-
src/core/lib/compression/compression.c \
|
|
3981
|
-
src/core/lib/compression/message_compress.c \
|
|
3982
|
-
src/core/lib/debug/trace.c \
|
|
3983
|
-
src/core/lib/http/format_request.c \
|
|
3984
|
-
src/core/lib/http/httpcli.c \
|
|
3985
|
-
src/core/lib/http/parser.c \
|
|
3986
|
-
src/core/lib/iomgr/closure.c \
|
|
3987
|
-
src/core/lib/iomgr/endpoint.c \
|
|
3988
|
-
src/core/lib/iomgr/endpoint_pair_posix.c \
|
|
3989
|
-
src/core/lib/iomgr/endpoint_pair_windows.c \
|
|
3990
|
-
src/core/lib/iomgr/error.c \
|
|
3991
|
-
src/core/lib/iomgr/ev_epoll_linux.c \
|
|
3992
|
-
src/core/lib/iomgr/ev_poll_and_epoll_posix.c \
|
|
3993
|
-
src/core/lib/iomgr/ev_poll_posix.c \
|
|
3994
|
-
src/core/lib/iomgr/ev_posix.c \
|
|
3995
|
-
src/core/lib/iomgr/exec_ctx.c \
|
|
3996
|
-
src/core/lib/iomgr/executor.c \
|
|
3997
|
-
src/core/lib/iomgr/iocp_windows.c \
|
|
3998
|
-
src/core/lib/iomgr/iomgr.c \
|
|
3999
|
-
src/core/lib/iomgr/iomgr_posix.c \
|
|
4000
|
-
src/core/lib/iomgr/iomgr_windows.c \
|
|
4001
|
-
src/core/lib/iomgr/load_file.c \
|
|
4002
|
-
src/core/lib/iomgr/network_status_tracker.c \
|
|
4003
|
-
src/core/lib/iomgr/polling_entity.c \
|
|
4004
|
-
src/core/lib/iomgr/pollset_set_windows.c \
|
|
4005
|
-
src/core/lib/iomgr/pollset_windows.c \
|
|
4006
|
-
src/core/lib/iomgr/resolve_address_posix.c \
|
|
4007
|
-
src/core/lib/iomgr/resolve_address_windows.c \
|
|
4008
|
-
src/core/lib/iomgr/sockaddr_utils.c \
|
|
4009
|
-
src/core/lib/iomgr/socket_utils_common_posix.c \
|
|
4010
|
-
src/core/lib/iomgr/socket_utils_linux.c \
|
|
4011
|
-
src/core/lib/iomgr/socket_utils_posix.c \
|
|
4012
|
-
src/core/lib/iomgr/socket_windows.c \
|
|
4013
|
-
src/core/lib/iomgr/tcp_client_posix.c \
|
|
4014
|
-
src/core/lib/iomgr/tcp_client_windows.c \
|
|
4015
|
-
src/core/lib/iomgr/tcp_posix.c \
|
|
4016
|
-
src/core/lib/iomgr/tcp_server_posix.c \
|
|
4017
|
-
src/core/lib/iomgr/tcp_server_windows.c \
|
|
4018
|
-
src/core/lib/iomgr/tcp_windows.c \
|
|
4019
|
-
src/core/lib/iomgr/time_averaged_stats.c \
|
|
4020
|
-
src/core/lib/iomgr/timer.c \
|
|
4021
|
-
src/core/lib/iomgr/timer_heap.c \
|
|
4022
|
-
src/core/lib/iomgr/udp_server.c \
|
|
4023
|
-
src/core/lib/iomgr/unix_sockets_posix.c \
|
|
4024
|
-
src/core/lib/iomgr/unix_sockets_posix_noop.c \
|
|
4025
|
-
src/core/lib/iomgr/wakeup_fd_eventfd.c \
|
|
4026
|
-
src/core/lib/iomgr/wakeup_fd_nospecial.c \
|
|
4027
|
-
src/core/lib/iomgr/wakeup_fd_pipe.c \
|
|
4028
|
-
src/core/lib/iomgr/wakeup_fd_posix.c \
|
|
4029
|
-
src/core/lib/iomgr/workqueue_posix.c \
|
|
4030
|
-
src/core/lib/iomgr/workqueue_windows.c \
|
|
4031
|
-
src/core/lib/json/json.c \
|
|
4032
|
-
src/core/lib/json/json_reader.c \
|
|
4033
|
-
src/core/lib/json/json_string.c \
|
|
4034
|
-
src/core/lib/json/json_writer.c \
|
|
4035
|
-
src/core/lib/surface/alarm.c \
|
|
4036
|
-
src/core/lib/surface/api_trace.c \
|
|
4037
|
-
src/core/lib/surface/byte_buffer.c \
|
|
4038
|
-
src/core/lib/surface/byte_buffer_reader.c \
|
|
4039
|
-
src/core/lib/surface/call.c \
|
|
4040
|
-
src/core/lib/surface/call_details.c \
|
|
4041
|
-
src/core/lib/surface/call_log_batch.c \
|
|
4042
|
-
src/core/lib/surface/channel.c \
|
|
4043
|
-
src/core/lib/surface/channel_init.c \
|
|
4044
|
-
src/core/lib/surface/channel_ping.c \
|
|
4045
|
-
src/core/lib/surface/channel_stack_type.c \
|
|
4046
|
-
src/core/lib/surface/completion_queue.c \
|
|
4047
|
-
src/core/lib/surface/event_string.c \
|
|
4048
|
-
src/core/lib/surface/lame_client.c \
|
|
4049
|
-
src/core/lib/surface/metadata_array.c \
|
|
4050
|
-
src/core/lib/surface/server.c \
|
|
4051
|
-
src/core/lib/surface/validate_metadata.c \
|
|
4052
|
-
src/core/lib/surface/version.c \
|
|
4053
|
-
src/core/lib/transport/byte_stream.c \
|
|
4054
|
-
src/core/lib/transport/connectivity_state.c \
|
|
4055
|
-
src/core/lib/transport/metadata.c \
|
|
4056
|
-
src/core/lib/transport/metadata_batch.c \
|
|
4057
|
-
src/core/lib/transport/static_metadata.c \
|
|
4058
|
-
src/core/lib/transport/transport.c \
|
|
4059
|
-
src/core/lib/transport/transport_op_string.c \
|
|
3872
|
+
src/cpp/util/time_cc.cc \
|
|
4060
3873
|
src/cpp/codegen/codegen_init.cc \
|
|
4061
3874
|
|
|
4062
3875
|
PUBLIC_HEADERS_CXX += \
|
|
@@ -4107,34 +3920,6 @@ PUBLIC_HEADERS_CXX += \
|
|
|
4107
3920
|
include/grpc++/support/stub_options.h \
|
|
4108
3921
|
include/grpc++/support/sync_stream.h \
|
|
4109
3922
|
include/grpc++/support/time.h \
|
|
4110
|
-
include/grpc/byte_buffer.h \
|
|
4111
|
-
include/grpc/byte_buffer_reader.h \
|
|
4112
|
-
include/grpc/compression.h \
|
|
4113
|
-
include/grpc/grpc.h \
|
|
4114
|
-
include/grpc/grpc_posix.h \
|
|
4115
|
-
include/grpc/grpc_security_constants.h \
|
|
4116
|
-
include/grpc/status.h \
|
|
4117
|
-
include/grpc/impl/codegen/byte_buffer.h \
|
|
4118
|
-
include/grpc/impl/codegen/byte_buffer_reader.h \
|
|
4119
|
-
include/grpc/impl/codegen/compression_types.h \
|
|
4120
|
-
include/grpc/impl/codegen/connectivity_state.h \
|
|
4121
|
-
include/grpc/impl/codegen/grpc_types.h \
|
|
4122
|
-
include/grpc/impl/codegen/propagation_bits.h \
|
|
4123
|
-
include/grpc/impl/codegen/status.h \
|
|
4124
|
-
include/grpc/impl/codegen/alloc.h \
|
|
4125
|
-
include/grpc/impl/codegen/atm.h \
|
|
4126
|
-
include/grpc/impl/codegen/atm_gcc_atomic.h \
|
|
4127
|
-
include/grpc/impl/codegen/atm_gcc_sync.h \
|
|
4128
|
-
include/grpc/impl/codegen/atm_windows.h \
|
|
4129
|
-
include/grpc/impl/codegen/log.h \
|
|
4130
|
-
include/grpc/impl/codegen/port_platform.h \
|
|
4131
|
-
include/grpc/impl/codegen/slice.h \
|
|
4132
|
-
include/grpc/impl/codegen/slice_buffer.h \
|
|
4133
|
-
include/grpc/impl/codegen/sync.h \
|
|
4134
|
-
include/grpc/impl/codegen/sync_generic.h \
|
|
4135
|
-
include/grpc/impl/codegen/sync_posix.h \
|
|
4136
|
-
include/grpc/impl/codegen/sync_windows.h \
|
|
4137
|
-
include/grpc/impl/codegen/time.h \
|
|
4138
3923
|
include/grpc++/impl/codegen/async_stream.h \
|
|
4139
3924
|
include/grpc++/impl/codegen/async_unary_call.h \
|
|
4140
3925
|
include/grpc++/impl/codegen/call.h \
|
|
@@ -4165,6 +3950,27 @@ PUBLIC_HEADERS_CXX += \
|
|
|
4165
3950
|
include/grpc++/impl/codegen/sync_no_cxx11.h \
|
|
4166
3951
|
include/grpc++/impl/codegen/sync_stream.h \
|
|
4167
3952
|
include/grpc++/impl/codegen/time.h \
|
|
3953
|
+
include/grpc/impl/codegen/byte_buffer.h \
|
|
3954
|
+
include/grpc/impl/codegen/byte_buffer_reader.h \
|
|
3955
|
+
include/grpc/impl/codegen/compression_types.h \
|
|
3956
|
+
include/grpc/impl/codegen/connectivity_state.h \
|
|
3957
|
+
include/grpc/impl/codegen/grpc_types.h \
|
|
3958
|
+
include/grpc/impl/codegen/propagation_bits.h \
|
|
3959
|
+
include/grpc/impl/codegen/status.h \
|
|
3960
|
+
include/grpc/impl/codegen/alloc.h \
|
|
3961
|
+
include/grpc/impl/codegen/atm.h \
|
|
3962
|
+
include/grpc/impl/codegen/atm_gcc_atomic.h \
|
|
3963
|
+
include/grpc/impl/codegen/atm_gcc_sync.h \
|
|
3964
|
+
include/grpc/impl/codegen/atm_windows.h \
|
|
3965
|
+
include/grpc/impl/codegen/log.h \
|
|
3966
|
+
include/grpc/impl/codegen/port_platform.h \
|
|
3967
|
+
include/grpc/impl/codegen/slice.h \
|
|
3968
|
+
include/grpc/impl/codegen/slice_buffer.h \
|
|
3969
|
+
include/grpc/impl/codegen/sync.h \
|
|
3970
|
+
include/grpc/impl/codegen/sync_generic.h \
|
|
3971
|
+
include/grpc/impl/codegen/sync_posix.h \
|
|
3972
|
+
include/grpc/impl/codegen/sync_windows.h \
|
|
3973
|
+
include/grpc/impl/codegen/time.h \
|
|
4168
3974
|
|
|
4169
3975
|
LIBGRPC++_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_UNSECURE_SRC))))
|
|
4170
3976
|
|
|
@@ -13700,38 +13506,6 @@ ifneq ($(NO_DEPS),true)
|
|
|
13700
13506
|
endif
|
|
13701
13507
|
|
|
13702
13508
|
|
|
13703
|
-
BAD_SSL_ALPN_SERVER_SRC = \
|
|
13704
|
-
test/core/bad_ssl/servers/alpn.c \
|
|
13705
|
-
|
|
13706
|
-
BAD_SSL_ALPN_SERVER_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BAD_SSL_ALPN_SERVER_SRC))))
|
|
13707
|
-
ifeq ($(NO_SECURE),true)
|
|
13708
|
-
|
|
13709
|
-
# You can't build secure targets if you don't have OpenSSL.
|
|
13710
|
-
|
|
13711
|
-
$(BINDIR)/$(CONFIG)/bad_ssl_alpn_server: openssl_dep_error
|
|
13712
|
-
|
|
13713
|
-
else
|
|
13714
|
-
|
|
13715
|
-
|
|
13716
|
-
|
|
13717
|
-
$(BINDIR)/$(CONFIG)/bad_ssl_alpn_server: $(BAD_SSL_ALPN_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
|
|
13718
|
-
$(E) "[LD] Linking $@"
|
|
13719
|
-
$(Q) mkdir -p `dirname $@`
|
|
13720
|
-
$(Q) $(LD) $(LDFLAGS) $(BAD_SSL_ALPN_SERVER_OBJS) $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/bad_ssl_alpn_server
|
|
13721
|
-
|
|
13722
|
-
endif
|
|
13723
|
-
|
|
13724
|
-
$(OBJDIR)/$(CONFIG)/test/core/bad_ssl/servers/alpn.o: $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
|
|
13725
|
-
|
|
13726
|
-
deps_bad_ssl_alpn_server: $(BAD_SSL_ALPN_SERVER_OBJS:.o=.dep)
|
|
13727
|
-
|
|
13728
|
-
ifneq ($(NO_SECURE),true)
|
|
13729
|
-
ifneq ($(NO_DEPS),true)
|
|
13730
|
-
-include $(BAD_SSL_ALPN_SERVER_OBJS:.o=.dep)
|
|
13731
|
-
endif
|
|
13732
|
-
endif
|
|
13733
|
-
|
|
13734
|
-
|
|
13735
13509
|
BAD_SSL_CERT_SERVER_SRC = \
|
|
13736
13510
|
test/core/bad_ssl/servers/cert.c \
|
|
13737
13511
|
|
|
@@ -13764,38 +13538,6 @@ endif
|
|
|
13764
13538
|
endif
|
|
13765
13539
|
|
|
13766
13540
|
|
|
13767
|
-
BAD_SSL_ALPN_TEST_SRC = \
|
|
13768
|
-
test/core/bad_ssl/bad_ssl_test.c \
|
|
13769
|
-
|
|
13770
|
-
BAD_SSL_ALPN_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(BAD_SSL_ALPN_TEST_SRC))))
|
|
13771
|
-
ifeq ($(NO_SECURE),true)
|
|
13772
|
-
|
|
13773
|
-
# You can't build secure targets if you don't have OpenSSL.
|
|
13774
|
-
|
|
13775
|
-
$(BINDIR)/$(CONFIG)/bad_ssl_alpn_test: openssl_dep_error
|
|
13776
|
-
|
|
13777
|
-
else
|
|
13778
|
-
|
|
13779
|
-
|
|
13780
|
-
|
|
13781
|
-
$(BINDIR)/$(CONFIG)/bad_ssl_alpn_test: $(BAD_SSL_ALPN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
|
|
13782
|
-
$(E) "[LD] Linking $@"
|
|
13783
|
-
$(Q) mkdir -p `dirname $@`
|
|
13784
|
-
$(Q) $(LD) $(LDFLAGS) $(BAD_SSL_ALPN_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/bad_ssl_alpn_test
|
|
13785
|
-
|
|
13786
|
-
endif
|
|
13787
|
-
|
|
13788
|
-
$(OBJDIR)/$(CONFIG)/test/core/bad_ssl/bad_ssl_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
|
|
13789
|
-
|
|
13790
|
-
deps_bad_ssl_alpn_test: $(BAD_SSL_ALPN_TEST_OBJS:.o=.dep)
|
|
13791
|
-
|
|
13792
|
-
ifneq ($(NO_SECURE),true)
|
|
13793
|
-
ifneq ($(NO_DEPS),true)
|
|
13794
|
-
-include $(BAD_SSL_ALPN_TEST_OBJS:.o=.dep)
|
|
13795
|
-
endif
|
|
13796
|
-
endif
|
|
13797
|
-
|
|
13798
|
-
|
|
13799
13541
|
BAD_SSL_CERT_TEST_SRC = \
|
|
13800
13542
|
test/core/bad_ssl/bad_ssl_test.c \
|
|
13801
13543
|
|
|
@@ -15050,7 +14792,7 @@ test/cpp/util/create_test_channel.cc: $(OPENSSL_DEP)
|
|
|
15050
14792
|
test/cpp/util/proto_file_parser.cc: $(OPENSSL_DEP)
|
|
15051
14793
|
test/cpp/util/string_ref_helper.cc: $(OPENSSL_DEP)
|
|
15052
14794
|
test/cpp/util/subprocess.cc: $(OPENSSL_DEP)
|
|
15053
|
-
test/cpp/util/
|
|
14795
|
+
test/cpp/util/test_config_cc.cc: $(OPENSSL_DEP)
|
|
15054
14796
|
test/cpp/util/test_credentials_provider.cc: $(OPENSSL_DEP)
|
|
15055
14797
|
endif
|
|
15056
14798
|
|
|
@@ -138,15 +138,17 @@ struct grpc_tcp_server {
|
|
|
138
138
|
};
|
|
139
139
|
|
|
140
140
|
static gpr_once check_init = GPR_ONCE_INIT;
|
|
141
|
-
static bool has_so_reuseport;
|
|
141
|
+
static bool has_so_reuseport = false;
|
|
142
142
|
|
|
143
143
|
static void init(void) {
|
|
144
|
+
#ifndef GPR_MANYLINUX1
|
|
144
145
|
int s = socket(AF_INET, SOCK_STREAM, 0);
|
|
145
146
|
if (s >= 0) {
|
|
146
147
|
has_so_reuseport = GRPC_LOG_IF_ERROR("check for SO_REUSEPORT",
|
|
147
148
|
grpc_set_socket_reuse_port(s, 1));
|
|
148
149
|
close(s);
|
|
149
150
|
}
|
|
151
|
+
#endif
|
|
150
152
|
}
|
|
151
153
|
|
|
152
154
|
grpc_error *grpc_tcp_server_create(grpc_closure *shutdown_complete,
|
|
@@ -91,6 +91,10 @@ if grpc_config == 'gcov'
|
|
|
91
91
|
$LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic'
|
|
92
92
|
end
|
|
93
93
|
|
|
94
|
+
if grpc_config == 'dbg'
|
|
95
|
+
$CFLAGS << ' -O0'
|
|
96
|
+
end
|
|
97
|
+
|
|
94
98
|
$LDFLAGS << ' -Wl,-wrap,memcpy' if RUBY_PLATFORM =~ /linux/
|
|
95
99
|
$LDFLAGS << ' -static' if windows
|
|
96
100
|
|
|
@@ -188,7 +188,6 @@ module GRPC
|
|
|
188
188
|
# marshalled.
|
|
189
189
|
def remote_send(req, marshalled = false)
|
|
190
190
|
# TODO(murgatroid99): ensure metadata was sent
|
|
191
|
-
GRPC.logger.debug("sending #{req}, marshalled? #{marshalled}")
|
|
192
191
|
payload = marshalled ? req : @marshal.call(req)
|
|
193
192
|
@call.run_batch(SEND_MESSAGE => payload)
|
|
194
193
|
end
|
|
@@ -225,11 +224,8 @@ module GRPC
|
|
|
225
224
|
@call.metadata = batch_result.metadata
|
|
226
225
|
@metadata_received = true
|
|
227
226
|
end
|
|
228
|
-
GRPC.logger.debug("received req: #{batch_result}")
|
|
229
227
|
unless batch_result.nil? || batch_result.message.nil?
|
|
230
|
-
GRPC.logger.debug("received req.to_s: #{batch_result.message}")
|
|
231
228
|
res = @unmarshal.call(batch_result.message)
|
|
232
|
-
GRPC.logger.debug("received_req (unmarshalled): #{res.inspect}")
|
|
233
229
|
return res
|
|
234
230
|
end
|
|
235
231
|
GRPC.logger.debug('found nil; the final response has been sent')
|
|
@@ -391,7 +391,6 @@ module GRPC
|
|
|
391
391
|
|
|
392
392
|
# allow the metadata to be accessed from the call
|
|
393
393
|
an_rpc.call.metadata = an_rpc.metadata # attaches md to call for handlers
|
|
394
|
-
GRPC.logger.debug("call md is #{an_rpc.metadata}")
|
|
395
394
|
connect_md = nil
|
|
396
395
|
unless @connect_md_proc.nil?
|
|
397
396
|
connect_md = @connect_md_proc.call(an_rpc.method, an_rpc.metadata)
|
data/src/ruby/lib/grpc/grpc.rb
CHANGED
|
@@ -28,7 +28,12 @@
|
|
|
28
28
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
29
29
|
|
|
30
30
|
begin
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
ruby_version_dirname = /(\d+\.\d+)/.match(RUBY_VERSION).to_s
|
|
32
|
+
distrib_lib_dir = File.expand_path(ruby_version_dirname,
|
|
33
|
+
File.dirname(__FILE__))
|
|
34
|
+
if File.directory?(distrib_lib_dir)
|
|
35
|
+
require_relative "#{distrib_lib_dir}/grpc_c"
|
|
36
|
+
else
|
|
37
|
+
require_relative 'grpc_c'
|
|
38
|
+
end
|
|
34
39
|
end
|
data/src/ruby/pb/test/server.rb
CHANGED
|
@@ -129,27 +129,36 @@ def nulls(l)
|
|
|
129
129
|
[].pack('x' * l).force_encoding('ascii-8bit')
|
|
130
130
|
end
|
|
131
131
|
|
|
132
|
-
# A
|
|
133
|
-
class
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
def initialize(sentinel)
|
|
138
|
-
@q = Queue.new
|
|
139
|
-
@sentinel = sentinel
|
|
140
|
-
end
|
|
132
|
+
# A FullDuplexEnumerator passes requests to a block and yields generated responses
|
|
133
|
+
class FullDuplexEnumerator
|
|
134
|
+
include Grpc::Testing
|
|
135
|
+
include Grpc::Testing::PayloadType
|
|
141
136
|
|
|
137
|
+
def initialize(requests)
|
|
138
|
+
@requests = requests
|
|
139
|
+
end
|
|
142
140
|
def each_item
|
|
143
141
|
return enum_for(:each_item) unless block_given?
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
142
|
+
GRPC.logger.info('interop-server: started receiving')
|
|
143
|
+
begin
|
|
144
|
+
cls = StreamingOutputCallResponse
|
|
145
|
+
@requests.each do |req|
|
|
146
|
+
req.response_parameters.each do |params|
|
|
147
|
+
resp_size = params.size
|
|
148
|
+
GRPC.logger.info("read a req, response size is #{resp_size}")
|
|
149
|
+
yield cls.new(payload: Payload.new(type: req.response_type,
|
|
150
|
+
body: nulls(resp_size)))
|
|
151
|
+
end
|
|
152
|
+
end
|
|
153
|
+
GRPC.logger.info('interop-server: finished receiving')
|
|
154
|
+
rescue StandardError => e
|
|
155
|
+
GRPC.logger.info('interop-server: failed')
|
|
156
|
+
GRPC.logger.warn(e)
|
|
157
|
+
fail e
|
|
149
158
|
end
|
|
150
159
|
end
|
|
151
160
|
end
|
|
152
|
-
|
|
161
|
+
|
|
153
162
|
# A runnable implementation of the schema-specified testing service, with each
|
|
154
163
|
# service method implemented as required by the interop testing spec.
|
|
155
164
|
class TestTarget < Grpc::Testing::TestService::Service
|
|
@@ -182,31 +191,9 @@ class TestTarget < Grpc::Testing::TestService::Service
|
|
|
182
191
|
|
|
183
192
|
def full_duplex_call(reqs)
|
|
184
193
|
# reqs is a lazy Enumerator of the requests sent by the client.
|
|
185
|
-
|
|
186
|
-
cls = StreamingOutputCallResponse
|
|
187
|
-
Thread.new do
|
|
188
|
-
begin
|
|
189
|
-
GRPC.logger.info('interop-server: started receiving')
|
|
190
|
-
reqs.each do |req|
|
|
191
|
-
req.response_parameters.each do |params|
|
|
192
|
-
resp_size = params.size
|
|
193
|
-
GRPC.logger.info("read a req, response size is #{resp_size}")
|
|
194
|
-
resp = cls.new(payload: Payload.new(type: req.response_type,
|
|
195
|
-
body: nulls(resp_size)))
|
|
196
|
-
q.push(resp)
|
|
197
|
-
end
|
|
198
|
-
end
|
|
199
|
-
GRPC.logger.info('interop-server: finished receiving')
|
|
200
|
-
q.push(self)
|
|
201
|
-
rescue StandardError => e
|
|
202
|
-
GRPC.logger.info('interop-server: failed')
|
|
203
|
-
GRPC.logger.warn(e)
|
|
204
|
-
q.push(e) # share the exception with the enumerator
|
|
205
|
-
end
|
|
206
|
-
end
|
|
207
|
-
q.each_item
|
|
194
|
+
FullDuplexEnumerator.new(reqs).each_item
|
|
208
195
|
end
|
|
209
|
-
|
|
196
|
+
|
|
210
197
|
def half_duplex_call(reqs)
|
|
211
198
|
# TODO: update with unique behaviour of the half_duplex_call if that's
|
|
212
199
|
# ever required by any of the tests.
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: grpc
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.1.pre1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- gRPC Authors
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: src/ruby/bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-10-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: google-protobuf
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version:
|
|
19
|
+
version: 3.0.2
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version:
|
|
26
|
+
version: 3.0.2
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: googleauth
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -1177,9 +1177,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
1177
1177
|
version: 2.0.0
|
|
1178
1178
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1179
1179
|
requirements:
|
|
1180
|
-
- - "
|
|
1180
|
+
- - ">"
|
|
1181
1181
|
- !ruby/object:Gem::Version
|
|
1182
|
-
version:
|
|
1182
|
+
version: 1.3.1
|
|
1183
1183
|
requirements: []
|
|
1184
1184
|
rubyforge_project:
|
|
1185
1185
|
rubygems_version: 2.5.1
|