wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-31 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

initctl: fix flickering in 'top' and handle smaller screens

Browse Source 
Drop clear screen to fix flickering in 'initctl top' output.  Also, make
sure to not garble the display if the the terminal is too small.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2025-12-15 22:04:34 +01:00
1 parent 2eefaa5db6
commit 8422d2715c
1 file changed
+35 -20
Download Patch File Download Diff File Expand all files Collapse all files
src/cgutil.c
+35 -20
View File
@@ -40,8 +40,9 @@
#include "initctl.h" #include "initctl.h"
#include "log.h" #include "log.h"
#define CDIM plain ? "" : "\e[2m" #define CDIM plain ? "" : "\e[2m"
#define CRST plain ? "" : "\e[0m" #define CRST plain ? "" : "\e[0m"
#define CLREOL plain ? "" : "\e[K" /* Clear to end of line */
#define NONE " " #define NONE " "
#define PIPE plain ? "| " : "│ " #define PIPE plain ? "| " : "│ "
@@ -421,25 +422,24 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
struct stat st; struct stat st;
struct cg *cg; struct cg *cg;
char buf[512]; char buf[512];
int rc = 0;
FILE *fp; FILE *fp;
int i, n; int i, n;
int num; int num;
if (pos >= ttrows) if (pos >= ttrows - 1)
return 0; return pos;
if (-1 == lstat(path, &st)) if (-1 == lstat(path, &st))
return 1; return pos;
if ((st.st_mode & S_IFMT) != S_IFDIR) { if ((st.st_mode & S_IFMT) != S_IFDIR) {
errno = ENOTDIR; errno = ENOTDIR;
return -1; return pos;
} }
fp = fopenf("r", "%s/cgroup.procs", path); fp = fopenf("r", "%s/cgroup.procs", path);
if (!fp) if (!fp)
return -1; return pos;
num = 0; num = 0;
while (fgets(buf, sizeof(buf), fp)) while (fgets(buf, sizeof(buf), fp))
num++; num++;
@@ -468,7 +468,10 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
break; break;
} }
puts(row); printf("%s%s\n", row, CLREOL);
pos++;
if (pos >= ttrows - 1)
goto out;
} }
if (num > 0) { if (num > 0) {
@@ -520,19 +523,18 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
strlcat(row, CRST, sizeof(row)); strlcat(row, CRST, sizeof(row));
} }
puts(row); printf("%s%s\n", row, CLREOL);
pos++;
free(cmdline); free(cmdline);
}
if (mode == 1) { if (pos >= ttrows - 1)
pos += i;
if (pos >= ttrows)
break; break;
} }
} }
} }
out:
fclose(fp); fclose(fp);
n = scandir(path, &namelist, cgroup_filter, alphasort); n = scandir(path, &namelist, cgroup_filter, alphasort);
@@ -541,6 +543,9 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
char *nm = namelist[i]->d_name; char *nm = namelist[i]->d_name;
char prefix[80]; char prefix[80];
if (pos >= ttrows - 1)
break;
snprintf(buf, sizeof(buf), "%s/%s", path, nm); snprintf(buf, sizeof(buf), "%s/%s", path, nm);
switch (mode) { switch (mode) {
case 1: case 1:
@@ -577,9 +582,10 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
strlcat(row, nm, rplen); strlcat(row, nm, rplen);
strlcat(row, "/ ", rplen); strlcat(row, "/ ", rplen);
puts(row); printf("%s%s\n", row, CLREOL);
pos++;
rc += cgroup_tree(buf, prefix, mode, pos + i); pos = cgroup_tree(buf, prefix, mode, pos);
free(namelist[i]); free(namelist[i]);
} }
@@ -587,7 +593,7 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
free(namelist); free(namelist);
} }
return rc; return pos;
} }
int show_cgps(char *arg) int show_cgps(char *arg)
@@ -606,13 +612,22 @@ int show_cgps(char *arg)
static void cgtop(uev_t *w, void *arg, int events) static void cgtop(uev_t *w, void *arg, int events)
{ {
int lines;
(void)w; (void)w;
(void)events; (void)events;
fputs("\e[2J\e[1;1H", stdout); /* Move cursor to home instead of clearing screen to avoid flicker */
if (heading) fputs("\e[H", stdout);
lines = 0;
if (heading) {
print_header(" VmSIZE RSS VmLIB %%MEM %%CPU GROUP"); print_header(" VmSIZE RSS VmLIB %%MEM %%CPU GROUP");
cgroup_tree(arg, NULL, 1, 0); lines = 1;
}
cgroup_tree(arg, NULL, 1, lines);
/* Clear from cursor to end of screen to remove leftover lines */
fputs("\e[J", stdout);
fflush(stdout);
} }
static void cleanup(void) static void cleanup(void)