diff options
author | Noah Eisen <ncteisen@gmail.com> | 2018-06-11 07:52:16 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-11 07:52:16 -0700 |
commit | 3089cc8c38563d27160f9772a2e5ed4e60c058f7 (patch) | |
tree | 82343b0b8e7b87a9b317eec7e5208182b0c0f6f1 /src | |
parent | 8f9445ca9fdb00fec9c76b7d5ed5eafddedc7c7b (diff) | |
parent | d93589a0a1733b7a786b692c2d09c6f6a2958ba4 (diff) |
Merge pull request #15676 from ncteisen/error-creation-sanity
No Error Creation on RPC Hotpath
Diffstat (limited to 'src')
-rw-r--r-- | src/core/lib/iomgr/error.cc | 12 | ||||
-rw-r--r-- | src/core/lib/iomgr/error.h | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index 4088cf612e..90ed34da11 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -312,6 +312,12 @@ static void internal_add_error(grpc_error** err, grpc_error* new_err) { // It is very common to include and extra int and string in an error #define SURPLUS_CAPACITY (2 * SLOTS_PER_INT + SLOTS_PER_TIME) +static bool g_error_creation_allowed = true; + +void grpc_disable_error_creation() { g_error_creation_allowed = false; } + +void grpc_enable_error_creation() { g_error_creation_allowed = true; } + grpc_error* grpc_error_create(const char* file, int line, grpc_slice desc, grpc_error** referencing, size_t num_referencing) { @@ -326,6 +332,12 @@ grpc_error* grpc_error_create(const char* file, int line, grpc_slice desc, return GRPC_ERROR_OOM; } #ifndef NDEBUG + if (!g_error_creation_allowed) { + gpr_log(GPR_ERROR, + "Error creation occurred when error creation was disabled [%s:%d]", + file, line); + abort(); + } if (grpc_trace_error_refcount.enabled()) { gpr_log(GPR_DEBUG, "%p create [%s:%d]", err, file, line); } diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index f8cae4da82..27c4d22fd1 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -123,6 +123,11 @@ typedef enum { #define GRPC_ERROR_OOM ((grpc_error*)2) #define GRPC_ERROR_CANCELLED ((grpc_error*)4) +// debug only toggles that allow for a sanity to check that ensures we will +// never create any errors in the per-RPC hotpath. +void grpc_disable_error_creation(); +void grpc_enable_error_creation(); + const char* grpc_error_string(grpc_error* error); /// Create an error - but use GRPC_ERROR_CREATE instead |