Skip to contentSkip to conversation

tools/sched_ext: Remove dead -d option in scx_flatcg

PATCH Applied Cheng-Yang Chou 2 participants 2 messages Apr 19 Scheduler - sched_ext

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tools/sched_ext: Remove dead -d option in scx_flatcg

The -d option was non-functional, only toggling a variable that was echoed in the status line but never used to dump the cgroup hierarchy. Remove the option to avoid documenting dead code as a feature.

---
Changes in v2:
- Remove dead -d option, since this is non-functional (Tejun Heo)
- Link to v1:
https://lore.kernel.org/r/[email protected]/

 tools/sched_ext/scx_flatcg.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
tools/sched_ext/scx_flatcg.c +4 -8
index d865c381589b..de2bef86d64d 100644
@@ -130,7 +130,6 @@ int main(int argc, char **argv)
 	struct scx_flatcg *skel;
 	struct bpf_link *link;
 	struct timespec intv_ts = { .tv_sec = 2, .tv_nsec = 0 };
-	bool dump_cgrps = false;
 	__u64 last_cpu_sum = 0, last_cpu_idle = 0;
 	__u64 last_stats[FCG_NR_STATS] = {};
 	unsigned long seq = 0;
@@ -148,7 +147,7 @@ int main(int argc, char **argv)
 	assert(skel->rodata->nr_cpus > 0);
 	skel->rodata->cgrp_slice_ns = __COMPAT_ENUM_OR_ZERO("scx_public_consts", "SCX_SLICE_DFL");
 
-	while ((opt = getopt(argc, argv, "s:i:dfvh")) != -1) {
+	while ((opt = getopt(argc, argv, "s:i:fvh")) != -1) {
 		double v;
 
 		switch (opt) {
@@ -161,9 +160,6 @@ int main(int argc, char **argv)
 			intv_ts.tv_sec = v;
 			intv_ts.tv_nsec = (v - (float)intv_ts.tv_sec) * 1000000000;
 			break;
-		case 'd':
-			dump_cgrps = true;
-			break;
 		case 'f':
 			skel->rodata->fifo_sched = true;
 			break;
@@ -177,10 +173,10 @@ int main(int argc, char **argv)
 		}
 	}
 
-	printf("slice=%.1lfms intv=%.1lfs dump_cgrps=%d",
+	printf("slice=%.1lfms intv=%.1lfs",
 	       (double)skel->rodata->cgrp_slice_ns / 1000000.0,
-	       (double)intv_ts.tv_sec + (double)intv_ts.tv_nsec / 1000000000.0,
-	       dump_cgrps);
+	       (double)intv_ts.tv_sec + (double)intv_ts.tv_nsec / 1000000000.0);
+
 
 	SCX_OPS_LOAD(skel, flatcg_ops, scx_flatcg, uei);
 	link = SCX_OPS_ATTACH(skel, flatcg_ops, scx_flatcg);
Signature · 1 line
2.48.1
reviewer Applied
#1 lore raw

Hello,

Applied to sched_ext/for-7.2.

Thanks.

Signature · 1 line
tejun