Commit 72e3d1a8 authored by Sami Kyostila's avatar Sami Kyostila Committed by Commit Bot

crypto: Always specify thread affinity when posting tasks

*** Note: There is no behavior change from this patch. ***

The PostTask APIs will shortly be changed to require all tasks to explicitly
specify their thread affinity, i.e., whether the task should run on the thread
pool or a specific named thread such as a BrowserThread. This patch updates all
call sites with thread affinity annotation. We also remove the "WithTraits"
suffix to make the call sites more readable.

Before:

    // Thread pool task.
    base::PostTaskWithTraits(FROM_HERE, {...}, ...);

    // UI thread task.
    base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI, ...}, ...);

After:

    // Thread pool task.
    base::PostTask(FROM_HERE, {base::ThreadPool(), ...}, ...);

    // UI thread task.
    base::PostTask(FROM_HERE, {BrowserThread::UI, ...}, ...);

This patch was semi-automatically prepared with these steps:

    1. Patch in https://chromium-review.googlesource.com/c/chromium/src/+/1635827
       to make thread affinity a build-time requirement.
    2. Run an initial pass with a clang rewriter:
       https://chromium-review.googlesource.com/c/chromium/src/+/1635623
    3. ninja -C out/Debug | grep 'requested here' | cut -d: -f1-3 | sort | \
           uniq > errors.txt
    4. while read line; do
         f=$(echo $line | cut -d: -f 1)
         r=$(echo $line | cut -d: -f 2)
         c=$(echo $line | cut -d: -f 3)
         sed -i "${r}s/./&base::ThreadPool(),/$c" $f
       done < errors.txt
    5. GOTO 3 until build succeeds.
    6. Remove the "WithTraits" suffix from task API call sites:

       $ tools/git/mffr.py -i <(cat <<EOF
       [
         ["PostTaskWithTraits",                            "PostTask"],
         ["PostDelayedTaskWithTraits",                     "PostDelayedTask"],
         ["PostTaskWithTraitsAndReply",                    "PostTaskAndReply"],
         ["CreateTaskRunnerWithTraits",                    "CreateTaskRunner"],
         ["CreateSequencedTaskRunnerWithTraits",           "CreateSequencedTaskRunner"],
         ["CreateUpdateableSequencedTaskRunnerWithTraits", "CreateUpdateableSequencedTaskRunner"],
         ["CreateSingleThreadTaskRunnerWithTraits",        "CreateSingleThreadTaskRunner"],
         ["CreateCOMSTATaskRunnerWithTraits",              "CreateCOMSTATaskRunner"]
       ]
       EOF
       )

This CL was uploaded by git cl split.

R=davidben@chromium.org

Bug: 968047
Change-Id: Ibcfcb0491d7c78c55f2c5ea250b94f276293cd4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728881
Auto-Submit: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: default avatarDavid Benjamin <davidben@chromium.org>
Commit-Queue: David Benjamin <davidben@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682726}
parent 7f22a163
...@@ -319,9 +319,10 @@ class NSSInitSingleton { ...@@ -319,9 +319,10 @@ class NSSInitSingleton {
std::unique_ptr<TPMModuleAndSlot> tpm_args( std::unique_ptr<TPMModuleAndSlot> tpm_args(
new TPMModuleAndSlot(chaps_module_)); new TPMModuleAndSlot(chaps_module_));
TPMModuleAndSlot* tpm_args_ptr = tpm_args.get(); TPMModuleAndSlot* tpm_args_ptr = tpm_args.get();
base::PostTaskWithTraitsAndReply( base::PostTaskAndReply(
FROM_HERE, FROM_HERE,
{base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, {base::ThreadPool(), base::MayBlock(),
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
base::BindOnce(&NSSInitSingleton::InitializeTPMTokenInThreadPool, base::BindOnce(&NSSInitSingleton::InitializeTPMTokenInThreadPool,
system_slot_id, tpm_args_ptr), system_slot_id, tpm_args_ptr),
base::BindOnce(&NSSInitSingleton::OnInitializedTPMTokenAndSystemSlot, base::BindOnce(&NSSInitSingleton::OnInitializedTPMTokenAndSystemSlot,
...@@ -482,9 +483,10 @@ class NSSInitSingleton { ...@@ -482,9 +483,10 @@ class NSSInitSingleton {
std::unique_ptr<TPMModuleAndSlot> tpm_args( std::unique_ptr<TPMModuleAndSlot> tpm_args(
new TPMModuleAndSlot(chaps_module_)); new TPMModuleAndSlot(chaps_module_));
TPMModuleAndSlot* tpm_args_ptr = tpm_args.get(); TPMModuleAndSlot* tpm_args_ptr = tpm_args.get();
base::PostTaskWithTraitsAndReply( base::PostTaskAndReply(
FROM_HERE, FROM_HERE,
{base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, {base::ThreadPool(), base::MayBlock(),
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
base::BindOnce(&NSSInitSingleton::InitializeTPMTokenInThreadPool, base::BindOnce(&NSSInitSingleton::InitializeTPMTokenInThreadPool,
slot_id, tpm_args_ptr), slot_id, tpm_args_ptr),
base::BindOnce(&NSSInitSingleton::OnInitializedTPMForChromeOSUser, base::BindOnce(&NSSInitSingleton::OnInitializedTPMForChromeOSUser,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment