diff options
author | Martin "eto" Misuth <et.code@ethome.sk> | 2015-10-06 19:39:01 +0200 |
---|---|---|
committer | Martin "eto" Misuth <et.code@ethome.sk> | 2015-10-06 19:39:01 +0200 |
commit | 3ea7b3473583c15747d36323c1b1db4ee5cdc4e6 (patch) | |
tree | 5a6b5857cd8009d8fa0ef4a716ccaa7a37198c24 /freebsd | |
parent | 23798359102a70c662d095722c96229b605175dc (diff) |
attempt to return to upstream/master
Diffstat (limited to 'freebsd')
-rw-r--r-- | freebsd/Platform.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/freebsd/Platform.c b/freebsd/Platform.c index 566a6097..b1703291 100644 --- a/freebsd/Platform.c +++ b/freebsd/Platform.c @@ -31,11 +31,13 @@ in the source distribution for its full text. extern ProcessFieldData Process_fields[]; -#ifndef DEFAULT_SIGNAL -#define DEFAULT_SIGNAL 15 -#endif +}*/ + +ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; -static SignalItem Platform_signals[] = { +int Platform_numberOfFields = LAST_PROCESSFIELD; + +SignalItem Platform_signals[] = { { .name = " 0 Cancel", .number = 0 }, { .name = " 1 SIGHUP", .number = 1 }, { .name = " 2 SIGINT", .number = 2 }, @@ -72,12 +74,6 @@ static SignalItem Platform_signals[] = { { .name = "33 SIGLIBRT", .number = 33 }, }; -}*/ - -ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; - -int Platform_numberOfFields = LAST_PROCESSFIELD; - unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); void Platform_setBindings(Htop_Action* keys) { @@ -109,7 +105,7 @@ int Platform_getUptime() { struct timeval bootTime, currTime; int mib[2] = { CTL_KERN, KERN_BOOTTIME }; size_t size = sizeof(bootTime); - + int err = sysctl(mib, 2, &bootTime, &size, NULL, 0); if (err) { return -1; @@ -123,7 +119,7 @@ void Platform_getLoadAverage(double* one, double* five, double* fifteen) { struct loadavg loadAverage; int mib[2] = { CTL_VM, VM_LOADAVG }; size_t size = sizeof(loadAverage); - + int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0); if (err) { *one = 0; |