[reorg] move avl to util

pull/36792/head
Mark D. Roth 10 months ago
parent d09edb126f
commit c9c4dc196c
  1. 2
      Package.swift
  2. 14
      build_autogenerated.yaml
  3. 4
      gRPC-C++.podspec
  4. 4
      gRPC-Core.podspec
  5. 2
      grpc.gemspec
  6. 2
      package.xml
  7. 2
      src/core/BUILD
  8. 2
      src/core/lib/channel/channel_args.h
  9. 10
      src/core/util/avl.h
  10. 2
      test/core/avl/avl_fuzzer.cc
  11. 2
      test/core/avl/avl_test.cc
  12. 2
      tools/doxygen/Doxyfile.c++.internal
  13. 2
      tools/doxygen/Doxyfile.core.internal

2
Package.swift generated

@ -1090,7 +1090,6 @@ let package = Package(
"src/core/lib/address_utils/parse_address.h",
"src/core/lib/address_utils/sockaddr_utils.cc",
"src/core/lib/address_utils/sockaddr_utils.h",
"src/core/lib/avl/avl.h",
"src/core/lib/backoff/backoff.cc",
"src/core/lib/backoff/backoff.h",
"src/core/lib/backoff/random_early_detection.cc",
@ -1916,6 +1915,7 @@ let package = Package(
"src/core/util/alloc.h",
"src/core/util/android/log.cc",
"src/core/util/atm.cc",
"src/core/util/avl.h",
"src/core/util/http_client/format_request.cc",
"src/core/util/http_client/format_request.h",
"src/core/util/http_client/httpcli.cc",

@ -793,7 +793,6 @@ libs:
- src/core/handshaker/tcp_connect/tcp_connect_handshaker.h
- src/core/lib/address_utils/parse_address.h
- src/core/lib/address_utils/sockaddr_utils.h
- src/core/lib/avl/avl.h
- src/core/lib/backoff/backoff.h
- src/core/lib/backoff/random_early_detection.h
- src/core/lib/channel/call_finalization.h
@ -1206,6 +1205,7 @@ libs:
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
- src/core/tsi/transport_security_interface.h
- src/core/util/avl.h
- src/core/util/http_client/format_request.h
- src/core/util/http_client/httpcli.h
- src/core/util/http_client/httpcli_ssl_credentials.h
@ -2338,7 +2338,6 @@ libs:
- src/core/handshaker/tcp_connect/tcp_connect_handshaker.h
- src/core/lib/address_utils/parse_address.h
- src/core/lib/address_utils/sockaddr_utils.h
- src/core/lib/avl/avl.h
- src/core/lib/backoff/backoff.h
- src/core/lib/backoff/random_early_detection.h
- src/core/lib/channel/call_finalization.h
@ -2685,6 +2684,7 @@ libs:
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
- src/core/tsi/transport_security_interface.h
- src/core/util/avl.h
- src/core/util/http_client/format_request.h
- src/core/util/http_client/httpcli.h
- src/core/util/http_client/parser.h
@ -4434,7 +4434,6 @@ libs:
- src/core/handshaker/security/tsi_error.h
- src/core/lib/address_utils/parse_address.h
- src/core/lib/address_utils/sockaddr_utils.h
- src/core/lib/avl/avl.h
- src/core/lib/backoff/backoff.h
- src/core/lib/channel/call_finalization.h
- src/core/lib/channel/channel_args.h
@ -4742,6 +4741,7 @@ libs:
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_grpc.h
- src/core/tsi/transport_security_interface.h
- src/core/util/avl.h
- src/core/util/json/json.h
- src/core/util/json/json_args.h
- src/core/util/json/json_reader.h
@ -5751,11 +5751,11 @@ targets:
build: test
language: c++
headers:
- src/core/lib/avl/avl.h
- src/core/lib/gprpp/atomic_utils.h
- src/core/lib/gprpp/down_cast.h
- src/core/lib/gprpp/ref_counted.h
- src/core/lib/gprpp/ref_counted_ptr.h
- src/core/util/avl.h
src:
- test/core/avl/avl_test.cc
deps:
@ -6383,7 +6383,6 @@ targets:
- src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
- src/core/ext/upb-gen/google/rpc/status.upb.h
- src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
- src/core/lib/avl/avl.h
- src/core/lib/channel/channel_args.h
- src/core/lib/compression/compression_internal.h
- src/core/lib/debug/trace.h
@ -6460,6 +6459,7 @@ targets:
- src/core/lib/transport/simple_slice_based_metadata.h
- src/core/lib/transport/status_conversion.h
- src/core/lib/transport/timeout_encoding.h
- src/core/util/avl.h
- src/core/util/spinlock.h
- test/core/promise/poll_matcher.h
- third_party/upb/upb/generated_code_support.h
@ -8988,7 +8988,6 @@ targets:
build: test
language: c++
headers:
- src/core/lib/avl/avl.h
- src/core/lib/channel/channel_args.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/gprpp/atomic_utils.h
@ -9000,6 +8999,7 @@ targets:
- src/core/lib/gprpp/ref_counted_string.h
- src/core/lib/gprpp/time.h
- src/core/lib/surface/channel_stack_type.h
- src/core/util/avl.h
src:
- src/core/lib/channel/channel_args.cc
- src/core/lib/event_engine/channel_args_endpoint_config.cc
@ -11636,7 +11636,6 @@ targets:
- src/core/handshaker/proxy_mapper_registry.h
- src/core/lib/address_utils/parse_address.h
- src/core/lib/address_utils/sockaddr_utils.h
- src/core/lib/avl/avl.h
- src/core/lib/backoff/backoff.h
- src/core/lib/channel/call_finalization.h
- src/core/lib/channel/channel_args.h
@ -11918,6 +11917,7 @@ targets:
- src/core/telemetry/stats_data.h
- src/core/telemetry/tcp_tracer.h
- src/core/tsi/alts/handshaker/transport_security_common_api.h
- src/core/util/avl.h
- src/core/util/json/json.h
- src/core/util/json/json_args.h
- src/core/util/json/json_writer.h

4
gRPC-C++.podspec generated

@ -872,7 +872,6 @@ Pod::Spec.new do |s|
'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h',
'src/core/lib/address_utils/parse_address.h',
'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.h',
'src/core/lib/backoff/random_early_detection.h',
'src/core/lib/channel/call_finalization.h',
@ -1305,6 +1304,7 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
'src/core/util/alloc.h',
'src/core/util/avl.h',
'src/core/util/http_client/format_request.h',
'src/core/util/http_client/httpcli.h',
'src/core/util/http_client/httpcli_ssl_credentials.h',
@ -2147,7 +2147,6 @@ Pod::Spec.new do |s|
'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h',
'src/core/lib/address_utils/parse_address.h',
'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.h',
'src/core/lib/backoff/random_early_detection.h',
'src/core/lib/channel/call_finalization.h',
@ -2580,6 +2579,7 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
'src/core/util/alloc.h',
'src/core/util/avl.h',
'src/core/util/http_client/format_request.h',
'src/core/util/http_client/httpcli.h',
'src/core/util/http_client/httpcli_ssl_credentials.h',

4
gRPC-Core.podspec generated

@ -1209,7 +1209,6 @@ Pod::Spec.new do |s|
'src/core/lib/address_utils/parse_address.h',
'src/core/lib/address_utils/sockaddr_utils.cc',
'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.cc',
'src/core/lib/backoff/backoff.h',
'src/core/lib/backoff/random_early_detection.cc',
@ -2031,6 +2030,7 @@ Pod::Spec.new do |s|
'src/core/util/alloc.h',
'src/core/util/android/log.cc',
'src/core/util/atm.cc',
'src/core/util/avl.h',
'src/core/util/http_client/format_request.cc',
'src/core/util/http_client/format_request.h',
'src/core/util/http_client/httpcli.cc',
@ -2930,7 +2930,6 @@ Pod::Spec.new do |s|
'src/core/handshaker/tcp_connect/tcp_connect_handshaker.h',
'src/core/lib/address_utils/parse_address.h',
'src/core/lib/address_utils/sockaddr_utils.h',
'src/core/lib/avl/avl.h',
'src/core/lib/backoff/backoff.h',
'src/core/lib/backoff/random_early_detection.h',
'src/core/lib/channel/call_finalization.h',
@ -3363,6 +3362,7 @@ Pod::Spec.new do |s|
'src/core/tsi/transport_security_grpc.h',
'src/core/tsi/transport_security_interface.h',
'src/core/util/alloc.h',
'src/core/util/avl.h',
'src/core/util/http_client/format_request.h',
'src/core/util/http_client/httpcli.h',
'src/core/util/http_client/httpcli_ssl_credentials.h',

2
grpc.gemspec generated

@ -1096,7 +1096,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/address_utils/parse_address.h )
s.files += %w( src/core/lib/address_utils/sockaddr_utils.cc )
s.files += %w( src/core/lib/address_utils/sockaddr_utils.h )
s.files += %w( src/core/lib/avl/avl.h )
s.files += %w( src/core/lib/backoff/backoff.cc )
s.files += %w( src/core/lib/backoff/backoff.h )
s.files += %w( src/core/lib/backoff/random_early_detection.cc )
@ -1918,6 +1917,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/util/alloc.h )
s.files += %w( src/core/util/android/log.cc )
s.files += %w( src/core/util/atm.cc )
s.files += %w( src/core/util/avl.h )
s.files += %w( src/core/util/http_client/format_request.cc )
s.files += %w( src/core/util/http_client/format_request.h )
s.files += %w( src/core/util/http_client/httpcli.cc )

