diff options
| author | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:25 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:25 +0200 |
| commit | 1767b21eb219fb9ac332aca9f7c3abecd97b6b39 (patch) | |
| tree | 95ac07953f40ebbd6a674024ad4fc6b9f952e1f9 /ProcessList.c | |
| parent | c74c38760df69bb87e93dff18cf91464e5d02f37 (diff) | |
| download | debian_htop-1767b21eb219fb9ac332aca9f7c3abecd97b6b39.tar.gz debian_htop-1767b21eb219fb9ac332aca9f7c3abecd97b6b39.tar.bz2 debian_htop-1767b21eb219fb9ac332aca9f7c3abecd97b6b39.zip | |
Imported Upstream version 0.8.1+svn149upstream/0.8.1+svn149
Diffstat (limited to 'ProcessList.c')
| -rw-r--r-- | ProcessList.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ProcessList.c b/ProcessList.c index 839660d..24e0810 100644 --- a/ProcessList.c +++ b/ProcessList.c @@ -563,9 +563,7 @@ static bool ProcessList_processEntries(ProcessList* this, char* dirname, Process process->pid = pid; } } - if (parent) { - process->tgid = parent->pid; - } + process->tgid = parent ? parent->pid : pid; if (showUserlandThreads && (!parent || pid != parent->pid)) { char subdirname[MAX_NAME+1]; @@ -623,7 +621,7 @@ static bool ProcessList_processEntries(ProcessList* this, char* dirname, Process #ifdef HAVE_OPENVZ if (access("/proc/vz", R_OK) != 0) { process->vpid = process->pid; - process->veid = 0; + process->ctid = 0; } else { snprintf(statusfilename, MAX_NAME, "%s/%s/stat", dirname, name); status = ProcessList_fopen(this, statusfilename, "r"); @@ -636,8 +634,8 @@ static bool ProcessList_processEntries(ProcessList* this, char* dirname, Process "%*u %*u %*u %*u %*u %*u %*u %*u " "%*u %*u %*u %*u %*u %*u %*u %*u " "%*u %*u %*u %*u %*u %*u %*u " - "%u %u", - &process->vpid, &process->veid); + "%*u %*u %u %u", + &process->vpid, &process->ctid); fclose(status); } #endif @@ -698,7 +696,7 @@ static bool ProcessList_processEntries(ProcessList* this, char* dirname, Process period * 100.0; process->percent_cpu = MAX(MIN(percent_cpu, processors*100.0), 0.0); - process->percent_mem = (process->m_resident * PAGE_SIZE) / + process->percent_mem = (process->m_resident * PAGE_SIZE_KB) / (float)(this->totalMem) * 100.0; |