diff options
| author |  Yang Gao <yangg@google.com> | 2017-08-24 15:47:33 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-08-24 15:47:33 -0700 |
| commit | 2921e1ea7dbf423c3d17eea89363b63ae1adacae (patch) | |
| tree | d0ad02e00fe5e7845b2efe003a41bb15c6b89a25 /src/core | |
| parent | f28955d40d199a31459388ca2770467509181290 (diff) | |
| parent | a79ada3bcc0eb4803cce840f8c2a1b1791ce2aba (diff) | |
Merge pull request #12282 from yang-g/sync_thd_refactor
Refactor sync/thd headers
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lib/support/block_annotate.h | 22 | ||||
| -rw-r--r-- | src/core/lib/support/thd_internal.h | 24 |
2 files changed, 22 insertions, 24 deletions
diff --git a/src/core/lib/support/block_annotate.h b/src/core/lib/support/block_annotate.h index 0a2cb45018..8e3ef7df65 100644 --- a/src/core/lib/support/block_annotate.h +++ b/src/core/lib/support/block_annotate.h @@ -19,15 +19,37 @@ #ifndef GRPC_CORE_LIB_SUPPORT_BLOCK_ANNOTATE_H #define GRPC_CORE_LIB_SUPPORT_BLOCK_ANNOTATE_H +#ifdef __cplusplus +extern "C" { +#endif + +void gpr_thd_start_blocking_region(); +void gpr_thd_end_blocking_region(); + +#ifdef __cplusplus +} +#endif + /* These annotations identify the beginning and end of regions where the code may block for reasons other than synchronization functions. These include poll, epoll, and getaddrinfo. */ +#ifdef GRPC_SCHEDULING_MARK_BLOCKING_REGION +#define GRPC_SCHEDULING_START_BLOCKING_REGION \ + do { \ + gpr_thd_start_blocking_region(); \ + } while (0) +#define GRPC_SCHEDULING_END_BLOCKING_REGION \ + do { \ + gpr_thd_end_blocking_region(); \ + } while (0) +#else #define GRPC_SCHEDULING_START_BLOCKING_REGION \ do { \ } while (0) #define GRPC_SCHEDULING_END_BLOCKING_REGION \ do { \ } while (0) +#endif #endif /* GRPC_CORE_LIB_SUPPORT_BLOCK_ANNOTATE_H */ diff --git a/src/core/lib/support/thd_internal.h b/src/core/lib/support/thd_internal.h deleted file mode 100644 index cc468c7846..0000000000 --- a/src/core/lib/support/thd_internal.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * - * Copyright 2015 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_SUPPORT_THD_INTERNAL_H -#define GRPC_CORE_LIB_SUPPORT_THD_INTERNAL_H - -/* Internal interfaces between modules within the gpr support library. */ - -#endif /* GRPC_CORE_LIB_SUPPORT_THD_INTERNAL_H */ |