2
package.xml generated

@ -1078,7 +1078,6 @@
<file baseinstalldir="/" name="src/core/lib/address_utils/parse_address.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/address_utils/sockaddr_utils.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/address_utils/sockaddr_utils.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/avl/avl.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/backoff/backoff.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/backoff/backoff.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/backoff/random_early_detection.cc" role="src" />
@ -1900,6 +1899,7 @@
<file baseinstalldir="/" name="src/core/util/alloc.h" role="src" />
<file baseinstalldir="/" name="src/core/util/android/log.cc" role="src" />
<file baseinstalldir="/" name="src/core/util/atm.cc" role="src" />
<file baseinstalldir="/" name="src/core/util/avl.h" role="src" />
<file baseinstalldir="/" name="src/core/util/http_client/format_request.cc" role="src" />
<file baseinstalldir="/" name="src/core/util/http_client/format_request.h" role="src" />
<file baseinstalldir="/" name="src/core/util/http_client/httpcli.cc" role="src" />

@ -1754,7 +1754,7 @@ grpc_cc_library(
grpc_cc_library(
name = "avl",
hdrs = [
"lib/avl/avl.h",
"util/avl.h",
],
deps = [
"ref_counted",

@ -37,7 +37,6 @@
#include <grpc/grpc.h>
#include <grpc/support/port_platform.h>
#include "src/core/lib/avl/avl.h"
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/lib/gprpp/dual_ref_counted.h"
#include "src/core/lib/gprpp/ref_counted.h"
@ -45,6 +44,7 @@
#include "src/core/lib/gprpp/ref_counted_string.h"
#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/surface/channel_stack_type.h"
#include "src/core/util/avl.h"
#include "src/core/util/useful.h"
// TODO(hork): When we're ready to allow setting via a channel arg from the

@ -12,8 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef GRPC_SRC_CORE_LIB_AVL_AVL_H
#define GRPC_SRC_CORE_LIB_AVL_AVL_H
#ifndef GRPC_SRC_CORE_UTIL_AVL_H
#define GRPC_SRC_CORE_UTIL_AVL_H
#include <grpc/support/port_platform.h>
#include <stdlib.h>
@ -21,8 +23,6 @@
#include <iterator>
#include <utility>
#include <grpc/support/port_platform.h>
#include "src/core/lib/gprpp/ref_counted.h"
#include "src/core/lib/gprpp/ref_counted_ptr.h"
#include "src/core/util/useful.h"
@ -322,4 +322,4 @@ class AVL {
} // namespace grpc_core
#endif // GRPC_SRC_CORE_LIB_AVL_AVL_H
#endif // GRPC_SRC_CORE_UTIL_AVL_H

@ -19,7 +19,7 @@
#include <map>
#include <utility>
#include "src/core/lib/avl/avl.h"
#include "src/core/util/avl.h"
#include "src/libfuzzer/libfuzzer_macro.h"
#include "test/core/avl/avl_fuzzer.pb.h"

@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#include "src/core/lib/avl/avl.h"
#include "src/core/util/avl.h"
#include <memory>

@ -2095,7 +2095,6 @@ src/core/lib/address_utils/parse_address.cc \
src/core/lib/address_utils/parse_address.h \
src/core/lib/address_utils/sockaddr_utils.cc \
src/core/lib/address_utils/sockaddr_utils.h \
src/core/lib/avl/avl.h \
src/core/lib/backoff/backoff.cc \
src/core/lib/backoff/backoff.h \
src/core/lib/backoff/random_early_detection.cc \
@ -2917,6 +2916,7 @@ src/core/util/alloc.cc \
src/core/util/alloc.h \
src/core/util/android/log.cc \
src/core/util/atm.cc \
src/core/util/avl.h \
src/core/util/http_client/format_request.cc \
src/core/util/http_client/format_request.h \
src/core/util/http_client/httpcli.cc \

@ -1866,7 +1866,6 @@ src/core/lib/address_utils/parse_address.cc \
src/core/lib/address_utils/parse_address.h \
src/core/lib/address_utils/sockaddr_utils.cc \
src/core/lib/address_utils/sockaddr_utils.h \
src/core/lib/avl/avl.h \
src/core/lib/backoff/backoff.cc \
src/core/lib/backoff/backoff.h \
src/core/lib/backoff/random_early_detection.cc \
@ -2699,6 +2698,7 @@ src/core/util/alloc.cc \
src/core/util/alloc.h \
src/core/util/android/log.cc \
src/core/util/atm.cc \
src/core/util/avl.h \
src/core/util/http_client/format_request.cc \
src/core/util/http_client/format_request.h \
src/core/util/http_client/httpcli.cc \

Loading…
Cancel
Save