Merge remote-tracking branch 'aosp/upstream'

am: 667d0786cf

Change-Id: I8c9c756152a5a9240b9487582d11879577858552

1 files changed, 3 insertions, 0 deletions

diff --git a/regen.cc b/regen.cc
index b6c2872..4374f81 100644
--- a/regen.cc
+++ b/regen.cc
@@ -23,6 +23,7 @@
 #include <mutex>
 #include <vector>
 
+#include "affinity.h"
 #include "fileutil.h"
 #include "find.h"
 #include "func.h"
@@ -429,6 +430,7 @@ class StampChecker {
     tp->Submit([this]() {
       string err;
       // TODO: Make glob cache thread safe and create a task for each glob.
+      SetAffinityForSingleThread();
       for (GlobResult* gr : globs_) {
         if (CheckGlobResult(gr, &err)) {
           unique_lock<mutex> lock(mu_);
@@ -442,6 +444,7 @@ class StampChecker {
     });
 
     tp->Submit([this]() {
+      SetAffinityForSingleThread();
       for (ShellResult* sr : commands_) {
         string err;
         if (CheckShellResult(sr, &err)) {