diff options
author | Kuang-che Wu <kcwu@google.com> | 2024-10-22 21:04:41 +0800 |
---|---|---|
committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-10-23 23:34:34 +0000 |
commit | 8da4861b3860c505e39341b4135c21f67569e4d8 (patch) | |
tree | 6f300266c91322df0e61953b84381e1f403074a5 /subcmds/diff.py | |
parent | 39ffd9977e2f6cb1ca1757e59173fc93e0eab72c (diff) | |
download | git-repo-8da4861b3860c505e39341b4135c21f67569e4d8.tar.gz |
subcmds: reduce multiprocessing serialization overhead
Follow the same approach as 39ffd9977e to reduce serialization overhead.
Below benchmarks are tested with 2.7k projects on my workstation
(warm cache). git tracing is disabled for benchmark.
(seconds) | v2.48 | v2.48 | this CL | this CL
| | -j32 | | -j32
-----------------------------------------------------------
with clean tree state:
branches (none) | 5.6 | 5.9 | 1.0 | 0.9
status (clean) | 21.3 | 9.4 | 19.4 | 4.7
diff (none) | 7.6 | 7.2 | 5.7 | 2.2
prune (none) | 5.7 | 6.1 | 1.3 | 1.2
abandon (none) | 19.4 | 18.6 | 0.9 | 0.8
upload (none) | 19.7 | 18.7 | 0.9 | 0.8
forall -c true | 7.5 | 7.6 | 0.6 | 0.6
forall -c "git log -1" | 11.3 | 11.1 | 0.6 | 0.6
with branches:
start BRANCH --all | 21.9 | 20.3 | 13.6 | 2.6
checkout BRANCH | 29.1 | 27.8 | 1.1 | 1.0
branches (2) | 28.0 | 28.6 | 1.5 | 1.3
abandon BRANCH | 29.2 | 27.5 | 9.7 | 2.2
Bug: b/371638995
Change-Id: I53989a3d1e43063587b3f52f852b1c2c56b49412
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/440221
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Tested-by: Kuang-che Wu <kcwu@google.com>
Commit-Queue: Kuang-che Wu <kcwu@google.com>
Diffstat (limited to 'subcmds/diff.py')
-rw-r--r-- | subcmds/diff.py | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/subcmds/diff.py b/subcmds/diff.py index d9d72b40..7bb0cbbd 100644 --- a/subcmds/diff.py +++ b/subcmds/diff.py | |||
@@ -40,7 +40,8 @@ to the Unix 'patch' command. | |||
40 | help="paths are relative to the repository root", | 40 | help="paths are relative to the repository root", |
41 | ) | 41 | ) |
42 | 42 | ||
43 | def _ExecuteOne(self, absolute, local, project): | 43 | @classmethod |
44 | def _ExecuteOne(cls, absolute, local, project_idx): | ||
44 | """Obtains the diff for a specific project. | 45 | """Obtains the diff for a specific project. |
45 | 46 | ||
46 | Args: | 47 | Args: |
@@ -48,12 +49,13 @@ to the Unix 'patch' command. | |||
48 | local: a boolean, if True, the path is relative to the local | 49 | local: a boolean, if True, the path is relative to the local |
49 | (sub)manifest. If false, the path is relative to the outermost | 50 | (sub)manifest. If false, the path is relative to the outermost |
50 | manifest. | 51 | manifest. |
51 | project: Project to get status of. | 52 | project_idx: Project index to get status of. |
52 | 53 | ||
53 | Returns: | 54 | Returns: |
54 | The status of the project. | 55 | The status of the project. |
55 | """ | 56 | """ |
56 | buf = io.StringIO() | 57 | buf = io.StringIO() |
58 | project = cls.get_parallel_context()["projects"][project_idx] | ||
57 | ret = project.PrintWorkTreeDiff(absolute, output_redir=buf, local=local) | 59 | ret = project.PrintWorkTreeDiff(absolute, output_redir=buf, local=local) |
58 | return (ret, buf.getvalue()) | 60 | return (ret, buf.getvalue()) |
59 | 61 | ||
@@ -71,12 +73,15 @@ to the Unix 'patch' command. | |||
71 | ret = 1 | 73 | ret = 1 |
72 | return ret | 74 | return ret |
73 | 75 | ||
74 | return self.ExecuteInParallel( | 76 | with self.ParallelContext(): |
75 | opt.jobs, | 77 | self.get_parallel_context()["projects"] = all_projects |
76 | functools.partial( | 78 | return self.ExecuteInParallel( |
77 | self._ExecuteOne, opt.absolute, opt.this_manifest_only | 79 | opt.jobs, |
78 | ), | 80 | functools.partial( |
79 | all_projects, | 81 | self._ExecuteOne, opt.absolute, opt.this_manifest_only |
80 | callback=_ProcessResults, | 82 | ), |
81 | ordered=True, | 83 | range(len(all_projects)), |
82 | ) | 84 | callback=_ProcessResults, |
85 | ordered=True, | ||
86 | chunksize=1, | ||
87 | ) | ||