From 7f51ba8372b05d92e0ee1af91e9591ac28915d80 Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Thu, 12 Apr 2018 13:21:20 -0700
Subject: Add GPR_UNLIKELY annotations mainly for the client path in error
 conditions

---
 .../filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc  | 5 +++--
 .../ext/filters/client_channel/resolver/dns/native/dns_resolver.cc   | 2 +-
 .../filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/core/ext/filters/client_channel/resolver')

diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
index c3c62b60bf..1b4767b47f 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc
@@ -225,14 +225,15 @@ bool ValueInJsonArray(grpc_json* array, const char* value) {
 
 char* ChooseServiceConfig(char* service_config_choice_json) {
   grpc_json* choices_json = grpc_json_parse_string(service_config_choice_json);
-  if (choices_json == nullptr || choices_json->type != GRPC_JSON_ARRAY) {
+  if (GPR_UNLIKELY(choices_json == nullptr ||
+                   choices_json->type != GRPC_JSON_ARRAY)) {
     gpr_log(GPR_ERROR, "cannot parse service config JSON string");
     return nullptr;
   }
   char* service_config = nullptr;
   for (grpc_json* choice = choices_json->child; choice != nullptr;
        choice = choice->next) {
-    if (choice->type != GRPC_JSON_OBJECT) {
+    if (GPR_UNLIKELY(choice->type != GRPC_JSON_OBJECT)) {
       gpr_log(GPR_ERROR, "cannot parse service config JSON string");
       break;
     }
diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
index e7842a7951..920a492fdb 100644
--- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
@@ -310,7 +310,7 @@ class NativeDnsResolverFactory : public ResolverFactory {
  public:
   OrphanablePtr<Resolver> CreateResolver(
       const ResolverArgs& args) const override {
-    if (0 != strcmp(args.uri->authority, "")) {
+    if (GPR_UNLIKELY(0 != strcmp(args.uri->authority, ""))) {
       gpr_log(GPR_ERROR, "authority based dns uri's not supported");
       return OrphanablePtr<Resolver>(nullptr);
     }
diff --git a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
index f74ac5aebe..8f6132a726 100644
--- a/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
@@ -123,7 +123,7 @@ void DoNothing(void* ignored) {}
 OrphanablePtr<Resolver> CreateSockaddrResolver(
     const ResolverArgs& args,
     bool parse(const grpc_uri* uri, grpc_resolved_address* dst)) {
-  if (0 != strcmp(args.uri->authority, "")) {
+  if (GPR_UNLIKELY(0 != strcmp(args.uri->authority, ""))) {
     gpr_log(GPR_ERROR, "authority-based URIs not supported by the %s scheme",
             args.uri->scheme);
     return OrphanablePtr<Resolver>(nullptr);
-- 
cgit v1.2.3