Review feedback

pull/11888/head
Craig Tiller 8 years ago
parent 203977925c
commit 2e37d001a3
  1. 2
      BUILD
  2. 2
      build.yaml
  3. 4
      gRPC-Core.podspec
  4. 2
      grpc.gemspec
  5. 2
      package.xml
  6. 15
      src/core/ext/filters/max_age/max_age_filter.c
  7. 0
      src/core/lib/iomgr/block_annotate.h
  8. 2
      src/core/lib/iomgr/ev_epoll1_linux.c
  9. 2
      src/core/lib/iomgr/ev_epoll_limited_pollers_linux.c
  10. 2
      src/core/lib/iomgr/ev_epoll_thread_pool_linux.c
  11. 2
      src/core/lib/iomgr/ev_epollex_linux.c
  12. 2
      src/core/lib/iomgr/ev_epollsig_linux.c
  13. 2
      src/core/lib/iomgr/ev_poll_posix.c
  14. 2
      src/core/lib/iomgr/load_file.c
  15. 2
      src/core/lib/iomgr/resolve_address_posix.c
  16. 2
      src/core/lib/iomgr/resolve_address_windows.c
  17. 2
      src/core/lib/support/time_posix.c
  18. 2
      src/core/lib/support/time_windows.c
  19. 1
      src/core/lib/surface/completion_queue.c
  20. 2
      tools/doxygen/Doxyfile.core.internal
  21. 4
      tools/run_tests/generated/sources_and_headers.json

@ -513,7 +513,7 @@ grpc_cc_library(
"src/core/lib/support/atomic_with_atm.h", "src/core/lib/support/atomic_with_atm.h",
"src/core/lib/support/atomic_with_std.h", "src/core/lib/support/atomic_with_std.h",
"src/core/lib/backoff/backoff.h", "src/core/lib/backoff/backoff.h",
"src/core/lib/support/block_annotate.h", "src/core/lib/iomgr/block_annotate.h",
"src/core/lib/support/env.h", "src/core/lib/support/env.h",
"src/core/lib/support/memory.h", "src/core/lib/support/memory.h",
"src/core/lib/support/mpscq.h", "src/core/lib/support/mpscq.h",

@ -93,7 +93,7 @@ filegroups:
- src/core/lib/support/atomic.h - src/core/lib/support/atomic.h
- src/core/lib/support/atomic_with_atm.h - src/core/lib/support/atomic_with_atm.h
- src/core/lib/support/atomic_with_std.h - src/core/lib/support/atomic_with_std.h
- src/core/lib/support/block_annotate.h - src/core/lib/iomgr/block_annotate.h
- src/core/lib/support/env.h - src/core/lib/support/env.h
- src/core/lib/support/memory.h - src/core/lib/support/memory.h
- src/core/lib/support/mpscq.h - src/core/lib/support/mpscq.h

@ -186,7 +186,7 @@ Pod::Spec.new do |s|
'src/core/lib/support/atomic.h', 'src/core/lib/support/atomic.h',
'src/core/lib/support/atomic_with_atm.h', 'src/core/lib/support/atomic_with_atm.h',
'src/core/lib/support/atomic_with_std.h', 'src/core/lib/support/atomic_with_std.h',
'src/core/lib/support/block_annotate.h', 'src/core/lib/iomgr/block_annotate.h',
'src/core/lib/support/env.h', 'src/core/lib/support/env.h',
'src/core/lib/support/memory.h', 'src/core/lib/support/memory.h',
'src/core/lib/support/mpscq.h', 'src/core/lib/support/mpscq.h',
@ -714,7 +714,7 @@ Pod::Spec.new do |s|
'src/core/lib/support/atomic.h', 'src/core/lib/support/atomic.h',
'src/core/lib/support/atomic_with_atm.h', 'src/core/lib/support/atomic_with_atm.h',
'src/core/lib/support/atomic_with_std.h', 'src/core/lib/support/atomic_with_std.h',
'src/core/lib/support/block_annotate.h', 'src/core/lib/iomgr/block_annotate.h',
'src/core/lib/support/env.h', 'src/core/lib/support/env.h',
'src/core/lib/support/memory.h', 'src/core/lib/support/memory.h',
'src/core/lib/support/mpscq.h', 'src/core/lib/support/mpscq.h',

@ -86,7 +86,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/lib/support/atomic.h ) s.files += %w( src/core/lib/support/atomic.h )
s.files += %w( src/core/lib/support/atomic_with_atm.h ) s.files += %w( src/core/lib/support/atomic_with_atm.h )
s.files += %w( src/core/lib/support/atomic_with_std.h ) s.files += %w( src/core/lib/support/atomic_with_std.h )
s.files += %w( src/core/lib/support/block_annotate.h ) s.files += %w( src/core/lib/iomgr/block_annotate.h )
s.files += %w( src/core/lib/support/env.h ) s.files += %w( src/core/lib/support/env.h )
s.files += %w( src/core/lib/support/memory.h ) s.files += %w( src/core/lib/support/memory.h )
s.files += %w( src/core/lib/support/mpscq.h ) s.files += %w( src/core/lib/support/mpscq.h )

@ -100,7 +100,7 @@
<file baseinstalldir="/" name="src/core/lib/support/atomic.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/atomic.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/atomic_with_atm.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/atomic_with_atm.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/atomic_with_std.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/atomic_with_std.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/block_annotate.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/iomgr/block_annotate.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/env.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/env.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/memory.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/memory.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/support/mpscq.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/support/mpscq.h" role="src" />

@ -245,7 +245,8 @@ static void channel_connectivity_changed(grpc_exec_ctx* exec_ctx, void* arg,
connection storms. Note that the MAX_CONNECTION_AGE option without jitter connection storms. Note that the MAX_CONNECTION_AGE option without jitter
would not create connection storms by itself, but if there happened to be a would not create connection storms by itself, but if there happened to be a
connection storm it could cause it to repeat at a fixed period. */ connection storm it could cause it to repeat at a fixed period. */
static int add_random_max_connection_age_jitter(int value) { static grpc_millis
add_random_max_connection_age_jitter_and_convert_to_grpc_millis(int value) {
/* generate a random number between 1 - MAX_CONNECTION_AGE_JITTER and /* generate a random number between 1 - MAX_CONNECTION_AGE_JITTER and
1 + MAX_CONNECTION_AGE_JITTER */ 1 + MAX_CONNECTION_AGE_JITTER */
double multiplier = rand() * MAX_CONNECTION_AGE_JITTER * 2.0 / RAND_MAX + double multiplier = rand() * MAX_CONNECTION_AGE_JITTER * 2.0 / RAND_MAX +
@ -253,7 +254,8 @@ static int add_random_max_connection_age_jitter(int value) {
double result = multiplier * value; double result = multiplier * value;
/* INT_MAX - 0.5 converts the value to float, so that result will not be /* INT_MAX - 0.5 converts the value to float, so that result will not be
cast to int implicitly before the comparison. */ cast to int implicitly before the comparison. */
return result > INT_MAX - 0.5 ? INT_MAX : (int)result; return result > GRPC_MILLIS_INF_FUTURE - 0.5 ? GRPC_MILLIS_INF_FUTURE
: (int)result;
} }
/* Constructor for call_data. */ /* Constructor for call_data. */
@ -283,9 +285,8 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx,
chand->max_age_grace_timer_pending = false; chand->max_age_grace_timer_pending = false;
chand->channel_stack = args->channel_stack; chand->channel_stack = args->channel_stack;
chand->max_connection_age = chand->max_connection_age =
DEFAULT_MAX_CONNECTION_AGE_MS == INT_MAX add_random_max_connection_age_jitter_and_convert_to_grpc_millis(
? GRPC_MILLIS_INF_FUTURE DEFAULT_MAX_CONNECTION_AGE_MS);
: add_random_max_connection_age_jitter(DEFAULT_MAX_CONNECTION_AGE_MS);
chand->max_connection_age_grace = chand->max_connection_age_grace =
DEFAULT_MAX_CONNECTION_AGE_GRACE_MS == INT_MAX DEFAULT_MAX_CONNECTION_AGE_GRACE_MS == INT_MAX
? GRPC_MILLIS_INF_FUTURE ? GRPC_MILLIS_INF_FUTURE
@ -299,8 +300,8 @@ static grpc_error* init_channel_elem(grpc_exec_ctx* exec_ctx,
const int value = grpc_channel_arg_get_integer( const int value = grpc_channel_arg_get_integer(
&args->channel_args->args[i], MAX_CONNECTION_AGE_INTEGER_OPTIONS); &args->channel_args->args[i], MAX_CONNECTION_AGE_INTEGER_OPTIONS);
chand->max_connection_age = chand->max_connection_age =
value == INT_MAX ? GRPC_MILLIS_INF_FUTURE add_random_max_connection_age_jitter_and_convert_to_grpc_millis(
: add_random_max_connection_age_jitter(value); value);
} else if (0 == strcmp(args->channel_args->args[i].key, } else if (0 == strcmp(args->channel_args->args[i].key,
GRPC_ARG_MAX_CONNECTION_AGE_GRACE_MS)) { GRPC_ARG_MAX_CONNECTION_AGE_GRACE_MS)) {
const int value = grpc_channel_arg_get_integer( const int value = grpc_channel_arg_get_integer(

@ -45,7 +45,7 @@
#include "src/core/lib/iomgr/lockfree_event.h" #include "src/core/lib/iomgr/lockfree_event.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
static grpc_wakeup_fd global_wakeup_fd; static grpc_wakeup_fd global_wakeup_fd;
static int g_epfd; static int g_epfd;

@ -47,7 +47,7 @@
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#include "src/core/lib/support/env.h" #include "src/core/lib/support/env.h"
#define GRPC_POLLING_TRACE(fmt, ...) \ #define GRPC_POLLING_TRACE(fmt, ...) \

@ -47,7 +47,7 @@
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
/* TODO: sreek - Move this to init.c and initialize this like other tracers. */ /* TODO: sreek - Move this to init.c and initialize this like other tracers. */
#define GRPC_POLLING_TRACE(fmt, ...) \ #define GRPC_POLLING_TRACE(fmt, ...) \

@ -46,7 +46,7 @@
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#include "src/core/lib/support/spinlock.h" #include "src/core/lib/support/spinlock.h"
/******************************************************************************* /*******************************************************************************

@ -46,7 +46,7 @@
#include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker *)1) #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker *)1)

@ -42,7 +42,7 @@
#include "src/core/lib/iomgr/wakeup_fd_cv.h" #include "src/core/lib/iomgr/wakeup_fd_cv.h"
#include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h"
#include "src/core/lib/profiling/timers.h" #include "src/core/lib/profiling/timers.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker *)1) #define GRPC_POLLSET_KICK_BROADCAST ((grpc_pollset_worker *)1)

@ -25,7 +25,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/string_util.h> #include <grpc/support/string_util.h>
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#include "src/core/lib/support/string.h" #include "src/core/lib/support/string.h"
grpc_error *grpc_load_file(const char *filename, int add_null_terminator, grpc_error *grpc_load_file(const char *filename, int add_null_terminator,

@ -36,7 +36,7 @@
#include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/executor.h"
#include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/iomgr_internal.h"
#include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#include "src/core/lib/support/string.h" #include "src/core/lib/support/string.h"
static grpc_error *blocking_resolve_address_impl( static grpc_error *blocking_resolve_address_impl(

@ -36,7 +36,7 @@
#include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/executor.h"
#include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/iomgr_internal.h"
#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/sockaddr_utils.h"
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#include "src/core/lib/support/string.h" #include "src/core/lib/support/string.h"
typedef struct { typedef struct {

@ -30,7 +30,7 @@
#include <grpc/support/atm.h> #include <grpc/support/atm.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
static struct timespec timespec_from_gpr(gpr_timespec gts) { static struct timespec timespec_from_gpr(gpr_timespec gts) {
struct timespec rv; struct timespec rv;

@ -28,7 +28,7 @@
#include <process.h> #include <process.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#include "src/core/lib/support/block_annotate.h" #include "src/core/lib/iomgr/block_annotate.h"
#include "src/core/lib/support/time_precise.h" #include "src/core/lib/support/time_precise.h"
static LARGE_INTEGER g_start_time; static LARGE_INTEGER g_start_time;

@ -1114,6 +1114,7 @@ static grpc_event cq_pluck(grpc_completion_queue *cq, void *tag,
dump_pending_tags(cq); dump_pending_tags(cq);
break; break;
} }
cq->num_polls++;
grpc_error *err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq), grpc_error *err = cq->poller_vtable->work(&exec_ctx, POLLSET_FROM_CQ(cq),
&worker, deadline_millis); &worker, deadline_millis);
if (err != GRPC_ERROR_NONE) { if (err != GRPC_ERROR_NONE) {

@ -1286,7 +1286,7 @@ src/core/lib/support/atomic.h \
src/core/lib/support/atomic_with_atm.h \ src/core/lib/support/atomic_with_atm.h \
src/core/lib/support/atomic_with_std.h \ src/core/lib/support/atomic_with_std.h \
src/core/lib/support/avl.c \ src/core/lib/support/avl.c \
src/core/lib/support/block_annotate.h \ src/core/lib/iomgr/block_annotate.h \
src/core/lib/support/cmdline.c \ src/core/lib/support/cmdline.c \
src/core/lib/support/cpu_iphone.c \ src/core/lib/support/cpu_iphone.c \
src/core/lib/support/cpu_linux.c \ src/core/lib/support/cpu_linux.c \

@ -7518,7 +7518,7 @@
"src/core/lib/support/atomic.h", "src/core/lib/support/atomic.h",
"src/core/lib/support/atomic_with_atm.h", "src/core/lib/support/atomic_with_atm.h",
"src/core/lib/support/atomic_with_std.h", "src/core/lib/support/atomic_with_std.h",
"src/core/lib/support/block_annotate.h", "src/core/lib/iomgr/block_annotate.h",
"src/core/lib/support/env.h", "src/core/lib/support/env.h",
"src/core/lib/support/memory.h", "src/core/lib/support/memory.h",
"src/core/lib/support/mpscq.h", "src/core/lib/support/mpscq.h",
@ -7574,7 +7574,7 @@
"src/core/lib/support/atomic_with_atm.h", "src/core/lib/support/atomic_with_atm.h",
"src/core/lib/support/atomic_with_std.h", "src/core/lib/support/atomic_with_std.h",
"src/core/lib/support/avl.c", "src/core/lib/support/avl.c",
"src/core/lib/support/block_annotate.h", "src/core/lib/iomgr/block_annotate.h",
"src/core/lib/support/cmdline.c", "src/core/lib/support/cmdline.c",
"src/core/lib/support/cpu_iphone.c", "src/core/lib/support/cpu_iphone.c",
"src/core/lib/support/cpu_linux.c", "src/core/lib/support/cpu_linux.c",

Loading…
Cancel
Save