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

Fail travis CI on compiler warnings

This commit is contained in:
Christian Göttsche 2020-09-08 16:17:31 +02:00 committed by cgzones
parent 475f729a36
commit efb971f9df
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -9,4 +9,9 @@ os:
- linux - linux
- osx - osx
script: ./autogen.sh && ./configure && make script:
- ./autogen.sh
# clang might warn about C11 generic selections in isnan()
- CFLAGS=-Wno-c11-extensions ./configure --enable-werror
- make
- CFLAGS=-Wno-c11-extensions make distcheck DISTCHECK_CONFIGURE_FLAGS=--enable-werror

1
darwin/DarwinProcessList.c
View File

@ -115,7 +115,6 @@ struct kinfo_proc *ProcessList_getKInfoProcs(size_t *count) {
} }
ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, uid_t userId) { ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidMatchList, uid_t userId) {
size_t len;
DarwinProcessList* this = xCalloc(1, sizeof(DarwinProcessList)); DarwinProcessList* this = xCalloc(1, sizeof(DarwinProcessList));
ProcessList_init(&this->super, Class(Process), usersTable, pidMatchList, userId); ProcessList_init(&this->super, Class(Process), usersTable, pidMatchList, userId);

4
darwin/Platform.c
View File

@ -263,11 +263,11 @@ char* Platform_getProcessEnv(pid_t pid) {
mib[0] = CTL_KERN; mib[0] = CTL_KERN;
mib[1] = KERN_PROCARGS2; mib[1] = KERN_PROCARGS2;
mib[2] = pid; mib[2] = pid;
size_t bufsz = argmax; bufsz = argmax;
if (sysctl(mib, 3, buf, &bufsz, 0, 0) == 0) { if (sysctl(mib, 3, buf, &bufsz, 0, 0) == 0) {
if (bufsz > sizeof(int)) { if (bufsz > sizeof(int)) {
char *p = buf, *endp = buf + bufsz; char *p = buf, *endp = buf + bufsz;
int argc = *(int*)p; int argc = *(int*)(void*)p;
p += sizeof(int); p += sizeof(int);
// skip exe // skip exe

17
freebsd/FreeBSDProcessList.c
View File

@ -391,7 +391,7 @@ void ProcessList_goThroughEntries(ProcessList* this) {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
struct kinfo_proc* kproc = &kprocs[i]; struct kinfo_proc* kproc = &kprocs[i];
bool preExisting = false; bool preExisting = false;
bool isIdleProcess = false; // TODO: bool isIdleProcess = false;
struct tm date; struct tm date;
Process* proc = ProcessList_getProcess(this, kproc->ki_pid, &preExisting, (Process_New) FreeBSDProcess_new); Process* proc = ProcessList_getProcess(this, kproc->ki_pid, &preExisting, (Process_New) FreeBSDProcess_new);
FreeBSDProcess* fp = (FreeBSDProcess*) proc; FreeBSDProcess* fp = (FreeBSDProcess*) proc;
@ -449,12 +449,15 @@ void ProcessList_goThroughEntries(ProcessList* this) {
proc->percent_cpu = 100.0 * ((double)kproc->ki_pctcpu / (double)kernelFScale); proc->percent_cpu = 100.0 * ((double)kproc->ki_pctcpu / (double)kernelFScale);
proc->percent_mem = 100.0 * (proc->m_resident * PAGE_SIZE_KB) / (double)(this->totalMem); proc->percent_mem = 100.0 * (proc->m_resident * PAGE_SIZE_KB) / (double)(this->totalMem);
if (proc->percent_cpu > 0.1) { /*
// system idle process should own all CPU time left regardless of CPU count * TODO
if ( strcmp("idle", kproc->ki_comm) == 0 ) { * if (proc->percent_cpu > 0.1) {
isIdleProcess = true; * // system idle process should own all CPU time left regardless of CPU count
} * if ( strcmp("idle", kproc->ki_comm) == 0 ) {
} * isIdleProcess = true;
* }
* }
*/
proc->priority = kproc->ki_pri.pri_level - PZERO; proc->priority = kproc->ki_pri.pri_level - PZERO;