grpc 1.30.0 → 1.31.1
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 +560 -619
- data/include/grpc/grpc_security.h +8 -0
- data/include/grpc/grpc_security_constants.h +3 -0
- data/include/grpc/impl/codegen/grpc_types.h +7 -5
- data/include/grpc/impl/codegen/port_platform.h +0 -32
- data/src/core/ext/filters/client_channel/backend_metric.cc +12 -9
- data/src/core/ext/filters/client_channel/client_channel.cc +406 -261
- data/src/core/ext/filters/client_channel/config_selector.cc +62 -0
- data/src/core/ext/filters/client_channel/config_selector.h +93 -0
- data/src/core/ext/filters/client_channel/global_subchannel_pool.cc +24 -2
- data/src/core/ext/filters/client_channel/health/health_check_client.cc +2 -0
- data/src/core/ext/filters/client_channel/http_connect_handshaker.cc +6 -5
- data/src/core/ext/filters/client_channel/http_proxy.cc +6 -4
- data/src/core/ext/filters/client_channel/lb_policy.h +2 -0
- data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +39 -23
- data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +4 -6
- data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +3 -4
- data/src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc +381 -72
- data/src/core/ext/filters/client_channel/lb_policy_registry.cc +4 -5
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +5 -2
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.cc +6 -5
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +8 -6
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +9 -7
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +7 -5
- data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +33 -48
- data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +6 -2
- data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +21 -18
- data/src/core/ext/filters/client_channel/resolver_registry.cc +13 -14
- data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +6 -7
- data/src/core/ext/filters/client_channel/resolving_lb_policy.cc +33 -28
- data/src/core/ext/filters/client_channel/resolving_lb_policy.h +39 -20
- data/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc +142 -0
- data/src/core/ext/filters/client_channel/subchannel.cc +1 -1
- data/src/core/ext/filters/client_channel/xds/xds_api.cc +327 -123
- data/src/core/ext/filters/client_channel/xds/xds_api.h +72 -7
- data/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc +12 -23
- data/src/core/ext/filters/client_channel/xds/xds_client.cc +112 -33
- data/src/core/ext/filters/client_channel/xds/xds_client_stats.h +10 -10
- data/src/core/ext/filters/http/client/http_client_filter.cc +5 -5
- data/src/core/ext/filters/http/http_filters_plugin.cc +2 -1
- data/src/core/ext/filters/http/message_compress/message_decompress_filter.cc +74 -33
- data/src/core/ext/filters/http/message_compress/message_decompress_filter.h +3 -1
- data/src/core/ext/filters/message_size/message_size_filter.cc +56 -80
- data/src/core/ext/filters/message_size/message_size_filter.h +6 -0
- data/src/core/ext/transport/chttp2/server/chttp2_server.cc +383 -347
- data/src/core/ext/transport/chttp2/server/chttp2_server.h +6 -2
- data/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +1 -1
- data/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +7 -13
- data/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +7 -8
- data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +19 -4
- data/src/core/ext/transport/chttp2/transport/flow_control.cc +22 -27
- data/src/core/ext/transport/chttp2/transport/flow_control.h +14 -16
- data/src/core/ext/transport/chttp2/transport/frame_data.cc +9 -12
- data/src/core/ext/transport/chttp2/transport/frame_goaway.cc +4 -6
- data/src/core/ext/transport/chttp2/transport/frame_ping.cc +5 -6
- data/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +12 -13
- data/src/core/ext/transport/chttp2/transport/frame_settings.cc +6 -7
- data/src/core/ext/transport/chttp2/transport/frame_window_update.cc +9 -12
- data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +25 -29
- data/src/core/ext/transport/chttp2/transport/hpack_table.cc +13 -17
- data/src/core/ext/transport/chttp2/transport/internal.h +13 -0
- data/src/core/ext/transport/chttp2/transport/parsing.cc +33 -43
- data/src/core/ext/transport/chttp2/transport/writing.cc +9 -14
- data/src/core/ext/transport/inproc/inproc_transport.cc +35 -15
- data/src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h +0 -1
- data/src/core/ext/upb-generated/envoy/annotations/resource.upb.h +3 -4
- data/src/core/ext/upb-generated/envoy/api/v2/auth/cert.upb.h +0 -1
- data/src/core/ext/upb-generated/envoy/api/v2/auth/common.upb.h +80 -69
- data/src/core/ext/upb-generated/envoy/api/v2/auth/secret.upb.h +24 -23
- data/src/core/ext/upb-generated/envoy/api/v2/auth/tls.upb.h +66 -56
- data/src/core/ext/upb-generated/envoy/api/v2/cds.upb.h +1 -2
- data/src/core/ext/upb-generated/envoy/api/v2/cluster.upb.c +2 -2
- data/src/core/ext/upb-generated/envoy/api/v2/cluster.upb.h +317 -311
- data/src/core/ext/upb-generated/envoy/api/v2/cluster/circuit_breaker.upb.h +42 -34
- data/src/core/ext/upb-generated/envoy/api/v2/cluster/filter.upb.h +7 -7
- data/src/core/ext/upb-generated/envoy/api/v2/cluster/outlier_detection.upb.h +79 -61
- data/src/core/ext/upb-generated/envoy/api/v2/core/address.upb.h +55 -49
- data/src/core/ext/upb-generated/envoy/api/v2/core/backoff.upb.h +9 -8
- data/src/core/ext/upb-generated/envoy/api/v2/core/base.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/api/v2/core/base.upb.h +163 -169
- data/src/core/ext/upb-generated/envoy/api/v2/core/config_source.upb.h +51 -45
- data/src/core/ext/upb-generated/envoy/api/v2/core/event_service_config.upb.h +4 -5
- data/src/core/ext/upb-generated/envoy/api/v2/core/grpc_service.upb.h +107 -100
- data/src/core/ext/upb-generated/envoy/api/v2/core/health_check.upb.h +137 -117
- data/src/core/ext/upb-generated/envoy/api/v2/core/http_uri.upb.h +9 -9
- data/src/core/ext/upb-generated/envoy/api/v2/core/protocol.upb.h +105 -87
- data/src/core/ext/upb-generated/envoy/api/v2/core/socket_option.upb.h +12 -13
- data/src/core/ext/upb-generated/envoy/api/v2/discovery.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/api/v2/discovery.upb.h +95 -101
- data/src/core/ext/upb-generated/envoy/api/v2/eds.upb.h +1 -2
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint.upb.h +49 -65
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint.upb.h +0 -1
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint/endpoint_components.upb.h +49 -42
- data/src/core/ext/upb-generated/envoy/api/v2/endpoint/load_report.upb.h +70 -62
- data/src/core/ext/upb-generated/envoy/api/v2/lds.upb.h +1 -2
- data/src/core/ext/upb-generated/envoy/api/v2/listener.upb.h +81 -65
- data/src/core/ext/upb-generated/envoy/api/v2/listener/listener.upb.h +0 -1
- data/src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/api/v2/listener/listener_components.upb.h +91 -80
- data/src/core/ext/upb-generated/envoy/api/v2/listener/udp_listener_config.upb.h +9 -10
- data/src/core/ext/upb-generated/envoy/api/v2/rds.upb.h +1 -2
- data/src/core/ext/upb-generated/envoy/api/v2/route.upb.h +36 -31
- data/src/core/ext/upb-generated/envoy/api/v2/route/route.upb.h +0 -1
- data/src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.c +7 -7
- data/src/core/ext/upb-generated/envoy/api/v2/route/route_components.upb.h +648 -696
- data/src/core/ext/upb-generated/envoy/api/v2/scoped_route.upb.h +16 -15
- data/src/core/ext/upb-generated/envoy/api/v2/srds.upb.h +1 -2
- data/src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.c +1 -1
- data/src/core/ext/upb-generated/envoy/config/filter/accesslog/v2/accesslog.upb.h +95 -88
- data/src/core/ext/upb-generated/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.upb.h +234 -199
- data/src/core/ext/upb-generated/envoy/config/listener/v2/api_listener.upb.h +5 -5
- data/src/core/ext/upb-generated/envoy/config/trace/v2/http_tracer.upb.h +13 -13
- data/src/core/ext/upb-generated/envoy/service/discovery/v2/ads.upb.h +1 -2
- data/src/core/ext/upb-generated/envoy/service/load_stats/v2/lrs.upb.h +20 -18
- data/src/core/ext/upb-generated/envoy/type/http.upb.h +0 -1
- data/src/core/ext/upb-generated/envoy/type/matcher/regex.upb.h +18 -17
- data/src/core/ext/upb-generated/envoy/type/matcher/string.upb.h +14 -14
- data/src/core/ext/upb-generated/envoy/type/metadata/v2/metadata.upb.h +23 -23
- data/src/core/ext/upb-generated/envoy/type/percent.upb.h +8 -9
- data/src/core/ext/upb-generated/envoy/type/range.upb.h +15 -16
- data/src/core/ext/upb-generated/envoy/type/semantic_version.upb.h +7 -8
- data/src/core/ext/upb-generated/envoy/type/tracing/v2/custom_tag.upb.h +36 -35
- data/src/core/ext/upb-generated/gogoproto/gogo.upb.h +0 -1
- data/src/core/ext/upb-generated/google/api/annotations.upb.h +0 -1
- data/src/core/ext/upb-generated/google/api/http.upb.h +29 -28
- data/src/core/ext/upb-generated/google/protobuf/any.upb.h +5 -6
- data/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c +3 -3
- data/src/core/ext/upb-generated/google/protobuf/descriptor.upb.h +412 -386
- data/src/core/ext/upb-generated/google/protobuf/duration.upb.h +5 -6
- data/src/core/ext/upb-generated/google/protobuf/empty.upb.h +1 -2
- data/src/core/ext/upb-generated/google/protobuf/struct.upb.c +1 -1
- data/src/core/ext/upb-generated/google/protobuf/struct.upb.h +33 -54
- data/src/core/ext/upb-generated/google/protobuf/timestamp.upb.h +5 -6
- data/src/core/ext/upb-generated/google/protobuf/wrappers.upb.h +27 -28
- data/src/core/ext/upb-generated/google/rpc/status.upb.h +8 -8
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c +1 -1
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.h +32 -45
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c +4 -4
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.h +157 -178
- data/src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.h +14 -13
- data/src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h +6 -7
- data/src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h +59 -56
- data/src/core/ext/upb-generated/udpa/annotations/migrate.upb.h +11 -12
- data/src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h +0 -1
- data/src/core/ext/upb-generated/udpa/annotations/status.upb.h +5 -6
- data/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c +6 -6
- data/src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h +41 -68
- data/src/core/ext/upb-generated/validate/validate.upb.h +536 -535
- data/src/core/lib/channel/channel_trace.cc +2 -6
- data/src/core/lib/channel/channelz.cc +5 -15
- data/src/core/lib/gpr/log_linux.cc +6 -8
- data/src/core/lib/gpr/log_posix.cc +6 -8
- data/src/core/lib/gpr/string.cc +10 -9
- data/src/core/lib/gpr/string.h +4 -2
- data/src/core/lib/gprpp/global_config_env.cc +8 -6
- data/src/core/lib/http/httpcli.cc +13 -10
- data/src/core/lib/http/httpcli_security_connector.cc +5 -5
- data/src/core/lib/iomgr/cfstream_handle.cc +1 -0
- data/src/core/lib/iomgr/endpoint_pair_posix.cc +10 -10
- data/src/core/lib/iomgr/error_cfstream.cc +9 -8
- data/src/core/lib/iomgr/ev_epoll1_linux.cc +5 -6
- data/src/core/lib/iomgr/ev_epollex_linux.cc +15 -21
- data/src/core/lib/iomgr/ev_poll_posix.cc +6 -5
- data/src/core/lib/iomgr/ev_posix.cc +2 -0
- data/src/core/lib/iomgr/iomgr.cc +10 -0
- data/src/core/lib/iomgr/iomgr.h +10 -0
- data/src/core/lib/iomgr/is_epollexclusive_available.cc +14 -0
- data/src/core/lib/iomgr/port.h +1 -21
- data/src/core/lib/iomgr/resolve_address_custom.cc +13 -18
- data/src/core/lib/iomgr/resolve_address_windows.cc +8 -8
- data/src/core/lib/iomgr/resource_quota.cc +34 -31
- data/src/core/lib/iomgr/sockaddr_utils.cc +7 -5
- data/src/core/lib/iomgr/sockaddr_utils.h +1 -1
- data/src/core/lib/iomgr/socket_utils_common_posix.cc +95 -55
- data/src/core/lib/iomgr/socket_windows.cc +4 -5
- data/src/core/lib/iomgr/tcp_client_cfstream.cc +9 -11
- data/src/core/lib/iomgr/tcp_client_custom.cc +6 -9
- data/src/core/lib/iomgr/tcp_client_posix.cc +27 -36
- data/src/core/lib/iomgr/tcp_client_windows.cc +9 -9
- data/src/core/lib/iomgr/tcp_custom.cc +1 -1
- data/src/core/lib/iomgr/tcp_custom.h +1 -1
- data/src/core/lib/iomgr/tcp_server.cc +3 -4
- data/src/core/lib/iomgr/tcp_server.h +7 -5
- data/src/core/lib/iomgr/tcp_server_custom.cc +6 -14
- data/src/core/lib/iomgr/tcp_server_posix.cc +34 -41
- data/src/core/lib/iomgr/tcp_server_utils_posix.h +3 -4
- data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +5 -7
- data/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +4 -9
- data/src/core/lib/iomgr/tcp_server_windows.cc +16 -16
- data/src/core/lib/iomgr/timer_generic.cc +13 -12
- data/src/core/lib/iomgr/udp_server.cc +24 -23
- data/src/core/lib/iomgr/udp_server.h +5 -2
- data/src/core/lib/iomgr/unix_sockets_posix.cc +9 -14
- data/src/core/lib/iomgr/unix_sockets_posix.h +3 -1
- data/src/core/lib/iomgr/unix_sockets_posix_noop.cc +5 -2
- data/src/core/lib/json/json_reader.cc +20 -21
- data/src/core/lib/security/credentials/credentials.h +5 -3
- data/src/core/lib/security/credentials/google_default/credentials_generic.cc +8 -6
- data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +12 -9
- data/src/core/lib/security/credentials/jwt/jwt_credentials.cc +7 -4
- data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +19 -28
- data/src/core/lib/security/credentials/plugin/plugin_credentials.cc +6 -6
- data/src/core/lib/security/credentials/ssl/ssl_credentials.cc +20 -0
- data/src/core/lib/security/credentials/ssl/ssl_credentials.h +10 -0
- data/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h +10 -0
- data/src/core/lib/security/security_connector/fake/fake_security_connector.cc +10 -10
- data/src/core/lib/security/security_connector/security_connector.cc +2 -0
- data/src/core/lib/security/security_connector/security_connector.h +1 -1
- data/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +18 -11
- data/src/core/lib/security/security_connector/ssl/ssl_security_connector.h +5 -0
- data/src/core/lib/security/security_connector/ssl_utils.cc +44 -23
- data/src/core/lib/security/security_connector/ssl_utils.h +6 -2
- data/src/core/lib/security/security_connector/tls/tls_security_connector.cc +27 -24
- data/src/core/lib/security/transport/auth_filters.h +0 -5
- data/src/core/lib/security/transport/client_auth_filter.cc +10 -9
- data/src/core/lib/security/util/json_util.cc +12 -13
- data/src/core/lib/slice/slice.cc +38 -1
- data/src/core/lib/slice/slice_internal.h +1 -0
- data/src/core/lib/surface/call.cc +40 -41
- data/src/core/lib/surface/completion_queue.cc +271 -14
- data/src/core/lib/surface/completion_queue.h +8 -0
- data/src/core/lib/surface/init.cc +2 -0
- data/src/core/lib/surface/server.cc +565 -632
- data/src/core/lib/surface/server.h +34 -12
- data/src/core/lib/surface/version.cc +2 -2
- data/src/core/lib/transport/transport.h +6 -0
- data/src/core/lib/uri/uri_parser.cc +8 -15
- data/src/core/plugin_registry/grpc_plugin_registry.cc +4 -0
- data/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +23 -13
- data/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +2 -0
- data/src/core/tsi/alts/handshaker/transport_security_common_api.cc +2 -0
- data/src/core/tsi/ssl_transport_security.cc +108 -11
- data/src/core/tsi/ssl_transport_security.h +14 -2
- data/src/core/tsi/transport_security_interface.h +5 -0
- data/src/ruby/bin/math_services_pb.rb +4 -4
- data/src/ruby/ext/grpc/extconf.rb +5 -2
- data/src/ruby/ext/grpc/rb_call.c +3 -2
- data/src/ruby/ext/grpc/rb_call.h +4 -0
- data/src/ruby/ext/grpc/rb_call_credentials.c +57 -12
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.c +4 -0
- data/src/ruby/ext/grpc/rb_grpc_imports.generated.h +6 -0
- data/src/ruby/lib/grpc/generic/client_stub.rb +1 -1
- data/src/ruby/lib/grpc/generic/interceptors.rb +1 -1
- data/src/ruby/lib/grpc/version.rb +1 -1
- data/src/ruby/pb/grpc/health/v1/health_services_pb.rb +2 -2
- data/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb +5 -0
- data/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb +28 -12
- data/src/ruby/spec/pb/codegen/grpc/testing/package_options_import2.proto +23 -0
- data/src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto +2 -0
- data/src/ruby/spec/pb/codegen/grpc/testing/same_package_service_name.proto +27 -0
- data/src/ruby/spec/pb/codegen/grpc/testing/same_ruby_package_service_name.proto +29 -0
- data/src/ruby/spec/pb/codegen/package_option_spec.rb +25 -1
- data/src/ruby/spec/support/services.rb +10 -4
- data/src/ruby/spec/user_agent_spec.rb +74 -0
- data/third_party/boringssl-with-bazel/err_data.c +89 -83
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_bitstr.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_enum.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_int.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_object.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_time.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/asn1/a_type.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/asn1/asn1_lib.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/asn1/asn_pack.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/asn1/f_enum.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/asn1/f_int.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/asn1/f_string.c +1 -1
- data/third_party/boringssl-with-bazel/src/crypto/cipher_extra/tls_cbc.c +1 -0
- data/third_party/boringssl-with-bazel/src/crypto/ec_extra/hash_to_curve.c +12 -52
- data/third_party/boringssl-with-bazel/src/crypto/ec_extra/internal.h +0 -22
- data/third_party/boringssl-with-bazel/src/crypto/evp/evp_asn1.c +143 -0
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/aes/mode_wrappers.c +17 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/bn/internal.h +11 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/internal.h +2 -1
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p224-64.c +13 -11
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256-x86_64.c +24 -23
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/p256.c +20 -16
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/simple_mul.c +2 -2
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/ec/util.c +3 -3
- data/third_party/boringssl-with-bazel/src/crypto/fipsmodule/self_check/self_check.c +62 -0
- data/third_party/boringssl-with-bazel/src/crypto/mem.c +29 -15
- data/third_party/boringssl-with-bazel/src/crypto/pkcs8/internal.h +7 -0
- data/third_party/boringssl-with-bazel/src/crypto/pkcs8/pkcs8_x509.c +36 -5
- data/third_party/boringssl-with-bazel/src/crypto/trust_token/internal.h +0 -29
- data/third_party/boringssl-with-bazel/src/crypto/trust_token/pmbtoken.c +116 -363
- data/third_party/boringssl-with-bazel/src/crypto/trust_token/trust_token.c +7 -45
- data/third_party/boringssl-with-bazel/src/crypto/x509/a_strex.c +4 -4
- data/third_party/boringssl-with-bazel/src/crypto/x509/algorithm.c +8 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509/asn1_gen.c +4 -4
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509.c +0 -67
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_cmp.c +13 -6
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_req.c +10 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_set.c +41 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_trs.c +4 -1
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509_vfy.c +28 -9
- data/third_party/boringssl-with-bazel/src/crypto/x509/x509cset.c +25 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_crl.c +35 -13
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_pubkey.c +0 -154
- data/third_party/boringssl-with-bazel/src/crypto/x509/x_x509.c +28 -6
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/internal.h +5 -0
- data/third_party/boringssl-with-bazel/src/crypto/x509v3/v3_purp.c +74 -35
- data/third_party/boringssl-with-bazel/src/include/openssl/aes.h +16 -4
- data/third_party/boringssl-with-bazel/src/include/openssl/asn1.h +22 -22
- data/third_party/boringssl-with-bazel/src/include/openssl/base.h +1 -1
- data/third_party/boringssl-with-bazel/src/include/openssl/evp.h +69 -0
- data/third_party/boringssl-with-bazel/src/include/openssl/ssl.h +33 -16
- data/third_party/boringssl-with-bazel/src/include/openssl/trust_token.h +1 -10
- data/third_party/boringssl-with-bazel/src/include/openssl/x509.h +789 -715
- data/third_party/boringssl-with-bazel/src/ssl/handoff.cc +3 -3
- data/third_party/boringssl-with-bazel/src/ssl/handshake.cc +9 -2
- data/third_party/boringssl-with-bazel/src/ssl/handshake_client.cc +2 -2
- data/third_party/boringssl-with-bazel/src/ssl/handshake_server.cc +9 -0
- data/third_party/boringssl-with-bazel/src/ssl/internal.h +17 -14
- data/third_party/boringssl-with-bazel/src/ssl/ssl_asn1.cc +7 -7
- data/third_party/boringssl-with-bazel/src/ssl/ssl_lib.cc +28 -0
- data/third_party/boringssl-with-bazel/src/ssl/ssl_session.cc +4 -24
- data/third_party/boringssl-with-bazel/src/ssl/ssl_versions.cc +5 -5
- data/third_party/boringssl-with-bazel/src/ssl/t1_enc.cc +45 -24
- data/third_party/boringssl-with-bazel/src/ssl/tls13_client.cc +31 -21
- data/third_party/boringssl-with-bazel/src/ssl/tls13_server.cc +12 -9
- data/third_party/re2/re2/bitmap256.h +117 -0
- data/third_party/re2/re2/bitstate.cc +385 -0
- data/third_party/re2/re2/compile.cc +1279 -0
- data/third_party/re2/re2/dfa.cc +2130 -0
- data/third_party/re2/re2/filtered_re2.cc +121 -0
- data/third_party/re2/re2/filtered_re2.h +109 -0
- data/third_party/re2/re2/mimics_pcre.cc +197 -0
- data/third_party/re2/re2/nfa.cc +713 -0
- data/third_party/re2/re2/onepass.cc +623 -0
- data/third_party/re2/re2/parse.cc +2464 -0
- data/third_party/re2/re2/perl_groups.cc +119 -0
- data/third_party/re2/re2/pod_array.h +55 -0
- data/third_party/re2/re2/prefilter.cc +710 -0
- data/third_party/re2/re2/prefilter.h +108 -0
- data/third_party/re2/re2/prefilter_tree.cc +407 -0
- data/third_party/re2/re2/prefilter_tree.h +139 -0
- data/third_party/re2/re2/prog.cc +988 -0
- data/third_party/re2/re2/prog.h +436 -0
- data/third_party/re2/re2/re2.cc +1362 -0
- data/third_party/re2/re2/re2.h +1002 -0
- data/third_party/re2/re2/regexp.cc +980 -0
- data/third_party/re2/re2/regexp.h +659 -0
- data/third_party/re2/re2/set.cc +154 -0
- data/third_party/re2/re2/set.h +80 -0
- data/third_party/re2/re2/simplify.cc +657 -0
- data/third_party/re2/re2/sparse_array.h +392 -0
- data/third_party/re2/re2/sparse_set.h +264 -0
- data/third_party/re2/re2/stringpiece.cc +65 -0
- data/third_party/re2/re2/stringpiece.h +210 -0
- data/third_party/re2/re2/tostring.cc +351 -0
- data/third_party/re2/re2/unicode_casefold.cc +582 -0
- data/third_party/re2/re2/unicode_casefold.h +78 -0
- data/third_party/re2/re2/unicode_groups.cc +6269 -0
- data/third_party/re2/re2/unicode_groups.h +67 -0
- data/third_party/re2/re2/walker-inl.h +246 -0
- data/third_party/re2/util/benchmark.h +156 -0
- data/third_party/re2/util/flags.h +26 -0
- data/third_party/re2/util/logging.h +109 -0
- data/third_party/re2/util/malloc_counter.h +19 -0
- data/third_party/re2/util/mix.h +41 -0
- data/third_party/re2/util/mutex.h +148 -0
- data/third_party/re2/util/pcre.cc +1025 -0
- data/third_party/re2/util/pcre.h +681 -0
- data/third_party/re2/util/rune.cc +260 -0
- data/third_party/re2/util/strutil.cc +149 -0
- data/third_party/re2/util/strutil.h +21 -0
- data/third_party/re2/util/test.h +50 -0
- data/third_party/re2/util/utf.h +44 -0
- data/third_party/re2/util/util.h +42 -0
- data/third_party/upb/upb/decode.c +467 -504
- data/third_party/upb/upb/encode.c +163 -121
- data/third_party/upb/upb/msg.c +130 -64
- data/third_party/upb/upb/msg.h +418 -14
- data/third_party/upb/upb/port_def.inc +35 -6
- data/third_party/upb/upb/port_undef.inc +8 -1
- data/third_party/upb/upb/table.c +53 -75
- data/third_party/upb/upb/table.int.h +11 -43
- data/third_party/upb/upb/upb.c +148 -124
- data/third_party/upb/upb/upb.h +65 -147
- data/third_party/upb/upb/upb.hpp +86 -0
- metadata +90 -30
- data/third_party/upb/upb/generated_util.h +0 -105
@@ -0,0 +1,623 @@
|
|
1
|
+
// Copyright 2008 The RE2 Authors. All Rights Reserved.
|
2
|
+
// Use of this source code is governed by a BSD-style
|
3
|
+
// license that can be found in the LICENSE file.
|
4
|
+
|
5
|
+
// Tested by search_test.cc.
|
6
|
+
//
|
7
|
+
// Prog::SearchOnePass is an efficient implementation of
|
8
|
+
// regular expression search with submatch tracking for
|
9
|
+
// what I call "one-pass regular expressions". (An alternate
|
10
|
+
// name might be "backtracking-free regular expressions".)
|
11
|
+
//
|
12
|
+
// One-pass regular expressions have the property that
|
13
|
+
// at each input byte during an anchored match, there may be
|
14
|
+
// multiple alternatives but only one can proceed for any
|
15
|
+
// given input byte.
|
16
|
+
//
|
17
|
+
// For example, the regexp /x*yx*/ is one-pass: you read
|
18
|
+
// x's until a y, then you read the y, then you keep reading x's.
|
19
|
+
// At no point do you have to guess what to do or back up
|
20
|
+
// and try a different guess.
|
21
|
+
//
|
22
|
+
// On the other hand, /x*x/ is not one-pass: when you're
|
23
|
+
// looking at an input "x", it's not clear whether you should
|
24
|
+
// use it to extend the x* or as the final x.
|
25
|
+
//
|
26
|
+
// More examples: /([^ ]*) (.*)/ is one-pass; /(.*) (.*)/ is not.
|
27
|
+
// /(\d+)-(\d+)/ is one-pass; /(\d+).(\d+)/ is not.
|
28
|
+
//
|
29
|
+
// A simple intuition for identifying one-pass regular expressions
|
30
|
+
// is that it's always immediately obvious when a repetition ends.
|
31
|
+
// It must also be immediately obvious which branch of an | to take:
|
32
|
+
//
|
33
|
+
// /x(y|z)/ is one-pass, but /(xy|xz)/ is not.
|
34
|
+
//
|
35
|
+
// The NFA-based search in nfa.cc does some bookkeeping to
|
36
|
+
// avoid the need for backtracking and its associated exponential blowup.
|
37
|
+
// But if we have a one-pass regular expression, there is no
|
38
|
+
// possibility of backtracking, so there is no need for the
|
39
|
+
// extra bookkeeping. Hence, this code.
|
40
|
+
//
|
41
|
+
// On a one-pass regular expression, the NFA code in nfa.cc
|
42
|
+
// runs at about 1/20 of the backtracking-based PCRE speed.
|
43
|
+
// In contrast, the code in this file runs at about the same
|
44
|
+
// speed as PCRE.
|
45
|
+
//
|
46
|
+
// One-pass regular expressions get used a lot when RE is
|
47
|
+
// used for parsing simple strings, so it pays off to
|
48
|
+
// notice them and handle them efficiently.
|
49
|
+
//
|
50
|
+
// See also Anne Brüggemann-Klein and Derick Wood,
|
51
|
+
// "One-unambiguous regular languages", Information and Computation 142(2).
|
52
|
+
|
53
|
+
#include <stdint.h>
|
54
|
+
#include <string.h>
|
55
|
+
#include <algorithm>
|
56
|
+
#include <map>
|
57
|
+
#include <string>
|
58
|
+
#include <vector>
|
59
|
+
|
60
|
+
#include "util/util.h"
|
61
|
+
#include "util/logging.h"
|
62
|
+
#include "util/strutil.h"
|
63
|
+
#include "util/utf.h"
|
64
|
+
#include "re2/pod_array.h"
|
65
|
+
#include "re2/prog.h"
|
66
|
+
#include "re2/sparse_set.h"
|
67
|
+
#include "re2/stringpiece.h"
|
68
|
+
|
69
|
+
// Silence "zero-sized array in struct/union" warning for OneState::action.
|
70
|
+
#ifdef _MSC_VER
|
71
|
+
#pragma warning(disable: 4200)
|
72
|
+
#endif
|
73
|
+
|
74
|
+
namespace re2 {
|
75
|
+
|
76
|
+
static const bool ExtraDebug = false;
|
77
|
+
|
78
|
+
// The key insight behind this implementation is that the
|
79
|
+
// non-determinism in an NFA for a one-pass regular expression
|
80
|
+
// is contained. To explain what that means, first a
|
81
|
+
// refresher about what regular expression programs look like
|
82
|
+
// and how the usual NFA execution runs.
|
83
|
+
//
|
84
|
+
// In a regular expression program, only the kInstByteRange
|
85
|
+
// instruction processes an input byte c and moves on to the
|
86
|
+
// next byte in the string (it does so if c is in the given range).
|
87
|
+
// The kInstByteRange instructions correspond to literal characters
|
88
|
+
// and character classes in the regular expression.
|
89
|
+
//
|
90
|
+
// The kInstAlt instructions are used as wiring to connect the
|
91
|
+
// kInstByteRange instructions together in interesting ways when
|
92
|
+
// implementing | + and *.
|
93
|
+
// The kInstAlt instruction forks execution, like a goto that
|
94
|
+
// jumps to ip->out() and ip->out1() in parallel. Each of the
|
95
|
+
// resulting computation paths is called a thread.
|
96
|
+
//
|
97
|
+
// The other instructions -- kInstEmptyWidth, kInstMatch, kInstCapture --
|
98
|
+
// are interesting in their own right but like kInstAlt they don't
|
99
|
+
// advance the input pointer. Only kInstByteRange does.
|
100
|
+
//
|
101
|
+
// The automaton execution in nfa.cc runs all the possible
|
102
|
+
// threads of execution in lock-step over the input. To process
|
103
|
+
// a particular byte, each thread gets run until it either dies
|
104
|
+
// or finds a kInstByteRange instruction matching the byte.
|
105
|
+
// If the latter happens, the thread stops just past the
|
106
|
+
// kInstByteRange instruction (at ip->out()) and waits for
|
107
|
+
// the other threads to finish processing the input byte.
|
108
|
+
// Then, once all the threads have processed that input byte,
|
109
|
+
// the whole process repeats. The kInstAlt state instruction
|
110
|
+
// might create new threads during input processing, but no
|
111
|
+
// matter what, all the threads stop after a kInstByteRange
|
112
|
+
// and wait for the other threads to "catch up".
|
113
|
+
// Running in lock step like this ensures that the NFA reads
|
114
|
+
// the input string only once.
|
115
|
+
//
|
116
|
+
// Each thread maintains its own set of capture registers
|
117
|
+
// (the string positions at which it executed the kInstCapture
|
118
|
+
// instructions corresponding to capturing parentheses in the
|
119
|
+
// regular expression). Repeated copying of the capture registers
|
120
|
+
// is the main performance bottleneck in the NFA implementation.
|
121
|
+
//
|
122
|
+
// A regular expression program is "one-pass" if, no matter what
|
123
|
+
// the input string, there is only one thread that makes it
|
124
|
+
// past a kInstByteRange instruction at each input byte. This means
|
125
|
+
// that there is in some sense only one active thread throughout
|
126
|
+
// the execution. Other threads might be created during the
|
127
|
+
// processing of an input byte, but they are ephemeral: only one
|
128
|
+
// thread is left to start processing the next input byte.
|
129
|
+
// This is what I meant above when I said the non-determinism
|
130
|
+
// was "contained".
|
131
|
+
//
|
132
|
+
// To execute a one-pass regular expression program, we can build
|
133
|
+
// a DFA (no non-determinism) that has at most as many states as
|
134
|
+
// the NFA (compare this to the possibly exponential number of states
|
135
|
+
// in the general case). Each state records, for each possible
|
136
|
+
// input byte, the next state along with the conditions required
|
137
|
+
// before entering that state -- empty-width flags that must be true
|
138
|
+
// and capture operations that must be performed. It also records
|
139
|
+
// whether a set of conditions required to finish a match at that
|
140
|
+
// point in the input rather than process the next byte.
|
141
|
+
|
142
|
+
// A state in the one-pass NFA - just an array of actions indexed
|
143
|
+
// by the bytemap_[] of the next input byte. (The bytemap
|
144
|
+
// maps next input bytes into equivalence classes, to reduce
|
145
|
+
// the memory footprint.)
|
146
|
+
struct OneState {
|
147
|
+
uint32_t matchcond; // conditions to match right now.
|
148
|
+
uint32_t action[];
|
149
|
+
};
|
150
|
+
|
151
|
+
// The uint32_t conditions in the action are a combination of
|
152
|
+
// condition and capture bits and the next state. The bottom 16 bits
|
153
|
+
// are the condition and capture bits, and the top 16 are the index of
|
154
|
+
// the next state.
|
155
|
+
//
|
156
|
+
// Bits 0-5 are the empty-width flags from prog.h.
|
157
|
+
// Bit 6 is kMatchWins, which means the match takes
|
158
|
+
// priority over moving to next in a first-match search.
|
159
|
+
// The remaining bits mark capture registers that should
|
160
|
+
// be set to the current input position. The capture bits
|
161
|
+
// start at index 2, since the search loop can take care of
|
162
|
+
// cap[0], cap[1] (the overall match position).
|
163
|
+
// That means we can handle up to 5 capturing parens: $1 through $4, plus $0.
|
164
|
+
// No input position can satisfy both kEmptyWordBoundary
|
165
|
+
// and kEmptyNonWordBoundary, so we can use that as a sentinel
|
166
|
+
// instead of needing an extra bit.
|
167
|
+
|
168
|
+
static const int kIndexShift = 16; // number of bits below index
|
169
|
+
static const int kEmptyShift = 6; // number of empty flags in prog.h
|
170
|
+
static const int kRealCapShift = kEmptyShift + 1;
|
171
|
+
static const int kRealMaxCap = (kIndexShift - kRealCapShift) / 2 * 2;
|
172
|
+
|
173
|
+
// Parameters used to skip over cap[0], cap[1].
|
174
|
+
static const int kCapShift = kRealCapShift - 2;
|
175
|
+
static const int kMaxCap = kRealMaxCap + 2;
|
176
|
+
|
177
|
+
static const uint32_t kMatchWins = 1 << kEmptyShift;
|
178
|
+
static const uint32_t kCapMask = ((1 << kRealMaxCap) - 1) << kRealCapShift;
|
179
|
+
|
180
|
+
static const uint32_t kImpossible = kEmptyWordBoundary | kEmptyNonWordBoundary;
|
181
|
+
|
182
|
+
// Check, at compile time, that prog.h agrees with math above.
|
183
|
+
// This function is never called.
|
184
|
+
void OnePass_Checks() {
|
185
|
+
static_assert((1<<kEmptyShift)-1 == kEmptyAllFlags,
|
186
|
+
"kEmptyShift disagrees with kEmptyAllFlags");
|
187
|
+
// kMaxCap counts pointers, kMaxOnePassCapture counts pairs.
|
188
|
+
static_assert(kMaxCap == Prog::kMaxOnePassCapture*2,
|
189
|
+
"kMaxCap disagrees with kMaxOnePassCapture");
|
190
|
+
}
|
191
|
+
|
192
|
+
static bool Satisfy(uint32_t cond, const StringPiece& context, const char* p) {
|
193
|
+
uint32_t satisfied = Prog::EmptyFlags(context, p);
|
194
|
+
if (cond & kEmptyAllFlags & ~satisfied)
|
195
|
+
return false;
|
196
|
+
return true;
|
197
|
+
}
|
198
|
+
|
199
|
+
// Apply the capture bits in cond, saving p to the appropriate
|
200
|
+
// locations in cap[].
|
201
|
+
static void ApplyCaptures(uint32_t cond, const char* p,
|
202
|
+
const char** cap, int ncap) {
|
203
|
+
for (int i = 2; i < ncap; i++)
|
204
|
+
if (cond & (1 << kCapShift << i))
|
205
|
+
cap[i] = p;
|
206
|
+
}
|
207
|
+
|
208
|
+
// Computes the OneState* for the given nodeindex.
|
209
|
+
static inline OneState* IndexToNode(uint8_t* nodes, int statesize,
|
210
|
+
int nodeindex) {
|
211
|
+
return reinterpret_cast<OneState*>(nodes + statesize*nodeindex);
|
212
|
+
}
|
213
|
+
|
214
|
+
bool Prog::SearchOnePass(const StringPiece& text,
|
215
|
+
const StringPiece& const_context,
|
216
|
+
Anchor anchor, MatchKind kind,
|
217
|
+
StringPiece* match, int nmatch) {
|
218
|
+
if (anchor != kAnchored && kind != kFullMatch) {
|
219
|
+
LOG(DFATAL) << "Cannot use SearchOnePass for unanchored matches.";
|
220
|
+
return false;
|
221
|
+
}
|
222
|
+
|
223
|
+
// Make sure we have at least cap[1],
|
224
|
+
// because we use it to tell if we matched.
|
225
|
+
int ncap = 2*nmatch;
|
226
|
+
if (ncap < 2)
|
227
|
+
ncap = 2;
|
228
|
+
|
229
|
+
const char* cap[kMaxCap];
|
230
|
+
for (int i = 0; i < ncap; i++)
|
231
|
+
cap[i] = NULL;
|
232
|
+
|
233
|
+
const char* matchcap[kMaxCap];
|
234
|
+
for (int i = 0; i < ncap; i++)
|
235
|
+
matchcap[i] = NULL;
|
236
|
+
|
237
|
+
StringPiece context = const_context;
|
238
|
+
if (context.data() == NULL)
|
239
|
+
context = text;
|
240
|
+
if (anchor_start() && context.begin() != text.begin())
|
241
|
+
return false;
|
242
|
+
if (anchor_end() && context.end() != text.end())
|
243
|
+
return false;
|
244
|
+
if (anchor_end())
|
245
|
+
kind = kFullMatch;
|
246
|
+
|
247
|
+
uint8_t* nodes = onepass_nodes_.data();
|
248
|
+
int statesize = sizeof(OneState) + bytemap_range()*sizeof(uint32_t);
|
249
|
+
// start() is always mapped to the zeroth OneState.
|
250
|
+
OneState* state = IndexToNode(nodes, statesize, 0);
|
251
|
+
uint8_t* bytemap = bytemap_;
|
252
|
+
const char* bp = text.data();
|
253
|
+
const char* ep = text.data() + text.size();
|
254
|
+
const char* p;
|
255
|
+
bool matched = false;
|
256
|
+
matchcap[0] = bp;
|
257
|
+
cap[0] = bp;
|
258
|
+
uint32_t nextmatchcond = state->matchcond;
|
259
|
+
for (p = bp; p < ep; p++) {
|
260
|
+
int c = bytemap[*p & 0xFF];
|
261
|
+
uint32_t matchcond = nextmatchcond;
|
262
|
+
uint32_t cond = state->action[c];
|
263
|
+
|
264
|
+
// Determine whether we can reach act->next.
|
265
|
+
// If so, advance state and nextmatchcond.
|
266
|
+
if ((cond & kEmptyAllFlags) == 0 || Satisfy(cond, context, p)) {
|
267
|
+
uint32_t nextindex = cond >> kIndexShift;
|
268
|
+
state = IndexToNode(nodes, statesize, nextindex);
|
269
|
+
nextmatchcond = state->matchcond;
|
270
|
+
} else {
|
271
|
+
state = NULL;
|
272
|
+
nextmatchcond = kImpossible;
|
273
|
+
}
|
274
|
+
|
275
|
+
// This code section is carefully tuned.
|
276
|
+
// The goto sequence is about 10% faster than the
|
277
|
+
// obvious rewrite as a large if statement in the
|
278
|
+
// ASCIIMatchRE2 and DotMatchRE2 benchmarks.
|
279
|
+
|
280
|
+
// Saving the match capture registers is expensive.
|
281
|
+
// Is this intermediate match worth thinking about?
|
282
|
+
|
283
|
+
// Not if we want a full match.
|
284
|
+
if (kind == kFullMatch)
|
285
|
+
goto skipmatch;
|
286
|
+
|
287
|
+
// Not if it's impossible.
|
288
|
+
if (matchcond == kImpossible)
|
289
|
+
goto skipmatch;
|
290
|
+
|
291
|
+
// Not if the possible match is beaten by the certain
|
292
|
+
// match at the next byte. When this test is useless
|
293
|
+
// (e.g., HTTPPartialMatchRE2) it slows the loop by
|
294
|
+
// about 10%, but when it avoids work (e.g., DotMatchRE2),
|
295
|
+
// it cuts the loop execution by about 45%.
|
296
|
+
if ((cond & kMatchWins) == 0 && (nextmatchcond & kEmptyAllFlags) == 0)
|
297
|
+
goto skipmatch;
|
298
|
+
|
299
|
+
// Finally, the match conditions must be satisfied.
|
300
|
+
if ((matchcond & kEmptyAllFlags) == 0 || Satisfy(matchcond, context, p)) {
|
301
|
+
for (int i = 2; i < 2*nmatch; i++)
|
302
|
+
matchcap[i] = cap[i];
|
303
|
+
if (nmatch > 1 && (matchcond & kCapMask))
|
304
|
+
ApplyCaptures(matchcond, p, matchcap, ncap);
|
305
|
+
matchcap[1] = p;
|
306
|
+
matched = true;
|
307
|
+
|
308
|
+
// If we're in longest match mode, we have to keep
|
309
|
+
// going and see if we find a longer match.
|
310
|
+
// In first match mode, we can stop if the match
|
311
|
+
// takes priority over the next state for this input byte.
|
312
|
+
// That bit is per-input byte and thus in cond, not matchcond.
|
313
|
+
if (kind == kFirstMatch && (cond & kMatchWins))
|
314
|
+
goto done;
|
315
|
+
}
|
316
|
+
|
317
|
+
skipmatch:
|
318
|
+
if (state == NULL)
|
319
|
+
goto done;
|
320
|
+
if ((cond & kCapMask) && nmatch > 1)
|
321
|
+
ApplyCaptures(cond, p, cap, ncap);
|
322
|
+
}
|
323
|
+
|
324
|
+
// Look for match at end of input.
|
325
|
+
{
|
326
|
+
uint32_t matchcond = state->matchcond;
|
327
|
+
if (matchcond != kImpossible &&
|
328
|
+
((matchcond & kEmptyAllFlags) == 0 || Satisfy(matchcond, context, p))) {
|
329
|
+
if (nmatch > 1 && (matchcond & kCapMask))
|
330
|
+
ApplyCaptures(matchcond, p, cap, ncap);
|
331
|
+
for (int i = 2; i < ncap; i++)
|
332
|
+
matchcap[i] = cap[i];
|
333
|
+
matchcap[1] = p;
|
334
|
+
matched = true;
|
335
|
+
}
|
336
|
+
}
|
337
|
+
|
338
|
+
done:
|
339
|
+
if (!matched)
|
340
|
+
return false;
|
341
|
+
for (int i = 0; i < nmatch; i++)
|
342
|
+
match[i] =
|
343
|
+
StringPiece(matchcap[2 * i],
|
344
|
+
static_cast<size_t>(matchcap[2 * i + 1] - matchcap[2 * i]));
|
345
|
+
return true;
|
346
|
+
}
|
347
|
+
|
348
|
+
|
349
|
+
// Analysis to determine whether a given regexp program is one-pass.
|
350
|
+
|
351
|
+
// If ip is not on workq, adds ip to work queue and returns true.
|
352
|
+
// If ip is already on work queue, does nothing and returns false.
|
353
|
+
// If ip is NULL, does nothing and returns true (pretends to add it).
|
354
|
+
typedef SparseSet Instq;
|
355
|
+
static bool AddQ(Instq *q, int id) {
|
356
|
+
if (id == 0)
|
357
|
+
return true;
|
358
|
+
if (q->contains(id))
|
359
|
+
return false;
|
360
|
+
q->insert(id);
|
361
|
+
return true;
|
362
|
+
}
|
363
|
+
|
364
|
+
struct InstCond {
|
365
|
+
int id;
|
366
|
+
uint32_t cond;
|
367
|
+
};
|
368
|
+
|
369
|
+
// Returns whether this is a one-pass program; that is,
|
370
|
+
// returns whether it is safe to use SearchOnePass on this program.
|
371
|
+
// These conditions must be true for any instruction ip:
|
372
|
+
//
|
373
|
+
// (1) for any other Inst nip, there is at most one input-free
|
374
|
+
// path from ip to nip.
|
375
|
+
// (2) there is at most one kInstByte instruction reachable from
|
376
|
+
// ip that matches any particular byte c.
|
377
|
+
// (3) there is at most one input-free path from ip to a kInstMatch
|
378
|
+
// instruction.
|
379
|
+
//
|
380
|
+
// This is actually just a conservative approximation: it might
|
381
|
+
// return false when the answer is true, when kInstEmptyWidth
|
382
|
+
// instructions are involved.
|
383
|
+
// Constructs and saves corresponding one-pass NFA on success.
|
384
|
+
bool Prog::IsOnePass() {
|
385
|
+
if (did_onepass_)
|
386
|
+
return onepass_nodes_.data() != NULL;
|
387
|
+
did_onepass_ = true;
|
388
|
+
|
389
|
+
if (start() == 0) // no match
|
390
|
+
return false;
|
391
|
+
|
392
|
+
// Steal memory for the one-pass NFA from the overall DFA budget.
|
393
|
+
// Willing to use at most 1/4 of the DFA budget (heuristic).
|
394
|
+
// Limit max node count to 65000 as a conservative estimate to
|
395
|
+
// avoid overflowing 16-bit node index in encoding.
|
396
|
+
int maxnodes = 2 + inst_count(kInstByteRange);
|
397
|
+
int statesize = sizeof(OneState) + bytemap_range()*sizeof(uint32_t);
|
398
|
+
if (maxnodes >= 65000 || dfa_mem_ / 4 / statesize < maxnodes)
|
399
|
+
return false;
|
400
|
+
|
401
|
+
// Flood the graph starting at the start state, and check
|
402
|
+
// that in each reachable state, each possible byte leads
|
403
|
+
// to a unique next state.
|
404
|
+
int stacksize = inst_count(kInstCapture) +
|
405
|
+
inst_count(kInstEmptyWidth) +
|
406
|
+
inst_count(kInstNop) + 1; // + 1 for start inst
|
407
|
+
PODArray<InstCond> stack(stacksize);
|
408
|
+
|
409
|
+
int size = this->size();
|
410
|
+
PODArray<int> nodebyid(size); // indexed by ip
|
411
|
+
memset(nodebyid.data(), 0xFF, size*sizeof nodebyid[0]);
|
412
|
+
|
413
|
+
// Originally, nodes was a uint8_t[maxnodes*statesize], but that was
|
414
|
+
// unnecessarily optimistic: why allocate a large amount of memory
|
415
|
+
// upfront for a large program when it is unlikely to be one-pass?
|
416
|
+
std::vector<uint8_t> nodes;
|
417
|
+
|
418
|
+
Instq tovisit(size), workq(size);
|
419
|
+
AddQ(&tovisit, start());
|
420
|
+
nodebyid[start()] = 0;
|
421
|
+
int nalloc = 1;
|
422
|
+
nodes.insert(nodes.end(), statesize, 0);
|
423
|
+
for (Instq::iterator it = tovisit.begin(); it != tovisit.end(); ++it) {
|
424
|
+
int id = *it;
|
425
|
+
int nodeindex = nodebyid[id];
|
426
|
+
OneState* node = IndexToNode(nodes.data(), statesize, nodeindex);
|
427
|
+
|
428
|
+
// Flood graph using manual stack, filling in actions as found.
|
429
|
+
// Default is none.
|
430
|
+
for (int b = 0; b < bytemap_range_; b++)
|
431
|
+
node->action[b] = kImpossible;
|
432
|
+
node->matchcond = kImpossible;
|
433
|
+
|
434
|
+
workq.clear();
|
435
|
+
bool matched = false;
|
436
|
+
int nstack = 0;
|
437
|
+
stack[nstack].id = id;
|
438
|
+
stack[nstack++].cond = 0;
|
439
|
+
while (nstack > 0) {
|
440
|
+
int id = stack[--nstack].id;
|
441
|
+
uint32_t cond = stack[nstack].cond;
|
442
|
+
|
443
|
+
Loop:
|
444
|
+
Prog::Inst* ip = inst(id);
|
445
|
+
switch (ip->opcode()) {
|
446
|
+
default:
|
447
|
+
LOG(DFATAL) << "unhandled opcode: " << ip->opcode();
|
448
|
+
break;
|
449
|
+
|
450
|
+
case kInstAltMatch:
|
451
|
+
// TODO(rsc): Ignoring kInstAltMatch optimization.
|
452
|
+
// Should implement it in this engine, but it's subtle.
|
453
|
+
DCHECK(!ip->last());
|
454
|
+
// If already on work queue, (1) is violated: bail out.
|
455
|
+
if (!AddQ(&workq, id+1))
|
456
|
+
goto fail;
|
457
|
+
id = id+1;
|
458
|
+
goto Loop;
|
459
|
+
|
460
|
+
case kInstByteRange: {
|
461
|
+
int nextindex = nodebyid[ip->out()];
|
462
|
+
if (nextindex == -1) {
|
463
|
+
if (nalloc >= maxnodes) {
|
464
|
+
if (ExtraDebug)
|
465
|
+
LOG(ERROR) << StringPrintf(
|
466
|
+
"Not OnePass: hit node limit %d >= %d", nalloc, maxnodes);
|
467
|
+
goto fail;
|
468
|
+
}
|
469
|
+
nextindex = nalloc;
|
470
|
+
AddQ(&tovisit, ip->out());
|
471
|
+
nodebyid[ip->out()] = nalloc;
|
472
|
+
nalloc++;
|
473
|
+
nodes.insert(nodes.end(), statesize, 0);
|
474
|
+
// Update node because it might have been invalidated.
|
475
|
+
node = IndexToNode(nodes.data(), statesize, nodeindex);
|
476
|
+
}
|
477
|
+
for (int c = ip->lo(); c <= ip->hi(); c++) {
|
478
|
+
int b = bytemap_[c];
|
479
|
+
// Skip any bytes immediately after c that are also in b.
|
480
|
+
while (c < 256-1 && bytemap_[c+1] == b)
|
481
|
+
c++;
|
482
|
+
uint32_t act = node->action[b];
|
483
|
+
uint32_t newact = (nextindex << kIndexShift) | cond;
|
484
|
+
if (matched)
|
485
|
+
newact |= kMatchWins;
|
486
|
+
if ((act & kImpossible) == kImpossible) {
|
487
|
+
node->action[b] = newact;
|
488
|
+
} else if (act != newact) {
|
489
|
+
if (ExtraDebug)
|
490
|
+
LOG(ERROR) << StringPrintf(
|
491
|
+
"Not OnePass: conflict on byte %#x at state %d", c, *it);
|
492
|
+
goto fail;
|
493
|
+
}
|
494
|
+
}
|
495
|
+
if (ip->foldcase()) {
|
496
|
+
Rune lo = std::max<Rune>(ip->lo(), 'a') + 'A' - 'a';
|
497
|
+
Rune hi = std::min<Rune>(ip->hi(), 'z') + 'A' - 'a';
|
498
|
+
for (int c = lo; c <= hi; c++) {
|
499
|
+
int b = bytemap_[c];
|
500
|
+
// Skip any bytes immediately after c that are also in b.
|
501
|
+
while (c < 256-1 && bytemap_[c+1] == b)
|
502
|
+
c++;
|
503
|
+
uint32_t act = node->action[b];
|
504
|
+
uint32_t newact = (nextindex << kIndexShift) | cond;
|
505
|
+
if (matched)
|
506
|
+
newact |= kMatchWins;
|
507
|
+
if ((act & kImpossible) == kImpossible) {
|
508
|
+
node->action[b] = newact;
|
509
|
+
} else if (act != newact) {
|
510
|
+
if (ExtraDebug)
|
511
|
+
LOG(ERROR) << StringPrintf(
|
512
|
+
"Not OnePass: conflict on byte %#x at state %d", c, *it);
|
513
|
+
goto fail;
|
514
|
+
}
|
515
|
+
}
|
516
|
+
}
|
517
|
+
|
518
|
+
if (ip->last())
|
519
|
+
break;
|
520
|
+
// If already on work queue, (1) is violated: bail out.
|
521
|
+
if (!AddQ(&workq, id+1))
|
522
|
+
goto fail;
|
523
|
+
id = id+1;
|
524
|
+
goto Loop;
|
525
|
+
}
|
526
|
+
|
527
|
+
case kInstCapture:
|
528
|
+
case kInstEmptyWidth:
|
529
|
+
case kInstNop:
|
530
|
+
if (!ip->last()) {
|
531
|
+
// If already on work queue, (1) is violated: bail out.
|
532
|
+
if (!AddQ(&workq, id+1))
|
533
|
+
goto fail;
|
534
|
+
stack[nstack].id = id+1;
|
535
|
+
stack[nstack++].cond = cond;
|
536
|
+
}
|
537
|
+
|
538
|
+
if (ip->opcode() == kInstCapture && ip->cap() < kMaxCap)
|
539
|
+
cond |= (1 << kCapShift) << ip->cap();
|
540
|
+
if (ip->opcode() == kInstEmptyWidth)
|
541
|
+
cond |= ip->empty();
|
542
|
+
|
543
|
+
// kInstCapture and kInstNop always proceed to ip->out().
|
544
|
+
// kInstEmptyWidth only sometimes proceeds to ip->out(),
|
545
|
+
// but as a conservative approximation we assume it always does.
|
546
|
+
// We could be a little more precise by looking at what c
|
547
|
+
// is, but that seems like overkill.
|
548
|
+
|
549
|
+
// If already on work queue, (1) is violated: bail out.
|
550
|
+
if (!AddQ(&workq, ip->out())) {
|
551
|
+
if (ExtraDebug)
|
552
|
+
LOG(ERROR) << StringPrintf(
|
553
|
+
"Not OnePass: multiple paths %d -> %d", *it, ip->out());
|
554
|
+
goto fail;
|
555
|
+
}
|
556
|
+
id = ip->out();
|
557
|
+
goto Loop;
|
558
|
+
|
559
|
+
case kInstMatch:
|
560
|
+
if (matched) {
|
561
|
+
// (3) is violated
|
562
|
+
if (ExtraDebug)
|
563
|
+
LOG(ERROR) << StringPrintf(
|
564
|
+
"Not OnePass: multiple matches from %d", *it);
|
565
|
+
goto fail;
|
566
|
+
}
|
567
|
+
matched = true;
|
568
|
+
node->matchcond = cond;
|
569
|
+
|
570
|
+
if (ip->last())
|
571
|
+
break;
|
572
|
+
// If already on work queue, (1) is violated: bail out.
|
573
|
+
if (!AddQ(&workq, id+1))
|
574
|
+
goto fail;
|
575
|
+
id = id+1;
|
576
|
+
goto Loop;
|
577
|
+
|
578
|
+
case kInstFail:
|
579
|
+
break;
|
580
|
+
}
|
581
|
+
}
|
582
|
+
}
|
583
|
+
|
584
|
+
if (ExtraDebug) { // For debugging, dump one-pass NFA to LOG(ERROR).
|
585
|
+
LOG(ERROR) << "bytemap:\n" << DumpByteMap();
|
586
|
+
LOG(ERROR) << "prog:\n" << Dump();
|
587
|
+
|
588
|
+
std::map<int, int> idmap;
|
589
|
+
for (int i = 0; i < size; i++)
|
590
|
+
if (nodebyid[i] != -1)
|
591
|
+
idmap[nodebyid[i]] = i;
|
592
|
+
|
593
|
+
std::string dump;
|
594
|
+
for (Instq::iterator it = tovisit.begin(); it != tovisit.end(); ++it) {
|
595
|
+
int id = *it;
|
596
|
+
int nodeindex = nodebyid[id];
|
597
|
+
if (nodeindex == -1)
|
598
|
+
continue;
|
599
|
+
OneState* node = IndexToNode(nodes.data(), statesize, nodeindex);
|
600
|
+
dump += StringPrintf("node %d id=%d: matchcond=%#x\n",
|
601
|
+
nodeindex, id, node->matchcond);
|
602
|
+
for (int i = 0; i < bytemap_range_; i++) {
|
603
|
+
if ((node->action[i] & kImpossible) == kImpossible)
|
604
|
+
continue;
|
605
|
+
dump += StringPrintf(" %d cond %#x -> %d id=%d\n",
|
606
|
+
i, node->action[i] & 0xFFFF,
|
607
|
+
node->action[i] >> kIndexShift,
|
608
|
+
idmap[node->action[i] >> kIndexShift]);
|
609
|
+
}
|
610
|
+
}
|
611
|
+
LOG(ERROR) << "nodes:\n" << dump;
|
612
|
+
}
|
613
|
+
|
614
|
+
dfa_mem_ -= nalloc*statesize;
|
615
|
+
onepass_nodes_ = PODArray<uint8_t>(nalloc*statesize);
|
616
|
+
memmove(onepass_nodes_.data(), nodes.data(), nalloc*statesize);
|
617
|
+
return true;
|
618
|
+
|
619
|
+
fail:
|
620
|
+
return false;
|
621
|
+
}
|
622
|
+
|
623
|
+
} // namespace re2
|