summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Sekletar <msekleta@redhat.com>2019-05-31 18:02:20 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2019-12-05 15:17:20 +0100
commitb90f935f8d2268522480a7c12f7e2213a7a5e19d (patch)
tree7ab58704d1a2d05eff5bd0f1493e8475f556462d
parentcabd9055d0d745f7de9625dec6c623d363dd3aa6 (diff)
downloadsystemd-b90f935f8d2268522480a7c12f7e2213a7a5e19d.tar.gz
execute: dump CPUAffinity as a range string instead of a list of CPUs
We do this already when printing the property in systemctl so be consistent and do the same for systemd-analyze dump. (cherry picked from commit e7fca352ba43988682a927de6b1f629b3f10a415) Related: #1734787
-rw-r--r--src/core/execute.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/execute.c b/src/core/execute.c
index 22e5825905..bc26aa66e7 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -4098,11 +4098,10 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
}
if (c->cpu_set.set) {
- fprintf(f, "%sCPUAffinity:", prefix);
- for (i = 0; i < c->cpu_set.allocated * 8; i++)
- if (CPU_ISSET_S(i, c->cpu_set.allocated, c->cpu_set.set))
- fprintf(f, " %u", i);
- fputs("\n", f);
+ _cleanup_free_ char *affinity = NULL;
+
+ affinity = cpu_set_to_range_string(&c->cpu_set);
+ fprintf(f, "%sCPUAffinity: %s\n", prefix, affinity);
}
if (c->timer_slack_nsec != NSEC_INFINITY)