mirror of
https://github.com/xzeldon/htop.git
synced 2024-12-23 22:55:46 +00:00
no need to pad values; provide a default on machines without cgroup
This commit is contained in:
parent
84ed4c01f6
commit
45de5694ac
@ -65,6 +65,9 @@ typedef enum ProcessField_ {
|
||||
#ifdef HAVE_TASKSTATS
|
||||
RCHAR, WCHAR, SYSCR, SYSCW, RBYTES, WBYTES, CNCLWB, IO_READ_RATE, IO_WRITE_RATE, IO_RATE,
|
||||
#endif
|
||||
#ifdef HAVE_CGROUP
|
||||
CGROUP,
|
||||
#endif
|
||||
LAST_PROCESSFIELD
|
||||
} ProcessField;
|
||||
|
||||
@ -155,6 +158,9 @@ typedef struct Process_ {
|
||||
double io_rate_write_bps;
|
||||
unsigned long long io_rate_write_time;
|
||||
#endif
|
||||
#ifdef HAVE_CGROUP
|
||||
char* cgroup;
|
||||
#endif
|
||||
} Process;
|
||||
|
||||
|
||||
|
@ -653,12 +653,12 @@ static bool ProcessList_processEntries(ProcessList* this, const char* dirname, P
|
||||
char** fields = String_split(trimmed, ':');
|
||||
free(trimmed);
|
||||
|
||||
char* value = String_cat(fields[2], " ");
|
||||
process->cgroup = strndup(fields[2] + 1, 10);
|
||||
String_freeArray(fields);
|
||||
process->cgroup = strndup(value + 1, 10);
|
||||
free(value);
|
||||
}
|
||||
fclose(status);
|
||||
} else {
|
||||
process->cgroup = strdup("");
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user