From a3583b22eaf5448daff914a786d1e5214fe9aaec Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 13 Apr 2017 06:42:47 -0700
Subject: [PATCH] Fix compilation, add a check for no slow usages of
grpc_slice_malloc
---
include/grpc/slice.h | 2 +-
src/core/lib/slice/slice.c | 2 +-
tools/run_tests/sanity/core_banned_functions.py | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/grpc/slice.h b/include/grpc/slice.h
index fe6379c867..86a455b42c 100644
--- a/include/grpc/slice.h
+++ b/include/grpc/slice.h
@@ -128,7 +128,7 @@ GPRAPI grpc_slice grpc_slice_split_tail(grpc_slice *s, size_t split);
* refcounts (grpc_slice_split_tail_maybe_ref(..., true) is equivalent to
* grpc_slice_split_tail(...)) */
GPRAPI grpc_slice grpc_slice_split_tail_maybe_ref(grpc_slice *s, size_t split,
- bool inc_refs);
+ int inc_refs);
/* Splits s into two: modifies s to be s[split:s.length], and returns a new
slice, sharing a refcount with s, that contains s[0:split].
diff --git a/src/core/lib/slice/slice.c b/src/core/lib/slice/slice.c
index 285218837a..e3d030235c 100644
--- a/src/core/lib/slice/slice.c
+++ b/src/core/lib/slice/slice.c
@@ -313,7 +313,7 @@ grpc_slice grpc_slice_sub(grpc_slice source, size_t begin, size_t end) {
}
grpc_slice grpc_slice_split_tail_maybe_ref(grpc_slice *source, size_t split,
- bool incref) {
+ int incref) {
grpc_slice tail;
if (source->refcount == NULL) {
diff --git a/tools/run_tests/sanity/core_banned_functions.py b/tools/run_tests/sanity/core_banned_functions.py
index c3c3cbec76..2387c5f1da 100755
--- a/tools/run_tests/sanity/core_banned_functions.py
+++ b/tools/run_tests/sanity/core_banned_functions.py
@@ -50,6 +50,7 @@ BANNED_EXCEPT = {
'grpc_os_error(': ['src/core/lib/iomgr/error.c'],
'grpc_wsa_error(': ['src/core/lib/iomgr/error.c'],
'grpc_log_if_error(': ['src/core/lib/iomgr/error.c'],
+ 'grpc_slice_malloc(': ['src/core/lib/slice/slice.c'],
}
errors = 0
--
GitLab