Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
Improve regen performance by setting cpu affinity
Test: m nothing (with new ckati prebuilt)
Change-Id: I90eee540ad65b330d2d3f833e1bc7dc775102fff
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 @@
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 @@
});
tp->Submit([this]() {
+ SetAffinityForSingleThread();
for (ShellResult* sr : commands_) {
string err;
if (CheckShellResult(sr, &err)) {
