grpc 1.50.0.pre1 → 1.52.0.pre2

data/src/core/lib/gpr/time_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>
 
@@ -32,10 +32,12 @@
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
+#include "src/core/lib/gprpp/crash.h"
+
 static struct timespec timespec_from_gpr(gpr_timespec gts) {
   struct timespec rv;
   if (sizeof(time_t) < sizeof(int64_t)) {
-    /* fine to assert, as this is only used in gpr_sleep_until */
+    // fine to assert, as this is only used in gpr_sleep_until
     GPR_ASSERT(gts.tv_sec <= INT32_MAX && gts.tv_sec >= INT32_MIN);
   }
   rv.tv_sec = static_cast<time_t>(gts.tv_sec);
@@ -46,11 +48,11 @@ static struct timespec timespec_from_gpr(gpr_timespec gts) {
 #if _POSIX_TIMERS > 0 || defined(__OpenBSD__)
 static gpr_timespec gpr_from_timespec(struct timespec ts,
                                       gpr_clock_type clock_type) {
-  /*
-   * timespec.tv_sec can have smaller size than gpr_timespec.tv_sec,
-   * but we are only using this function to implement gpr_now
-   * so there's no need to handle "infinity" values.
-   */
+  //
+  // timespec.tv_sec can have smaller size than gpr_timespec.tv_sec,
+  // but we are only using this function to implement gpr_now
+  // so there's no need to handle "infinity" values.
+  //
   gpr_timespec rv;
   rv.tv_sec = ts.tv_sec;
   rv.tv_nsec = static_cast<int32_t>(ts.tv_nsec);
@@ -58,7 +60,7 @@ static gpr_timespec gpr_from_timespec(struct timespec ts,
   return rv;
 }
 
-/** maps gpr_clock_type --> clockid_t for clock_gettime */
+/// maps gpr_clock_type --> clockid_t for clock_gettime
 static const clockid_t clockid_for_gpr_clock[] = {CLOCK_MONOTONIC,
                                                   CLOCK_REALTIME};
 
@@ -73,7 +75,7 @@ static gpr_timespec now_impl(gpr_clock_type clock_type) {
     return ret;
   } else {
 #if defined(GPR_BACKWARDS_COMPATIBILITY_MODE) && defined(__linux__)
-    /* avoid ABI problems by invoking syscalls directly */
+    // avoid ABI problems by invoking syscalls directly
     syscall(SYS_clock_gettime, clockid_for_gpr_clock[clock_type], &now);
 #else
     clock_gettime(clockid_for_gpr_clock[clock_type], &now);
@@ -82,7 +84,7 @@ static gpr_timespec now_impl(gpr_clock_type clock_type) {
   }
 }
 #else
-/* For some reason Apple's OSes haven't implemented clock_gettime. */
+// For some reason Apple's OSes haven't implemented clock_gettime.
 
 #include <mach/mach.h>
 #include <mach/mach_time.h>
@@ -113,7 +115,10 @@ static gpr_timespec now_impl(gpr_clock_type clock) {
       now.tv_nsec = now_tv.tv_usec * 1000;
       break;
     case GPR_CLOCK_MONOTONIC:
-      now_dbl = ((double)(mach_absolute_time() - g_time_start)) * g_time_scale;
+      // Add 5 seconds arbitrarily: avoids weird conditions in gprpp/time.cc
+      // when there's a small number of seconds returned.
+      now_dbl = 5.0e9 +
+                ((double)(mach_absolute_time() - g_time_start)) * g_time_scale;
       now.tv_sec = (int64_t)(now_dbl * 1e-9);
       now.tv_nsec = (int32_t)(now_dbl - ((double)now.tv_sec) * 1e9);
       break;
@@ -158,8 +163,8 @@ void gpr_sleep_until(gpr_timespec until) {
   int ns_result;
 
   for (;;) {
-    /* We could simplify by using clock_nanosleep instead, but it might be
-     * slightly less portable. */
+    // We could simplify by using clock_nanosleep instead, but it might be
+    // slightly less portable.
     now = gpr_now(until.clock_type);
     if (gpr_time_cmp(until, now) <= 0) {
       return;
@@ -174,4 +179,4 @@ void gpr_sleep_until(gpr_timespec until) {
   }
 }
 
-#endif /* GPR_POSIX_TIME */
+#endif  // GPR_POSIX_TIME

data/src/core/lib/gpr/time_precise.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>
 
@@ -25,11 +25,11 @@
 
 #include <algorithm>
 
-#include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gpr/time_precise.h"
+#include "src/core/lib/gprpp/crash.h"
 
 #ifndef GPR_CYCLE_COUNTER_CUSTOM
 #if GPR_CYCLE_COUNTER_RDTSC_32 || GPR_CYCLE_COUNTER_RDTSC_64
@@ -54,7 +54,7 @@ static bool read_freq_from_kernel(double* freq) {
   close(fd);
   return ret;
 }
-#endif /* GPR_LINUX */
+#endif  // GPR_LINUX
 
 static double cycles_per_second = 0;
 static gpr_cycle_counter start_cycle;
@@ -79,7 +79,7 @@ void gpr_precise_clock_init(void) {
     start_cycle = gpr_get_cycle_counter();
     return;
   }
-#endif /* GPR_LINUX */
+#endif  // GPR_LINUX
 
   if (is_fake_clock()) {
     cycles_per_second = 1;
@@ -164,5 +164,5 @@ gpr_timespec gpr_cycle_counter_sub(gpr_cycle_counter a, gpr_cycle_counter b) {
   return gpr_time_sub(gpr_cycle_counter_to_time(a),
                       gpr_cycle_counter_to_time(b));
 }
-#endif /* GPR_CYCLE_COUNTER_FALLBACK */
-#endif /* !GPR_CYCLE_COUNTER_CUSTOM */
+#endif  // GPR_CYCLE_COUNTER_FALLBACK
+#endif  // !GPR_CYCLE_COUNTER_CUSTOM

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

@@ -1,27 +1,26 @@
-/*
- *
- * 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_TIME_PRECISE_H
 #define GRPC_CORE_LIB_GPR_TIME_PRECISE_H
 
 #include <grpc/support/port_platform.h>
 
-#include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/support/time.h>
 
 // Depending on the platform gpr_get_cycle_counter() can have a resolution as
@@ -67,4 +66,4 @@ void gpr_precise_clock_now(gpr_timespec* clk);
 gpr_timespec gpr_cycle_counter_to_time(gpr_cycle_counter cycles);
 gpr_timespec gpr_cycle_counter_sub(gpr_cycle_counter a, gpr_cycle_counter b);
 
-#endif /* GRPC_CORE_LIB_GPR_TIME_PRECISE_H */
+#endif  // GRPC_CORE_LIB_GPR_TIME_PRECISE_H

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

@@ -1,22 +1,22 @@
-/*
- *
- * 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.
+//
+//
 
-/* Win32 code for gpr time support. */
+// Win32 code for gpr time support.
 
 #include <grpc/support/port_platform.h>
 
@@ -30,6 +30,7 @@
 #include <grpc/support/time.h>
 
 #include "src/core/lib/gpr/time_precise.h"
+#include "src/core/lib/gprpp/crash.h"
 
 static LARGE_INTEGER g_start_time = []() {
   LARGE_INTEGER x;
@@ -61,7 +62,9 @@ static gpr_timespec now_impl(gpr_clock_type clock) {
     case GPR_CLOCK_PRECISE:
       QueryPerformanceCounter(&timestamp);
       diff = timestamp.QuadPart - g_start_time.QuadPart;
-      now_dbl = (double)diff * g_time_scale;
+      // Add an arbitrary 5 seconds to the monotonic clock so we don't
+      // immediately return close to zero.
+      now_dbl = 5.0 + (double)diff * g_time_scale;
       now_tv.tv_sec = (int64_t)now_dbl;
       now_tv.tv_nsec = (int32_t)((now_dbl - (double)now_tv.tv_sec) * 1e9);
       break;
@@ -84,8 +87,8 @@ void gpr_sleep_until(gpr_timespec until) {
   int64_t sleep_millis;
 
   for (;;) {
-    /* We could simplify by using clock_nanosleep instead, but it might be
-     * slightly less portable. */
+    // We could simplify by using clock_nanosleep instead, but it might be
+    // slightly less portable.
     now = gpr_now(until.clock_type);
     if (gpr_time_cmp(until, now) <= 0) {
       return;
@@ -99,4 +102,4 @@ void gpr_sleep_until(gpr_timespec until) {
   }
 }
 
-#endif /* GPR_WINDOWS_TIME */
+#endif  // GPR_WINDOWS_TIME

data/src/core/lib/gpr/tmpfile.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_TMPFILE_H
 #define GRPC_CORE_LIB_GPR_TMPFILE_H
@@ -23,10 +23,10 @@
 
 #include <stdio.h>
 
-/* Creates a temporary file from a prefix.
-   If tmp_filename is not NULL, *tmp_filename is assigned the name of the
-   created file and it is the responsibility of the caller to gpr_free it
-   unless an error occurs in which case it will be set to NULL. */
+// Creates a temporary file from a prefix.
+// If tmp_filename is not NULL, *tmp_filename is assigned the name of the
+// created file and it is the responsibility of the caller to gpr_free it
+// unless an error occurs in which case it will be set to NULL.
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename);
 
-#endif /* GRPC_CORE_LIB_GPR_TMPFILE_H */
+#endif  // GRPC_CORE_LIB_GPR_TMPFILE_H

data/src/core/lib/gpr/tmpfile_msys.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>
 
@@ -31,6 +31,7 @@
 
 #include "src/core/lib/gpr/string_windows.h"
 #include "src/core/lib/gpr/tmpfile.h"
+#include "src/core/lib/gprpp/crash.h"
 
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) {
   FILE* result = NULL;
@@ -39,12 +40,12 @@ FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) {
 
   if (tmp_filename_out != NULL) *tmp_filename_out = NULL;
 
-  /* Generate a unique filename with our template + temporary path. */
+  // Generate a unique filename with our template + temporary path.
   success = GetTempFileNameA(".", prefix, 0, tmp_filename);
   fprintf(stderr, "success = %d\n", success);
 
   if (success) {
-    /* Open a file there. */
+    // Open a file there.
     result = fopen(tmp_filename, "wb+");
     fprintf(stderr, "result = %p\n", result);
   }
@@ -55,4 +56,4 @@ FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) {
   return result;
 }
 
-#endif /* GPR_MSYS_TMPFILE */
+#endif  // GPR_MSYS_TMPFILE

data/src/core/lib/gpr/tmpfile_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>
 
@@ -31,6 +31,8 @@
 
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/tmpfile.h"
+#include "src/core/lib/gprpp/crash.h"
+#include "src/core/lib/gprpp/strerror.h"
 
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename) {
   FILE* result = nullptr;
@@ -45,13 +47,13 @@ FILE* gpr_tmpfile(const char* prefix, char** tmp_filename) {
   fd = mkstemp(filename_template);
   if (fd == -1) {
     gpr_log(GPR_ERROR, "mkstemp failed for filename_template %s with error %s.",
-            filename_template, strerror(errno));
+            filename_template, grpc_core::StrError(errno).c_str());
     goto end;
   }
   result = fdopen(fd, "w+");
   if (result == nullptr) {
     gpr_log(GPR_ERROR, "Could not open file %s from fd %d (error = %s).",
-            filename_template, fd, strerror(errno));
+            filename_template, fd, grpc_core::StrError(errno).c_str());
     unlink(filename_template);
     close(fd);
     goto end;
@@ -66,4 +68,4 @@ end:
   return result;
 }
 
-#endif /* GPR_POSIX_TMPFILE */
+#endif  // GPR_POSIX_TMPFILE

data/src/core/lib/gpr/tmpfile_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,6 +30,7 @@
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/gpr/tmpfile.h"
+#include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/tchar.h"
 
 FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) {
@@ -41,18 +42,18 @@ FILE* gpr_tmpfile(const char* prefix, char** tmp_filename_out) {
 
   if (tmp_filename_out != NULL) *tmp_filename_out = NULL;
 
-  /* Convert our prefix to TCHAR. */
+  // Convert our prefix to TCHAR.
   grpc_core::TcharString template_string = grpc_core::CharToTchar(prefix);
 
-  /* Get the path to the best temporary folder available. */
+  // Get the path to the best temporary folder available.
   status = GetTempPath(MAX_PATH, tmp_path);
   if (status == 0 || status > MAX_PATH) goto end;
 
-  /* Generate a unique filename with our template + temporary path. */
+  // Generate a unique filename with our template + temporary path.
   success = GetTempFileName(tmp_path, template_string.c_str(), 0, tmp_filename);
   if (!success) goto end;
 
-  /* Open a file there. */
+  // Open a file there.
   if (_tfopen_s(&result, tmp_filename, TEXT("wb+")) != 0) goto end;
 
 end:
@@ -64,4 +65,4 @@ end:
   return result;
 }
 
-#endif /* GPR_WINDOWS_TMPFILE */
+#endif  // GPR_WINDOWS_TMPFILE