Commit 457ea6d6 authored by Sami Kyostila's avatar Sami Kyostila Committed by Commit Bot

chrome/browser/mac: 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://crrev.com/c/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=rsesek@chromium.org

Bug: 968047
Change-Id: Ia108448a6cc6ffdcee488ef32c4d9fa77f3839a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739707
Auto-Submit: Sami Kyöstilä <skyostil@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Commit-Queue: Sami Kyöstilä <skyostil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684421}
parent 8ef02f70
...@@ -85,10 +85,11 @@ class PerformBridge : public base::RefCountedThreadSafe<PerformBridge> { ...@@ -85,10 +85,11 @@ class PerformBridge : public base::RefCountedThreadSafe<PerformBridge> {
DCHECK(sel); DCHECK(sel);
scoped_refptr<PerformBridge> op = new PerformBridge(target, sel, arg); scoped_refptr<PerformBridge> op = new PerformBridge(target, sel, arg);
base::PostTaskWithTraits(FROM_HERE, base::PostTask(
{base::MayBlock(), base::TaskPriority::BEST_EFFORT, FROM_HERE,
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::BEST_EFFORT,
base::BindOnce(&PerformBridge::Run, op.get())); base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
base::BindOnce(&PerformBridge::Run, op.get()));
} }
// Convenience for the no-argument case. // Convenience for the no-argument case.
......
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