aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2019-01-08 17:28:13 +0100
committerGravatar GitHub <noreply@github.com>2019-01-08 17:28:13 +0100
commit8efa3347fe0fdcb5379bba85f7f7963a288ccdc1 (patch)
tree4638fb970f9997fbbe347a40cbfd32c803b9ea98
parent1730c06c482e7f46f59eef254af74d03ca896955 (diff)
parent5a6c984d3ab6084a092173a6c19eb52c5aae8414 (diff)
Merge pull request #17656 from chwarr/comment-typos
Fix typos in comments
-rw-r--r--include/grpc/impl/codegen/grpc_types.h2
-rw-r--r--src/ruby/ext/grpc/rb_channel.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index 610548b5f3..5d577eb855 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -163,7 +163,7 @@ typedef struct {
/** Maximum time that a channel may exist. Int valued, milliseconds.
* INT_MAX means unlimited. */
#define GRPC_ARG_MAX_CONNECTION_AGE_MS "grpc.max_connection_age_ms"
-/** Grace period after the chennel reaches its max age. Int valued,
+/** Grace period after the channel reaches its max age. Int valued,
milliseconds. INT_MAX means unlimited. */
#define GRPC_ARG_MAX_CONNECTION_AGE_GRACE_MS "grpc.max_connection_age_grace_ms"
/** Enable/disable support for per-message compression. Defaults to 1, unless
diff --git a/src/ruby/ext/grpc/rb_channel.c b/src/ruby/ext/grpc/rb_channel.c
index 6d4b2293a2..5bde962f78 100644
--- a/src/ruby/ext/grpc/rb_channel.c
+++ b/src/ruby/ext/grpc/rb_channel.c
@@ -153,7 +153,7 @@ static void grpc_rb_channel_free(void* p) {
if (ch->bg_wrapped != NULL) {
/* assumption made here: it's ok to directly gpr_mu_lock the global
- * connection polling mutex becuse we're in a finalizer,
+ * connection polling mutex because we're in a finalizer,
* and we can count on this thread to not be interrupted or
* yield the gil. */
grpc_rb_channel_safe_destroy(ch->bg_wrapped);
@@ -292,7 +292,7 @@ static void* get_state_without_gil(void* arg) {
Indicates the current state of the channel, whose value is one of the
constants defined in GRPC::Core::ConnectivityStates.
- It also tries to connect if the chennel is idle in the second form. */
+ It also tries to connect if the channel is idle in the second form. */
static VALUE grpc_rb_channel_get_connectivity_state(int argc, VALUE* argv,
VALUE self) {
VALUE try_to_connect_param = Qfalse;
@@ -327,8 +327,8 @@ static void* wait_for_watch_state_op_complete_without_gvl(void* arg) {
void* success = (void*)0;
gpr_mu_lock(&global_connection_polling_mu);
- // its unsafe to do a "watch" after "channel polling abort" because the cq has
- // been shut down.
+ // it's unsafe to do a "watch" after "channel polling abort" because the cq
+ // has been shut down.
if (abort_channel_polling || stack->bg_wrapped->channel_destroyed) {
gpr_mu_unlock(&global_connection_polling_mu);
return (void*)0;