zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support really large numbers on 64-bit architectures; first try.

This commit is contained in:
Hisham Muhammad 2014-04-09 22:32:54 -03:00
parent 19b438de10
commit 127f847ca5
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Process.c
View File

@ -141,13 +141,13 @@ typedef struct Process_ {
#endif #endif
int processor; int processor;
int m_size; long m_size;
int m_resident; long m_resident;
int m_share; long m_share;
int m_trs; long m_trs;
int m_drs; long m_drs;
int m_lrs; long m_lrs;
int m_dt; long m_dt;
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
unsigned int ctid; unsigned int ctid;
@ -325,11 +325,21 @@ void Process_getMaxPid() {
#define ONE_DECIMAL_K 1000 #define ONE_DECIMAL_K 1000
#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K) #define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
static void Process_humanNumber(Process* this, RichString* str, unsigned long number) { static void Process_humanNumber(Process* this, RichString* str, unsigned long number) {
char buffer[11]; char buffer[11];
int len; int len;
if(number >= (10 * ONE_DECIMAL_M)) { if(number >= (10 * ONE_DECIMAL_M)) {
#ifdef __LP64__
if(number >= (100 * ONE_DECIMAL_G)) {
len = snprintf(buffer, 10, "%4ldT ", number / ONE_G);
RichString_appendn(str, CRT_colors[LARGE_NUMBER], buffer, len);
} else if (number >= (10 * ONE_DECIMAL_G)) {
len = snprintf(buffer, 10, "%3.1fT ", (float)number / ONE_M);
RichString_appendn(str, CRT_colors[LARGE_NUMBER], buffer, len);
} else
#endif
if(number >= (100 * ONE_DECIMAL_M)) { if(number >= (100 * ONE_DECIMAL_M)) {
len = snprintf(buffer, 10, "%4ldG ", number / ONE_M); len = snprintf(buffer, 10, "%4ldG ", number / ONE_M);
RichString_appendn(str, CRT_colors[LARGE_NUMBER], buffer, len); RichString_appendn(str, CRT_colors[LARGE_NUMBER], buffer, len);

15
Process.h
View File

@ -120,13 +120,13 @@ typedef struct Process_ {
#endif #endif
int processor; int processor;
int m_size; long m_size;
int m_resident; long m_resident;
int m_share; long m_share;
int m_trs; long m_trs;
int m_drs; long m_drs;
int m_lrs; long m_lrs;
int m_dt; long m_dt;
#ifdef HAVE_OPENVZ #ifdef HAVE_OPENVZ
unsigned int ctid; unsigned int ctid;
@ -188,6 +188,7 @@ void Process_getMaxPid();
#define ONE_DECIMAL_K 1000 #define ONE_DECIMAL_K 1000
#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K) #define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
void Process_delete(Object* cast); void Process_delete(Object* cast);