diff options
author | Hisham Muhammad <hisham@gobolinux.org> | 2010-10-30 19:30:19 +0000 |
---|---|---|
committer | Hisham Muhammad <hisham@gobolinux.org> | 2010-10-30 19:30:19 +0000 |
commit | 45de5694aca131cff17c6fa6bc81e1530a24634a (patch) | |
tree | e8dd55d5f7bbb2b262cef5fb8494a49a0fc113e5 | |
parent | 84ed4c01f6a5551caf94b16aac7c116e5ff67825 (diff) |
no need to pad values; provide a default on machines without cgroup
-rw-r--r-- | Process.h | 6 | ||||
-rw-r--r-- | ProcessList.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -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; diff --git a/ProcessList.c b/ProcessList.c index dfd5ce9f..a958055e 100644 --- a/ProcessList.c +++ b/ProcessList.c @@ -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 |