From b1bcdc88e061e656fc9bb3509d115795934e0cd8 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 8 Apr 2021 13:17:40 +0200
Subject: [PATCH] initctl: fix ordering issue for root task in ps/top/cgroup
 commands

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/cgutil.c | 106 +++++++++++++++++++++++++--------------------------
 1 file changed, 52 insertions(+), 54 deletions(-)

diff --git a/src/cgutil.c b/src/cgutil.c
index ca97028d..2a601a07 100644
--- a/src/cgutil.c
+++ b/src/cgutil.c
@@ -408,58 +408,6 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
 		puts(row);
 	}
 
-	n = scandir(path, &namelist, cgroup_filter, alphasort);
-	if (n > 0) {
-		for (i = 0; i < n; i++) {
-			char *nm = namelist[i]->d_name;
-			char prefix[80];
-
-			snprintf(buf, sizeof(buf), "%s/%s", path, nm);
-			switch (mode) {
-			case 1:
-				cg = cg_stats(buf);
-				snprintf(row, rplen,
-					 " %6.6s  %6.6s  %6.6s %5.1f %5.1f  ",
-					 memsz(cg->cg_vmsize, s, sizeof(s)),
-					 memsz(cg->cg_rss,    r, sizeof(r)),
-					 memsz(cg->cg_vmlib,  l, sizeof(l)),
-					 cg->cg_memshare, cg->cg_load);
-				break;
-			case 2:
-				cg = cg_conf(buf);
-				snprintf(row, rplen, "%6.6s [%-6.6s%6.6s] %6.6s [%-6.6s%6.6s] ",
-					 memsz(cg->cg_vmsize, s, sizeof(s)),
-					 cg->cg_mem.min, cg->cg_mem.max,
-					 cg->cg_cpu.set, cg->cg_cpu.weight, cg->cg_cpu.max);
-				break;
-			default:
-				row[0] = 0;
-				break;
-			}
-
-			strlcat(row, pfx, rplen);
-			if (i + 1 == n) {
-				strlcat(row, END, rplen);
-				snprintf(prefix, sizeof(prefix), "%s   ", pfx);
-			} else {
-				strlcat(row, FORK, rplen);
-				snprintf(prefix, sizeof(prefix), "%s%s  ", pfx, PIPE);
-			}
-			strlcat(row, " ", rplen);
-
-			strlcat(row, nm,   rplen);
-			strlcat(row, "/ ", rplen);
-
-			puts(row);
-
-			rc += cgroup_tree(buf, prefix, mode, pos + i);
-
-			free(namelist[i]);
-		}
-
-		free(namelist);
-	}
-
 	if (num > 0) {
 		rewind(fp);
 
@@ -517,12 +465,62 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
 					break;
 			}
 		}
-
-		return fclose(fp);
 	}
 
 	fclose(fp);
 
+	n = scandir(path, &namelist, cgroup_filter, alphasort);
+	if (n > 0) {
+		for (i = 0; i < n; i++) {
+			char *nm = namelist[i]->d_name;
+			char prefix[80];
+
+			snprintf(buf, sizeof(buf), "%s/%s", path, nm);
+			switch (mode) {
+			case 1:
+				cg = cg_stats(buf);
+				snprintf(row, rplen,
+					 " %6.6s  %6.6s  %6.6s %5.1f %5.1f  ",
+					 memsz(cg->cg_vmsize, s, sizeof(s)),
+					 memsz(cg->cg_rss,    r, sizeof(r)),
+					 memsz(cg->cg_vmlib,  l, sizeof(l)),
+					 cg->cg_memshare, cg->cg_load);
+				break;
+			case 2:
+				cg = cg_conf(buf);
+				snprintf(row, rplen, "%6.6s [%-6.6s%6.6s] %6.6s [%-6.6s%6.6s] ",
+					 memsz(cg->cg_vmsize, s, sizeof(s)),
+					 cg->cg_mem.min, cg->cg_mem.max,
+					 cg->cg_cpu.set, cg->cg_cpu.weight, cg->cg_cpu.max);
+				break;
+			default:
+				row[0] = 0;
+				break;
+			}
+
+			strlcat(row, pfx, rplen);
+			if (i + 1 == n) {
+				strlcat(row, END, rplen);
+				snprintf(prefix, sizeof(prefix), "%s   ", pfx);
+			} else {
+				strlcat(row, FORK, rplen);
+				snprintf(prefix, sizeof(prefix), "%s%s  ", pfx, PIPE);
+			}
+			strlcat(row, " ", rplen);
+
+			strlcat(row, nm,   rplen);
+			strlcat(row, "/ ", rplen);
+
+			puts(row);
+
+			rc += cgroup_tree(buf, prefix, mode, pos + i);
+
+			free(namelist[i]);
+		}
+
+		free(namelist);
+	}
+
 	return rc;
 }