diff options
| author | Eugene V. Lyubimkin <jackyf@debian.org> | 2011-11-26 15:58:33 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-04-11 13:00:30 +0200 |
| commit | c65eb8be811f59b55d64d9e7654c33708de79ad9 (patch) | |
| tree | ee6e542b988263c49f0e1200d6aa5aa635667fe8 /ProcessList.h | |
| parent | 38174fffd79f54a8be7642bf170a2320b29e8063 (diff) | |
| parent | eaf11cc12a1aa4b050a8a1e7ea3770d3d9c81e95 (diff) | |
| download | debian_htop-debian/1.0-1.tar.gz debian_htop-debian/1.0-1.tar.bz2 debian_htop-debian/1.0-1.zip | |
Imported Debian patch 1.0-1debian/1.0-1
Diffstat (limited to 'ProcessList.h')
| -rw-r--r-- | ProcessList.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/ProcessList.h b/ProcessList.h index fdbf420..641a08c 100644 --- a/ProcessList.h +++ b/ProcessList.h @@ -56,7 +56,26 @@ in the source distribution for its full text. #define MAX_READ 2048 #endif +#ifndef ProcessList_cpuId +#define ProcessList_cpuId(pl, cpu) ((pl)->countCPUsFromZero ? (cpu) : (cpu)+1) +#endif +typedef enum TreeStr_ { + TREE_STR_HORZ, + TREE_STR_VERT, + TREE_STR_RTEE, + TREE_STR_BEND, + TREE_STR_TEND, + TREE_STR_OPEN, + TREE_STR_SHUT, + TREE_STR_COUNT +} TreeStr; + +typedef enum TreeType_ { + TREE_TYPE_AUTO, + TREE_TYPE_ASCII, + TREE_TYPE_UTF8, +} TreeType; typedef struct CPUData_ { unsigned long long int totalTime; @@ -98,6 +117,10 @@ typedef struct ProcessList_ { int kernelThreads; int runningTasks; + #ifdef HAVE_LIBHWLOC + hwloc_topology_t topology; + bool topologyOk; + #endif CPUData* cpus; unsigned long long int totalMem; @@ -124,9 +147,16 @@ typedef struct ProcessList_ { bool highlightMegabytes; bool highlightThreads; bool detailedCPUTime; + bool countCPUsFromZero; + const char **treeStr; } ProcessList; + +extern const char *ProcessList_treeStrAscii[TREE_STR_COUNT]; + +extern const char *ProcessList_treeStrUtf8[TREE_STR_COUNT]; + ProcessList* ProcessList_new(UsersTable* usersTable); void ProcessList_delete(ProcessList* this); |