grpc 1.22.0 → 1.23.0

data/src/core/lib/channel/channelz.h

@@ -58,13 +58,8 @@ namespace channelz {
 grpc_arg MakeParentUuidArg(intptr_t parent_uuid);
 intptr_t GetParentUuidFromArgs(const grpc_channel_args& args);
 
-// TODO(ncteisen), this only contains the uuids of the children for now,
-// since that is all that is strictly needed. In a future enhancement we will
-// add human readable names as in the channelz.proto
-typedef InlinedVector<intptr_t, 10> ChildRefsList;
-
 class SocketNode;
-typedef InlinedVector<SocketNode*, 10> ChildSocketsList;
+class ListenSocketNode;
 
 namespace testing {
 class CallCountingHelperPeer;
@@ -85,7 +80,7 @@ class BaseNode : public RefCounted<BaseNode> {
     kSocket,
   };
 
-  explicit BaseNode(EntityType type);
+  BaseNode(EntityType type, UniquePtr<char> name);
   virtual ~BaseNode();
 
   // All children must implement this function.
@@ -97,12 +92,14 @@ class BaseNode : public RefCounted<BaseNode> {
 
   EntityType type() const { return type_; }
   intptr_t uuid() const { return uuid_; }
+  const char* name() const { return name_.get(); }
 
  private:
   // to allow the ChannelzRegistry to set uuid_ under its lock.
   friend class ChannelzRegistry;
   const EntityType type_;
   intptr_t uuid_;
+  UniquePtr<char> name_;
 };
 
 // This class is a helper class for channelz entities that deal with Channels,
@@ -154,6 +151,10 @@ class ChannelNode : public BaseNode {
   ChannelNode(UniquePtr<char> target, size_t channel_tracer_max_nodes,
               intptr_t parent_uuid);
 
+  // Returns the string description of the given connectivity state.
+  static const char* GetChannelConnectivityStateChangeString(
+      grpc_connectivity_state state);
+
   intptr_t parent_uuid() const { return parent_uuid_; }
 
   grpc_json* RenderJson() override;
@@ -174,9 +175,13 @@ class ChannelNode : public BaseNode {
 
   void SetConnectivityState(grpc_connectivity_state state);
 
+  // TODO(roth): take in a RefCountedPtr to the child channel so we can retrieve
+  // the human-readable name.
   void AddChildChannel(intptr_t child_uuid);
   void RemoveChildChannel(intptr_t child_uuid);
 
+  // TODO(roth): take in a RefCountedPtr to the child subchannel so we can
+  // retrieve the human-readable name.
   void AddChildSubchannel(intptr_t child_uuid);
   void RemoveChildSubchannel(intptr_t child_uuid);
 
@@ -207,12 +212,20 @@ class ChannelNode : public BaseNode {
 class ServerNode : public BaseNode {
  public:
   ServerNode(grpc_server* server, size_t channel_tracer_max_nodes);
+
   ~ServerNode() override;
 
   grpc_json* RenderJson() override;
 
-  char* RenderServerSockets(intptr_t start_socket_id,
-                            intptr_t pagination_limit);
+  char* RenderServerSockets(intptr_t start_socket_id, intptr_t max_results);
+
+  void AddChildSocket(RefCountedPtr<SocketNode> node);
+
+  void RemoveChildSocket(intptr_t child_uuid);
+
+  void AddChildListenSocket(RefCountedPtr<ListenSocketNode> node);
+
+  void RemoveChildListenSocket(intptr_t child_uuid);
 
   // proxy methods to composed classes.
   void AddTraceEvent(ChannelTrace::Severity severity, const grpc_slice& data) {
@@ -229,15 +242,18 @@ class ServerNode : public BaseNode {
   void RecordCallSucceeded() { call_counter_.RecordCallSucceeded(); }
 
  private:
-  grpc_server* server_;
   CallCountingHelper call_counter_;
   ChannelTrace trace_;
+  Mutex child_mu_;  // Guards child maps below.
+  Map<intptr_t, RefCountedPtr<SocketNode>> child_sockets_;
+  Map<intptr_t, RefCountedPtr<ListenSocketNode>> child_listen_sockets_;
 };
 
 // Handles channelz bookkeeping for sockets
 class SocketNode : public BaseNode {
  public:
-  SocketNode(UniquePtr<char> local, UniquePtr<char> remote);
+  SocketNode(UniquePtr<char> local, UniquePtr<char> remote,
+             UniquePtr<char> name);
   ~SocketNode() override {}
 
   grpc_json* RenderJson() override;
@@ -276,8 +292,7 @@ class SocketNode : public BaseNode {
 // Handles channelz bookkeeping for listen sockets
 class ListenSocketNode : public BaseNode {
  public:
-  // ListenSocketNode takes ownership of host.
-  explicit ListenSocketNode(UniquePtr<char> local_addr);
+  ListenSocketNode(UniquePtr<char> local_addr, UniquePtr<char> name);
   ~ListenSocketNode() override {}
 
   grpc_json* RenderJson() override;

data/src/core/lib/compression/compression.cc

@@ -59,12 +59,11 @@ int grpc_compression_algorithm_parse(grpc_slice name,
   } else {
     return 0;
   }
-  return 0;
 }
 
 int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm,
                                     const char** name) {
-  GRPC_API_TRACE("grpc_compression_algorithm_parse(algorithm=%d, name=%p)", 2,
+  GRPC_API_TRACE("grpc_compression_algorithm_name(algorithm=%d, name=%p)", 2,
                  ((int)algorithm, name));
   switch (algorithm) {
     case GRPC_COMPRESS_NONE:

data/src/core/lib/compression/compression_args.cc

@@ -32,21 +32,25 @@
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 
-grpc_compression_algorithm grpc_channel_args_get_compression_algorithm(
+grpc_compression_algorithm
+grpc_channel_args_get_channel_default_compression_algorithm(
     const grpc_channel_args* a) {
   size_t i;
   if (a == nullptr) return GRPC_COMPRESS_NONE;
   for (i = 0; i < a->num_args; ++i) {
     if (a->args[i].type == GRPC_ARG_INTEGER &&
         !strcmp(GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM, a->args[i].key)) {
-      return static_cast<grpc_compression_algorithm>(a->args[i].value.integer);
-      break;
+      grpc_compression_algorithm default_algorithm =
+          static_cast<grpc_compression_algorithm>(a->args[i].value.integer);
+      return default_algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT
+                 ? default_algorithm
+                 : GRPC_COMPRESS_NONE;
     }
   }
   return GRPC_COMPRESS_NONE;
 }
 
-grpc_channel_args* grpc_channel_args_set_compression_algorithm(
+grpc_channel_args* grpc_channel_args_set_channel_default_compression_algorithm(
     grpc_channel_args* a, grpc_compression_algorithm algorithm) {
   GPR_ASSERT(algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT);
   grpc_arg tmp;
@@ -68,7 +72,9 @@ static int find_compression_algorithm_states_bitset(const grpc_channel_args* a,
           !strcmp(GRPC_COMPRESSION_CHANNEL_ENABLED_ALGORITHMS_BITSET,
                   a->args[i].key)) {
         *states_arg = &a->args[i].value.integer;
-        **states_arg |= 0x1; /* forcefully enable support for no compression */
+        **states_arg =
+            (**states_arg & ((1 << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1)) |
+            0x1; /* forcefully enable support for no compression */
         return 1;
       }
     }
@@ -83,7 +89,8 @@ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state(
   const int states_arg_found =
       find_compression_algorithm_states_bitset(*a, &states_arg);
 
-  if (grpc_channel_args_get_compression_algorithm(*a) == algorithm &&
+  if (grpc_channel_args_get_channel_default_compression_algorithm(*a) ==
+          algorithm &&
       state == 0) {
     const char* algo_name = nullptr;
     GPR_ASSERT(grpc_compression_algorithm_name(algorithm, &algo_name) != 0);

data/src/core/lib/compression/compression_args.h

@@ -25,13 +25,14 @@
 #include <grpc/impl/codegen/grpc_types.h>
 
 /** Returns the compression algorithm set in \a a. */
-grpc_compression_algorithm grpc_channel_args_get_compression_algorithm(
+grpc_compression_algorithm
+grpc_channel_args_get_channel_default_compression_algorithm(
     const grpc_channel_args* a);
 
 /** Returns a channel arg instance with compression enabled. If \a a is
  * non-NULL, its args are copied. N.B. GRPC_COMPRESS_NONE disables compression
  * for the channel. */
-grpc_channel_args* grpc_channel_args_set_compression_algorithm(
+grpc_channel_args* grpc_channel_args_set_channel_default_compression_algorithm(
     grpc_channel_args* a, grpc_compression_algorithm algorithm);
 
 /** Sets the support for the given compression algorithm. By default, all

data/src/core/lib/compression/compression_internal.cc

@@ -171,7 +171,7 @@ int grpc_compression_algorithm_from_message_stream_compression_algorithm(
 int grpc_message_compression_algorithm_name(
     grpc_message_compression_algorithm algorithm, const char** name) {
   GRPC_API_TRACE(
-      "grpc_message_compression_algorithm_parse(algorithm=%d, name=%p)", 2,
+      "grpc_message_compression_algorithm_name(algorithm=%d, name=%p)", 2,
       ((int)algorithm, name));
   switch (algorithm) {
     case GRPC_MESSAGE_COMPRESS_NONE:

data/src/core/lib/gpr/env_linux.cc

@@ -38,19 +38,20 @@
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 
-static const char* gpr_getenv_silent(const char* name, char** dst) {
-  const char* insecure_func_used = nullptr;
+char* gpr_getenv(const char* name) {
   char* result = nullptr;
 #if defined(GPR_BACKWARDS_COMPATIBILITY_MODE)
   typedef char* (*getenv_type)(const char*);
-  static getenv_type getenv_func = NULL;
+  static getenv_type getenv_func = nullptr;
   /* Check to see which getenv variant is supported (go from most
    * to least secure) */
-  const char* names[] = {"secure_getenv", "__secure_getenv", "getenv"};
-  for (size_t i = 0; getenv_func == NULL && i < GPR_ARRAY_SIZE(names); i++) {
-    getenv_func = (getenv_type)dlsym(RTLD_DEFAULT, names[i]);
-    if (getenv_func != NULL && strstr(names[i], "secure") == NULL) {
-      insecure_func_used = names[i];
+  if (getenv_func == nullptr) {
+    const char* names[] = {"secure_getenv", "__secure_getenv", "getenv"};
+    for (size_t i = 0; i < GPR_ARRAY_SIZE(names); i++) {
+      getenv_func = (getenv_type)dlsym(RTLD_DEFAULT, names[i]);
+      if (getenv_func != nullptr) {
+        break;
+      }
     }
   }
   result = getenv_func(name);
@@ -58,20 +59,8 @@ static const char* gpr_getenv_silent(const char* name, char** dst) {
   result = secure_getenv(name);
 #else
   result = getenv(name);
-  insecure_func_used = "getenv";
 #endif
-  *dst = result == nullptr ? result : gpr_strdup(result);
-  return insecure_func_used;
-}
-
-char* gpr_getenv(const char* name) {
-  char* result = nullptr;
-  const char* insecure_func_used = gpr_getenv_silent(name, &result);
-  if (insecure_func_used != nullptr) {
-    gpr_log(GPR_DEBUG, "Warning: insecure environment read function '%s' used",
-            insecure_func_used);
-  }
-  return result;
+  return result == nullptr ? result : gpr_strdup(result);
 }
 
 void gpr_setenv(const char* name, const char* value) {

data/src/core/lib/gpr/env_posix.cc

@@ -29,11 +29,6 @@
 #include <grpc/support/string_util.h>
 #include "src/core/lib/gpr/string.h"
 
-const char* gpr_getenv_silent(const char* name, char** dst) {
-  *dst = gpr_getenv(name);
-  return nullptr;
-}
-
 char* gpr_getenv(const char* name) {
   char* result = getenv(name);
   return result == nullptr ? result : gpr_strdup(result);

data/src/core/lib/gpr/string.cc

@@ -289,17 +289,22 @@ char* gpr_strvec_flatten(gpr_strvec* sv, size_t* final_length) {
   return gpr_strjoin((const char**)sv->strs, sv->count, final_length);
 }
 
-int gpr_stricmp(const char* a, const char* b) {
+int gpr_strincmp(const char* a, const char* b, size_t n) {
   int ca, cb;
   do {
     ca = tolower(*a);
     cb = tolower(*b);
     ++a;
     ++b;
-  } while (ca == cb && ca && cb);
+    --n;
+  } while (ca == cb && ca != 0 && cb != 0 && n != 0);
   return ca - cb;
 }
 
+int gpr_stricmp(const char* a, const char* b) {
+  return gpr_strincmp(a, b, SIZE_MAX);
+}
+
 static void add_string_to_split(const char* beg, const char* end, char*** strs,
                                 size_t* nstrs, size_t* capstrs) {
   char* out =

data/src/core/lib/gpr/string.h

@@ -115,6 +115,7 @@ char* gpr_strvec_flatten(gpr_strvec* strs, size_t* total_length);
 /** Case insensitive string comparison... return <0 if lower(a)<lower(b), ==0 if
     lower(a)==lower(b), >0 if lower(a)>lower(b) */
 int gpr_stricmp(const char* a, const char* b);
+int gpr_strincmp(const char* a, const char* b, size_t n);
 
 void* gpr_memrchr(const void* s, int c, size_t n);
 

data/src/core/lib/gpr/sync_posix.cc

@@ -29,44 +29,6 @@
 #include <time.h>
 #include "src/core/lib/profiling/timers.h"
 
-// For debug of the timer manager crash only.
-// TODO (mxyan): remove after bug is fixed.
-#ifdef GRPC_DEBUG_TIMER_MANAGER
-#include <string.h>
-void (*g_grpc_debug_timer_manager_stats)(
-    int64_t timer_manager_init_count, int64_t timer_manager_shutdown_count,
-    int64_t fork_count, int64_t timer_wait_err, int64_t timer_cv_value,
-    int64_t timer_mu_value, int64_t abstime_sec_value,
-    int64_t abstime_nsec_value, int64_t abs_deadline_sec_value,
-    int64_t abs_deadline_nsec_value, int64_t now1_sec_value,
-    int64_t now1_nsec_value, int64_t now2_sec_value, int64_t now2_nsec_value,
-    int64_t add_result_sec_value, int64_t add_result_nsec_value,
-    int64_t sub_result_sec_value, int64_t sub_result_nsec_value,
-    int64_t next_value, int64_t start_time_sec,
-    int64_t start_time_nsec) = nullptr;
-int64_t g_timer_manager_init_count = 0;
-int64_t g_timer_manager_shutdown_count = 0;
-int64_t g_fork_count = 0;
-int64_t g_timer_wait_err = 0;
-int64_t g_timer_cv_value = 0;
-int64_t g_timer_mu_value = 0;
-int64_t g_abstime_sec_value = -1;
-int64_t g_abstime_nsec_value = -1;
-int64_t g_abs_deadline_sec_value = -1;
-int64_t g_abs_deadline_nsec_value = -1;
-int64_t g_now1_sec_value = -1;
-int64_t g_now1_nsec_value = -1;
-int64_t g_now2_sec_value = -1;
-int64_t g_now2_nsec_value = -1;
-int64_t g_add_result_sec_value = -1;
-int64_t g_add_result_nsec_value = -1;
-int64_t g_sub_result_sec_value = -1;
-int64_t g_sub_result_nsec_value = -1;
-int64_t g_next_value = -1;
-int64_t g_start_time_sec = -1;
-int64_t g_start_time_nsec = -1;
-#endif  // GRPC_DEBUG_TIMER_MANAGER
-
 #ifdef GPR_LOW_LEVEL_COUNTERS
 gpr_atm gpr_mu_locks = 0;
 gpr_atm gpr_counter_atm_cas = 0;
@@ -152,63 +114,12 @@ void gpr_cv_destroy(gpr_cv* cv) {
 #endif
 }
 
-// For debug of the timer manager crash only.
-// TODO (mxyan): remove after bug is fixed.
-#ifdef GRPC_DEBUG_TIMER_MANAGER
-static gpr_timespec gpr_convert_clock_type_debug_timespec(
-    gpr_timespec t, gpr_clock_type clock_type, gpr_timespec& now1,
-    gpr_timespec& now2, gpr_timespec& add_result, gpr_timespec& sub_result) {
-  if (t.clock_type == clock_type) {
-    return t;
-  }
-
-  if (t.tv_sec == INT64_MAX || t.tv_sec == INT64_MIN) {
-    t.clock_type = clock_type;
-    return t;
-  }
-
-  if (clock_type == GPR_TIMESPAN) {
-    return gpr_time_sub(t, gpr_now(t.clock_type));
-  }
-
-  if (t.clock_type == GPR_TIMESPAN) {
-    return gpr_time_add(gpr_now(clock_type), t);
-  }
-
-  now1 = gpr_now(t.clock_type);
-  sub_result = gpr_time_sub(t, now1);
-  now2 = gpr_now(clock_type);
-  add_result = gpr_time_add(now2, sub_result);
-  return add_result;
-}
-
-#define gpr_convert_clock_type_debug(t, clock_type, now1, now2, add_result, \
-                                     sub_result)                            \
-  gpr_convert_clock_type_debug_timespec((t), (clock_type), (now1), (now2),  \
-                                        (add_result), (sub_result))
-#else
 #define gpr_convert_clock_type_debug(t, clock_type, now1, now2, add_result, \
                                      sub_result)                            \
   gpr_convert_clock_type((t), (clock_type))
-#endif
 
 int gpr_cv_wait(gpr_cv* cv, gpr_mu* mu, gpr_timespec abs_deadline) {
   int err = 0;
-#ifdef GRPC_DEBUG_TIMER_MANAGER
-  // For debug of the timer manager crash only.
-  // TODO (mxyan): remove after bug is fixed.
-  gpr_timespec abs_deadline_copy;
-  abs_deadline_copy.tv_sec = abs_deadline.tv_sec;
-  abs_deadline_copy.tv_nsec = abs_deadline.tv_nsec;
-  gpr_timespec now1;
-  gpr_timespec now2;
-  gpr_timespec add_result;
-  gpr_timespec sub_result;
-  memset(&now1, 0, sizeof(now1));
-  memset(&now2, 0, sizeof(now2));
-  memset(&add_result, 0, sizeof(add_result));
-  memset(&sub_result, 0, sizeof(sub_result));
-#endif
   if (gpr_time_cmp(abs_deadline, gpr_inf_future(abs_deadline.clock_type)) ==
       0) {
 #ifdef GRPC_ASAN_ENABLED
@@ -232,47 +143,7 @@ int gpr_cv_wait(gpr_cv* cv, gpr_mu* mu, gpr_timespec abs_deadline) {
 #else
     err = pthread_cond_timedwait(cv, mu, &abs_deadline_ts);
 #endif
-
-#ifdef GRPC_DEBUG_TIMER_MANAGER
-    // For debug of the timer manager crash only.
-    // TODO (mxyan): remove after bug is fixed.
-    if (GPR_UNLIKELY(!(err == 0 || err == ETIMEDOUT || err == EAGAIN))) {
-      g_abstime_sec_value = abs_deadline_ts.tv_sec;
-      g_abstime_nsec_value = abs_deadline_ts.tv_nsec;
-    }
-#endif
   }
-
-#ifdef GRPC_DEBUG_TIMER_MANAGER
-  // For debug of the timer manager crash only.
-  // TODO (mxyan): remove after bug is fixed.
-  if (GPR_UNLIKELY(!(err == 0 || err == ETIMEDOUT || err == EAGAIN))) {
-    if (g_grpc_debug_timer_manager_stats) {
-      g_timer_wait_err = err;
-      g_timer_cv_value = (int64_t)cv;
-      g_timer_mu_value = (int64_t)mu;
-      g_abs_deadline_sec_value = abs_deadline_copy.tv_sec;
-      g_abs_deadline_nsec_value = abs_deadline_copy.tv_nsec;
-      g_now1_sec_value = now1.tv_sec;
-      g_now1_nsec_value = now1.tv_nsec;
-      g_now2_sec_value = now2.tv_sec;
-      g_now2_nsec_value = now2.tv_nsec;
-      g_add_result_sec_value = add_result.tv_sec;
-      g_add_result_nsec_value = add_result.tv_nsec;
-      g_sub_result_sec_value = sub_result.tv_sec;
-      g_sub_result_nsec_value = sub_result.tv_nsec;
-      g_grpc_debug_timer_manager_stats(
-          g_timer_manager_init_count, g_timer_manager_shutdown_count,
-          g_fork_count, g_timer_wait_err, g_timer_cv_value, g_timer_mu_value,
-          g_abstime_sec_value, g_abstime_nsec_value, g_abs_deadline_sec_value,
-          g_abs_deadline_nsec_value, g_now1_sec_value, g_now1_nsec_value,
-          g_now2_sec_value, g_now2_nsec_value, g_add_result_sec_value,
-          g_add_result_nsec_value, g_sub_result_sec_value,
-          g_sub_result_nsec_value, g_next_value, g_start_time_sec,
-          g_start_time_nsec);
-    }
-  }
-#endif
   GPR_ASSERT(err == 0 || err == ETIMEDOUT || err == EAGAIN);
   return err == ETIMEDOUT;
 }