grpc 1.51.0 → 1.52.0.pre2

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -28,6 +28,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
+#include "src/core/lib/gprpp/crash.h"
+
 static android_LogPriority severity_to_log_priority(gpr_log_severity severity) {
   switch (severity) {
     case GPR_LOG_SEVERITY_DEBUG:
@@ -42,7 +44,7 @@ static android_LogPriority severity_to_log_priority(gpr_log_severity severity) {
 
 void gpr_log(const char* file, int line, gpr_log_severity severity,
              const char* format, ...) {
-  /* Avoid message construction if gpr_log_message won't log */
+  // Avoid message construction if gpr_log_message won't log
   if (gpr_should_log(severity) == 0) {
     return;
   }
@@ -70,8 +72,8 @@ void gpr_default_log(gpr_log_func_args* args) {
 
   __android_log_write(severity_to_log_priority(args->severity), "GRPC", output);
 
-  /* allocated by asprintf => use free, not gpr_free */
+  // allocated by asprintf => use free, not gpr_free
   free(output);
 }
 
-#endif /* GPR_ANDROID */
+#endif  // GPR_ANDROID

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef _POSIX_SOURCE
 #define _POSIX_SOURCE
@@ -44,6 +44,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/examine_stack.h"
 
 int gpr_should_log_stacktrace(gpr_log_severity severity);
@@ -52,7 +53,7 @@ static long sys_gettid(void) { return syscall(__NR_gettid); }
 
 void gpr_log(const char* file, int line, gpr_log_severity severity,
              const char* format, ...) {
-  /* Avoid message construction if gpr_log_message won't log */
+  // Avoid message construction if gpr_log_message won't log
   if (gpr_should_log(severity) == 0) {
     return;
   }
@@ -65,7 +66,7 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   }
   va_end(args);
   gpr_log_message(file, line, severity, message);
-  /* message has been allocated by vasprintf above, and needs free */
+  // message has been allocated by vasprintf above, and needs free
   free(message);
 }
 
@@ -110,4 +111,4 @@ void gpr_default_log(gpr_log_func_args* args) {
   }
 }
 
-#endif /* GPR_LINUX_LOG */
+#endif  // GPR_LINUX_LOG

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -35,6 +35,7 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/examine_stack.h"
 
 int gpr_should_log_stacktrace(gpr_log_severity severity);
@@ -43,7 +44,7 @@ static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
 
 void gpr_log(const char* file, int line, gpr_log_severity severity,
              const char* format, ...) {
-  /* Avoid message construction if gpr_log_message won't log */
+  // Avoid message construction if gpr_log_message won't log
   if (gpr_should_log(severity) == 0) {
     return;
   }
@@ -107,4 +108,4 @@ void gpr_default_log(gpr_log_func_args* args) {
   }
 }
 
-#endif /* defined(GPR_POSIX_LOG) */
+#endif  // defined(GPR_POSIX_LOG)

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -30,13 +30,14 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/examine_stack.h"
 
 int gpr_should_log_stacktrace(gpr_log_severity severity);
 
 void gpr_log(const char* file, int line, gpr_log_severity severity,
              const char* format, ...) {
-  /* Avoid message construction if gpr_log_message won't log */
+  // Avoid message construction if gpr_log_message won't log
   if (gpr_should_log(severity) == 0) {
     return;
   }
@@ -45,23 +46,23 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   va_list args;
   int ret;
 
-  /* Determine the length. */
+  // Determine the length.
   va_start(args, format);
   ret = _vscprintf(format, args);
   va_end(args);
   if (ret < 0) {
     message = NULL;
   } else {
-    /* Allocate a new buffer, with space for the NUL terminator. */
+    // Allocate a new buffer, with space for the NUL terminator.
     size_t strp_buflen = (size_t)ret + 1;
     message = (char*)gpr_malloc(strp_buflen);
 
-    /* Print to the buffer. */
+    // Print to the buffer.
     va_start(args, format);
     ret = vsnprintf_s(message, strp_buflen, _TRUNCATE, format, args);
     va_end(args);
     if ((size_t)ret != strp_buflen - 1) {
-      /* This should never happen. */
+      // This should never happen.
       gpr_free(message);
       message = NULL;
     }
@@ -71,7 +72,7 @@ void gpr_log(const char* file, int line, gpr_log_severity severity,
   gpr_free(message);
 }
 
-/* Simple starter implementation */
+// Simple starter implementation
 void gpr_default_log(gpr_log_func_args* args) {
   const char* final_slash;
   const char* display_file;
@@ -112,4 +113,4 @@ void gpr_default_log(gpr_log_func_args* args) {
   fflush(stderr);
 }
 
-#endif /* GPR_WINDOWS_LOG */
+#endif  // GPR_WINDOWS_LOG

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_LIB_GPR_SPINLOCK_H
 #define GRPC_CORE_LIB_GPR_SPINLOCK_H
@@ -50,4 +50,4 @@ struct gpr_spinlock {
   do {                          \
   } while (!gpr_spinlock_trylock((lock)))
 
-#endif /* GRPC_CORE_LIB_GPR_SPINLOCK_H */
+#endif  // GRPC_CORE_LIB_GPR_SPINLOCK_H

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -35,6 +35,7 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/gpr/useful.h"
+#include "src/core/lib/gprpp/crash.h"
 
 char* gpr_strdup(const char* src) {
   char* dst;
@@ -89,7 +90,7 @@ static dump_out dump_out_create(void) {
 
 static void dump_out_append(dump_out* out, char c) {
   if (out->length == out->capacity) {
-    out->capacity = std::max(size_t(8), 2 * out->capacity);
+    out->capacity = std::max(size_t{8}, 2 * out->capacity);
     out->data = static_cast<char*>(gpr_realloc(out->data, out->capacity));
   }
   out->data[out->length++] = c;
@@ -151,12 +152,12 @@ int gpr_parse_bytes_to_uint32(const char* buf, size_t len, uint32_t* result) {
   uint32_t new_val;
   size_t i;
 
-  if (len == 0) return 0; /* must have some bytes */
+  if (len == 0) return 0;  // must have some bytes
 
   for (i = 0; i < len; i++) {
-    if (buf[i] < '0' || buf[i] > '9') return 0; /* bad char */
+    if (buf[i] < '0' || buf[i] > '9') return 0;  // bad char
     new_val = 10 * out + static_cast<uint32_t>(buf[i] - '0');
-    if (new_val < out) return 0; /* overflow */
+    if (new_val < out) return 0;  // overflow
     out = new_val;
   }
 
@@ -245,9 +246,9 @@ char* gpr_strjoin_sep(const char** strs, size_t nstrs, const char* sep,
   for (i = 0; i < nstrs; i++) {
     out_length += strlen(strs[i]);
   }
-  out_length += 1; /* null terminator */
+  out_length += 1;  // null terminator
   if (nstrs > 0) {
-    out_length += sep_len * (nstrs - 1); /* separators */
+    out_length += sep_len * (nstrs - 1);  // separators
   }
   out = static_cast<char*>(gpr_malloc(out_length));
   out_length = 0;
@@ -290,7 +291,7 @@ static void add_string_to_split(const char* beg, const char* end, char*** strs,
   memcpy(out, beg, static_cast<size_t>(end - beg));
   out[end - beg] = 0;
   if (*nstrs == *capstrs) {
-    *capstrs = std::max(size_t(8), 2 * *capstrs);
+    *capstrs = std::max(size_t{8}, 2 * *capstrs);
     *strs = static_cast<char**>(gpr_realloc(*strs, sizeof(*strs) * *capstrs));
   }
   (*strs)[*nstrs] = out;

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #ifndef GRPC_CORE_LIB_GPR_STRING_H
 #define GRPC_CORE_LIB_GPR_STRING_H
@@ -26,87 +26,87 @@
 
 #include <string>
 
-#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/support/time.h>
 
-/* String utility functions */
+// String utility functions
 
-/* Flags for gpr_dump function. */
+// Flags for gpr_dump function.
 #define GPR_DUMP_HEX 0x00000001
 #define GPR_DUMP_ASCII 0x00000002
 
-/* Converts array buf, of length len, into a C string according to the flags.
-   Result should be freed with gpr_free() */
+// Converts array buf, of length len, into a C string according to the flags.
+// Result should be freed with gpr_free()
 char* gpr_dump(const char* buf, size_t len, uint32_t flags);
-/* Converts array buf, of length len, into a C string according to the flags.
-   The length of the returned buffer is stored in out_len.
-   Result should be freed with gpr_free() */
+// Converts array buf, of length len, into a C string according to the flags.
+// The length of the returned buffer is stored in out_len.
+// Result should be freed with gpr_free()
 char* gpr_dump_return_len(const char* buf, size_t len, uint32_t flags,
                           size_t* out_len);
 
-/* Parses an array of bytes into an integer (base 10). Returns 1 on success,
-   0 on failure. */
+// Parses an array of bytes into an integer (base 10). Returns 1 on success,
+// 0 on failure.
 int gpr_parse_bytes_to_uint32(const char* buf, size_t len, uint32_t* result);
 
-/* Minimum buffer size for calling ltoa */
+// Minimum buffer size for calling ltoa
 #define GPR_LTOA_MIN_BUFSIZE (3 * sizeof(long))
 
-/* Convert a long to a string in base 10; returns the length of the
-   output string (or 0 on failure).
-   output must be at least GPR_LTOA_MIN_BUFSIZE bytes long. */
+// Convert a long to a string in base 10; returns the length of the
+// output string (or 0 on failure).
+// output must be at least GPR_LTOA_MIN_BUFSIZE bytes long.
 int gpr_ltoa(long value, char* output);
 
-/* Minimum buffer size for calling int64toa */
+// Minimum buffer size for calling int64toa
 #define GPR_INT64TOA_MIN_BUFSIZE (3 * sizeof(int64_t))
 
-/* Convert an int64 to a string in base 10; returns the length of the
-output string (or 0 on failure).
-output must be at least GPR_INT64TOA_MIN_BUFSIZE bytes long.
-NOTE: This function ensures sufficient bit width even on Win x64,
-where long is 32bit is size.*/
+// Convert an int64 to a string in base 10; returns the length of the
+// output string (or 0 on failure).
+// output must be at least GPR_INT64TOA_MIN_BUFSIZE bytes long.
+// NOTE: This function ensures sufficient bit width even on Win x64,
+// where long is 32bit is size.
 int int64_ttoa(int64_t value, char* output);
 
 // Parses a non-negative number from a value string.  Returns -1 on error.
 int gpr_parse_nonnegative_int(const char* value);
 
-/* Reverse a run of bytes */
+// Reverse a run of bytes
 void gpr_reverse_bytes(char* str, int len);
 
-/* Pad a string with flag characters. The given length specifies the minimum
-   field width. The input string is never truncated. */
+// Pad a string with flag characters. The given length specifies the minimum
+// field width. The input string is never truncated.
 char* gpr_leftpad(const char* str, char flag, size_t length);
 
-/* Join a set of strings, returning the resulting string.
-   Total combined length (excluding null terminator) is returned in final_length
-   if it is non-null. */
+// Join a set of strings, returning the resulting string.
+// Total combined length (excluding null terminator) is returned in final_length
+// if it is non-null.
 char* gpr_strjoin(const char** strs, size_t nstrs, size_t* final_length);
 
-/* Join a set of strings using a separator, returning the resulting string.
-   Total combined length (excluding null terminator) is returned in final_length
-   if it is non-null. */
+// Join a set of strings using a separator, returning the resulting string.
+// Total combined length (excluding null terminator) is returned in final_length
+// if it is non-null.
 char* gpr_strjoin_sep(const char** strs, size_t nstrs, const char* sep,
                       size_t* final_length);
 
 void gpr_string_split(const char* input, const char* sep, char*** strs,
                       size_t* nstrs);
 
-/* Returns a string that represents tm according to RFC-3339, and,
-   more specifically, follows:
-   https://developers.google.com/protocol-buffers/docs/proto3#json
+// Returns a string that represents tm according to RFC-3339, and,
+// more specifically, follows:
+// https://developers.google.com/protocol-buffers/docs/proto3#json
 
-   Uses RFC 3339, where generated output will always be Z-normalized and uses
-   0, 3, 6 or 9 fractional digits. */
+// Uses RFC 3339, where generated output will always be Z-normalized and uses
+// 0, 3, 6 or 9 fractional digits.
 std::string gpr_format_timespec(gpr_timespec);
 
-/** Case insensitive string comparison... return <0 if lower(a)<lower(b), ==0 if
-    lower(a)==lower(b), >0 if lower(a)>lower(b) */
+/// 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);
 
-/* Try to parse given string into a boolean value.
-   When parsed successfully, dst will have the value and returns true.
-   Otherwise, it returns false. */
+// Try to parse given string into a boolean value.
+// When parsed successfully, dst will have the value and returns true.
+// Otherwise, it returns false.
 bool gpr_parse_bool_value(const char* value, bool* dst);
 
-#endif /* GRPC_CORE_LIB_GPR_STRING_H */
+#endif  // GRPC_CORE_LIB_GPR_STRING_H