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

Build fixes to resync with FreeBSD changes.

This commit is contained in:
Hisham Muhammad 2015-03-16 23:03:40 -03:00
parent 272e2d9b34
commit 4e064e0db7
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/LinuxProcess.h
View File

@ -43,7 +43,6 @@ typedef enum LinuxProcessFields {
STIME = 15, STIME = 15,
CUTIME = 16, CUTIME = 16,
CSTIME = 17, CSTIME = 17,
PROCESSOR = 38,
M_SHARE = 41, M_SHARE = 41,
M_TRS = 42, M_TRS = 42,
M_DRS = 43, M_DRS = 43,
@ -89,7 +88,6 @@ typedef struct LinuxProcess_ {
unsigned long long int stime; unsigned long long int stime;
unsigned long long int cutime; unsigned long long int cutime;
unsigned long long int cstime; unsigned long long int cstime;
int processor;
long m_share; long m_share;
long m_trs; long m_trs;
long m_drs; long m_drs;

12
linux/LinuxProcessList.c
View File

@ -212,7 +212,7 @@ static bool LinuxProcessList_readStatFile(Process *process, const char* dirname,
process->exit_signal = strtol(location, &location, 10); process->exit_signal = strtol(location, &location, 10);
location += 1; location += 1;
assert(location != NULL); assert(location != NULL);
lp->processor = strtol(location, &location, 10); process->processor = strtol(location, &location, 10);
process->time = lp->utime + lp->stime; process->time = lp->utime + lp->stime;
@ -597,22 +597,22 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
goto errorReadingProcess; goto errorReadingProcess;
} }
if (Process_isKernelThread(proc)) { if (Process_isKernelThread(proc)) {
this->kernelThreads++; pl->kernelThreads++;
} else { } else {
this->userlandThreads++; pl->userlandThreads++;
} }
} }
this->totalTasks++; pl->totalTasks++;
if (proc->state == 'R') if (proc->state == 'R')
this->runningTasks++; pl->runningTasks++;
proc->updated = true; proc->updated = true;
continue; continue;
// Exception handler. // Exception handler.
errorReadingProcess: { errorReadingProcess: {
if (preExisting) { if (preExisting) {
ProcessList_remove((pl, proc); ProcessList_remove(pl, proc);
} else { } else {
Process_delete((Object*)proc); Process_delete((Object*)proc);
} }

8
linux/LinuxProcessList.h
View File

@ -43,11 +43,6 @@ typedef struct CPUData_ {
typedef struct LinuxProcessList_ { typedef struct LinuxProcessList_ {
ProcessList super; ProcessList super;
int totalTasks;
int userlandThreads;
int kernelThreads;
int runningTasks;
CPUData* cpus; CPUData* cpus;
} LinuxProcessList; } LinuxProcessList;
@ -90,7 +85,6 @@ void ProcessList_delete(ProcessList* pl);
#endif #endif
void ProcessList_scan(ProcessList* super); void ProcessList_goThroughEntries(ProcessList* super);
#endif #endif

2
linux/Platform.h
View File

@ -34,6 +34,4 @@ void Platform_setMemoryValues(Meter* this);
void Platform_setSwapValues(Meter* this); void Platform_setSwapValues(Meter* this);
void Platform_setTasksValues(Meter* this);
#endif #endif