From 13a488818337df01c7d28e59509f016f0ee48458 Mon Sep 17 00:00:00 2001 From: Yash Tibrewal Date: Mon, 8 Feb 2021 14:51:06 -0800 Subject: [PATCH] Remove disrespectful terms --- src/core/lib/iomgr/timer_generic.cc | 4 ++-- tools/run_tests/performance/remote_host_prepare.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 153fb1d5bf3..c4e961af995 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -409,7 +409,7 @@ static void timer_init(grpc_timer* timer, grpc_millis deadline, } gpr_mu_unlock(&shard->mu); - /* Deadline may have decreased, we need to adjust the master queue. Note + /* Deadline may have decreased, we need to adjust the main queue. Note that there is a potential racy unlocked region here. There could be a reordering of multiple grpc_timer_init calls, at this point, but the < test below should ensure that we err on the side of caution. There could @@ -639,7 +639,7 @@ static grpc_timer_check_result run_some_expired_timers(grpc_millis now, /* An grpc_timer_init() on the shard could intervene here, adding a new timer that is earlier than new_min_deadline. However, - grpc_timer_init() will block on the master_lock before it can call + grpc_timer_init() will block on the mutex before it can call set_min_deadline, so this one will complete first and then the Addtimer will reduce the min_deadline (perhaps unnecessarily). */ g_shard_queue[0]->min_deadline = new_min_deadline; diff --git a/tools/run_tests/performance/remote_host_prepare.sh b/tools/run_tests/performance/remote_host_prepare.sh index 685c4357c9b..2a7c5e7502a 100755 --- a/tools/run_tests/performance/remote_host_prepare.sh +++ b/tools/run_tests/performance/remote_host_prepare.sh @@ -18,7 +18,7 @@ set -ex cd "$(dirname "$0")/../../.." # TODO(jtattermusch): To be sure there are no running processes that would -# mess with the results, be rough and reboot the slave here +# mess with the results, be rough and reboot the worker here # and wait for it to come back online. ssh "${USER_AT_HOST}" "killall -9 qps_worker dotnet mono node ruby worker || true" @@ -29,7 +29,7 @@ ssh "${USER_AT_HOST}" "ps -e | egrep 'qps_worker|dotnet' | awk '{print \$1}' | x # cleanup after previous builds ssh "${USER_AT_HOST}" "rm -rf ~/performance_workspace && mkdir -p ~/performance_workspace" -# push the current sources to the slave and unpack it. +# push the current sources to the worker and unpack it. scp ../grpc.tar "${USER_AT_HOST}:~/performance_workspace" # Windows workaround: attempt to untar twice, first run is going to fail # with symlink creation error(s).