[esoteric] Eliminate unused argument errors with GPR_DEBUG_ASSERT (#36373)

Eliminate cases where we get unused parameter errors only because of a debug assert, and because of short-circuit evaluation not add any overhead into release builds.

Closes #36373

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36373 from ctiller:ugh123 073ea1236a
PiperOrigin-RevId: 625435672
pull/36345/head
Craig Tiller 1 year ago committed by Yash Tibrewal
parent 1a8b22f2de
commit 67ba35bac0
  1. 2
      include/grpc/support/log.h
  2. 2
      include/grpcpp/support/callback_common.h
  3. 2
      src/core/client_channel/client_channel_filter.cc
  4. 5
      src/core/load_balancing/xds/xds_cluster_impl.cc

@ -102,7 +102,7 @@ GPRAPI void gpr_assertion_failed(const char* filename, int line,
#ifndef NDEBUG #ifndef NDEBUG
#define GPR_DEBUG_ASSERT(x) GPR_ASSERT(x) #define GPR_DEBUG_ASSERT(x) GPR_ASSERT(x)
#else #else
#define GPR_DEBUG_ASSERT(x) #define GPR_DEBUG_ASSERT(x) GPR_ASSERT(true || (x))
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus

@ -207,7 +207,9 @@ class CallbackWithSuccessTag : public grpc_completion_queue_functor {
auto* ops = ops_; auto* ops = ops_;
#endif #endif
bool do_callback = ops_->FinalizeResult(&ignored, &ok); bool do_callback = ops_->FinalizeResult(&ignored, &ok);
#ifndef NDEBUG
GPR_DEBUG_ASSERT(ignored == ops); GPR_DEBUG_ASSERT(ignored == ops);
#endif
if (do_callback) { if (do_callback) {
CatchingCallback(func_, ok); CatchingCallback(func_, ok);

@ -644,7 +644,9 @@ class ClientChannelFilter::SubchannelWrapper final
chand, this, subchannel_.get()); chand, this, subchannel_.get());
} }
GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "SubchannelWrapper"); GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "SubchannelWrapper");
#ifndef NDEBUG
GPR_DEBUG_ASSERT(chand_->work_serializer_->RunningInWorkSerializer()); GPR_DEBUG_ASSERT(chand_->work_serializer_->RunningInWorkSerializer());
#endif
if (chand_->channelz_node_ != nullptr) { if (chand_->channelz_node_ != nullptr) {
auto* subchannel_node = subchannel_->channelz_node(); auto* subchannel_node = subchannel_->channelz_node();
if (subchannel_node != nullptr) { if (subchannel_node != nullptr) {

@ -14,8 +14,6 @@
// limitations under the License. // limitations under the License.
// //
#include <grpc/support/port_platform.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -36,6 +34,7 @@
#include <grpc/impl/connectivity_state.h> #include <grpc/impl/connectivity_state.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/port_platform.h>
#include "src/core/client_channel/client_channel_internal.h" #include "src/core/client_channel/client_channel_internal.h"
#include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap.h"
@ -328,7 +327,9 @@ class XdsClusterImplLb::Picker::SubchannelCallTracker final
~SubchannelCallTracker() override { ~SubchannelCallTracker() override {
locality_stats_.reset(DEBUG_LOCATION, "SubchannelCallTracker"); locality_stats_.reset(DEBUG_LOCATION, "SubchannelCallTracker");
call_counter_.reset(DEBUG_LOCATION, "SubchannelCallTracker"); call_counter_.reset(DEBUG_LOCATION, "SubchannelCallTracker");
#ifndef NDEBUG
GPR_DEBUG_ASSERT(!started_); GPR_DEBUG_ASSERT(!started_);
#endif
} }
void Start() override { void Start() override {

Loading…
Cancel
Save