Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[build] Reland grpc_base autodeps (#30235)

Browse Source 
* Revert "[build] Automate deps for grpc_base (#29995)"

This reverts commit 5956fb8829.

* fix merge

* Revert "fix merge"

This reverts commit 75d73ca362.

* Revert "Revert "[build] Automate deps for grpc_base (#29995)""

This reverts commit c3bec79a21.

* [build] Reland grpc_base autodeps

* add note

* Automated change: Fix sanity tests

* fix

* Automated change: Fix sanity tests

Co-authored-by: ctiller <ctiller@users.noreply.github.com>
pull/30286/head
Craig Tiller 2 years ago committed by GitHub
parent 4491ed26aa
commit caf0a49e67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 68 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      BUILD
  2. 2
      build_autogenerated.yaml
  3. 2
      gRPC-C++.podspec
  4. 2
      gRPC-Core.podspec
  5. 1
      grpc.gemspec
  6. 1
      package.xml
  7. 2
      src/core/lib/event_engine/default_event_engine_factory.cc
  8. 33
      src/core/lib/event_engine/default_event_engine_factory.h
  9. 1
      src/core/lib/event_engine/event_engine.cc
  10. 6
      src/core/lib/event_engine/event_engine_factory.h
  11. 1
      tools/doxygen/Doxyfile.c++.internal
  12. 1
      tools/doxygen/Doxyfile.core.internal

43
BUILD
Unescape View File

@ -2279,21 +2279,6 @@ grpc_cc_library(
],
)
grpc_cc_library(
name = "default_event_engine_factory",
srcs = [
"src/core/lib/event_engine/default_event_engine_factory.cc",
],
external_deps = ["absl/memory"],
deps = [
"default_event_engine_factory_hdrs",
"event_engine_base_hdrs",
"gpr_base",
"iomgr_event_engine",
"iomgr_port",
],
)
grpc_cc_library(
name = "iomgr_ee_time_averaged_stats",
srcs = ["src/core/lib/event_engine/iomgr_engine/time_averaged_stats.cc"],
@ -2426,22 +2411,38 @@ grpc_cc_library(
],
)
# NOTE: this target gets replaced inside Google's build system to be one that
# integrates with other internal systems better. Please do not rename or fold
# this into other targets.
grpc_cc_library(
name = "default_event_engine_factory",
srcs = ["src/core/lib/event_engine/default_event_engine_factory.cc"],
hdrs = [
"src/core/lib/event_engine/default_event_engine_factory.h",
],
external_deps = ["absl/memory"],
tags = ["grpc-autodeps"],
deps = [
"event_engine_base_hdrs",
"gpr_platform",
"iomgr_event_engine",
],
)
grpc_cc_library(
name = "event_engine_base",
srcs = [
"src/core/lib/event_engine/event_engine.cc",
],
external_deps = [
"absl/functional:any_invocable",
"absl/memory",
hdrs = [
"src/core/lib/event_engine/event_engine_factory.h",
],
external_deps = ["absl/functional:any_invocable"],
tags = ["grpc-autodeps"],
deps = [
"default_event_engine_factory",
"default_event_engine_factory_hdrs",
"event_engine_base_hdrs",
"event_engine_trace",
"gpr_base",
"grpc_trace",
],
)

2
build_autogenerated.yaml generated
Unescape View File

@ -745,6 +745,7 @@ libs:
- src/core/lib/debug/stats_data.h
- src/core/lib/debug/trace.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/event_engine/default_event_engine_factory.h
- src/core/lib/event_engine/event_engine_factory.h
- src/core/lib/event_engine/handle_containers.h
- src/core/lib/event_engine/iomgr_engine/iomgr_engine.h
@ -1961,6 +1962,7 @@ libs:
- src/core/lib/debug/stats_data.h
- src/core/lib/debug/trace.h
- src/core/lib/event_engine/channel_args_endpoint_config.h
- src/core/lib/event_engine/default_event_engine_factory.h
- src/core/lib/event_engine/event_engine_factory.h
- src/core/lib/event_engine/handle_containers.h
- src/core/lib/event_engine/iomgr_engine/iomgr_engine.h

2
gRPC-C++.podspec generated
Unescape View File

@ -678,6 +678,7 @@ Pod::Spec.new do |s|
'src/core/lib/debug/stats_data.h',
'src/core/lib/debug/trace.h',
'src/core/lib/event_engine/channel_args_endpoint_config.h',
'src/core/lib/event_engine/default_event_engine_factory.h',
'src/core/lib/event_engine/event_engine_factory.h',
'src/core/lib/event_engine/handle_containers.h',
'src/core/lib/event_engine/iomgr_engine/iomgr_engine.h',
@ -1516,6 +1517,7 @@ Pod::Spec.new do |s|
'src/core/lib/debug/stats_data.h',
'src/core/lib/debug/trace.h',
'src/core/lib/event_engine/channel_args_endpoint_config.h',
'src/core/lib/event_engine/default_event_engine_factory.h',
'src/core/lib/event_engine/event_engine_factory.h',
'src/core/lib/event_engine/handle_containers.h',
'src/core/lib/event_engine/iomgr_engine/iomgr_engine.h',

2
gRPC-Core.podspec generated
Unescape View File

@ -1042,6 +1042,7 @@ Pod::Spec.new do |s|
'src/core/lib/event_engine/channel_args_endpoint_config.cc',
'src/core/lib/event_engine/channel_args_endpoint_config.h',
'src/core/lib/event_engine/default_event_engine_factory.cc',
'src/core/lib/event_engine/default_event_engine_factory.h',
'src/core/lib/event_engine/event_engine.cc',
'src/core/lib/event_engine/event_engine_factory.h',
'src/core/lib/event_engine/handle_containers.h',
@ -2126,6 +2127,7 @@ Pod::Spec.new do |s|
'src/core/lib/debug/stats_data.h',
'src/core/lib/debug/trace.h',
'src/core/lib/event_engine/channel_args_endpoint_config.h',
'src/core/lib/event_engine/default_event_engine_factory.h',
'src/core/lib/event_engine/event_engine_factory.h',
'src/core/lib/event_engine/handle_containers.h',
'src/core/lib/event_engine/iomgr_engine/iomgr_engine.h',

1
grpc.gemspec generated
Unescape View File

@ -955,6 +955,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/event_engine/channel_args_endpoint_config.cc )
s.files += %w( src/core/lib/event_engine/channel_args_endpoint_config.h )
s.files += %w( src/core/lib/event_engine/default_event_engine_factory.cc )
s.files += %w( src/core/lib/event_engine/default_event_engine_factory.h )
s.files += %w( src/core/lib/event_engine/event_engine.cc )
s.files += %w( src/core/lib/event_engine/event_engine_factory.h )
s.files += %w( src/core/lib/event_engine/handle_containers.h )

1
package.xml generated
Unescape View File

@ -937,6 +937,7 @@
<file baseinstalldir="/" name="src/core/lib/event_engine/channel_args_endpoint_config.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/event_engine/channel_args_endpoint_config.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/event_engine/default_event_engine_factory.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/event_engine/default_event_engine_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/event_engine/event_engine.cc" role="src" />
<file baseinstalldir="/" name="src/core/lib/event_engine/event_engine_factory.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/event_engine/handle_containers.h" role="src" />

2
src/core/lib/event_engine/default_event_engine_factory.cc
Unescape View File

@ -11,6 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <grpc/support/port_platform.h>
#include <memory>
@ -19,7 +20,6 @@
#include <grpc/event_engine/event_engine.h>
#include "src/core/lib/event_engine/event_engine_factory.h"
#include "src/core/lib/event_engine/iomgr_engine/iomgr_engine.h"
namespace grpc_event_engine {

33
src/core/lib/event_engine/default_event_engine_factory.h
Unescape View File

@ -0,0 +1,33 @@
// Copyright 2021 The gRPC Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
#define GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H
#include <grpc/support/port_platform.h>
#include <memory>
#include <grpc/event_engine/event_engine.h>
namespace grpc_event_engine {
namespace experimental {
/// Create an EventEngine using the default factory provided at link time.
std::unique_ptr<EventEngine> DefaultEventEngineFactory();
} // namespace experimental
} // namespace grpc_event_engine
#endif // GRPC_CORE_LIB_EVENT_ENGINE_DEFAULT_EVENT_ENGINE_FACTORY_H

1
src/core/lib/event_engine/event_engine.cc
Unescape View File

@ -21,6 +21,7 @@
#include <grpc/event_engine/event_engine.h>
#include "src/core/lib/event_engine/default_event_engine_factory.h"
#include "src/core/lib/event_engine/event_engine_factory.h"
namespace grpc_event_engine {

6
src/core/lib/event_engine/event_engine_factory.h
Unescape View File

@ -11,13 +11,12 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef GRPC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_FACTORY_H
#define GRPC_CORE_LIB_EVENT_ENGINE_EVENT_ENGINE_FACTORY_H
#include <grpc/support/port_platform.h>
#include <memory>
#include <grpc/event_engine/event_engine.h>
namespace grpc_event_engine {
@ -29,9 +28,6 @@ namespace experimental {
/// Strongly consider whether you could use \a CreateEventEngine instead.
EventEngine* GetDefaultEventEngine();
/// Create an EventEngine using the default factory provided at link time.
std::unique_ptr<EventEngine> DefaultEventEngineFactory();
/// Reset the default event engine
void ResetDefaultEventEngine();

1
tools/doxygen/Doxyfile.c++.internal generated
Unescape View File

@ -1938,6 +1938,7 @@ src/core/lib/debug/trace.h \
src/core/lib/event_engine/channel_args_endpoint_config.cc \
src/core/lib/event_engine/channel_args_endpoint_config.h \
src/core/lib/event_engine/default_event_engine_factory.cc \
src/core/lib/event_engine/default_event_engine_factory.h \
src/core/lib/event_engine/event_engine.cc \
src/core/lib/event_engine/event_engine_factory.h \
src/core/lib/event_engine/handle_containers.h \

1
tools/doxygen/Doxyfile.core.internal generated
Unescape View File

@ -1729,6 +1729,7 @@ src/core/lib/debug/trace.h \
src/core/lib/event_engine/channel_args_endpoint_config.cc \
src/core/lib/event_engine/channel_args_endpoint_config.h \
src/core/lib/event_engine/default_event_engine_factory.cc \
src/core/lib/event_engine/default_event_engine_factory.h \
src/core/lib/event_engine/event_engine.cc \
src/core/lib/event_engine/event_engine_factory.h \
src/core/lib/event_engine/handle_containers.h \

Write Preview
Loading…
Cancel
Save