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

attempt to return to upstream/master

This commit is contained in:
Martin "eto" Misuth 2015-10-06 19:39:01 +02:00
parent 2379835910
commit 3ea7b34735
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SignalsPanel.c
View File

@ -14,6 +14,7 @@ in the source distribution for its full text.
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <signal.h>
#include <ctype.h> #include <ctype.h>
@ -28,9 +29,16 @@ typedef struct SignalItem_ {
Panel* SignalsPanel_new() { Panel* SignalsPanel_new() {
Panel* this = Panel_new(1, 1, 1, 1, true, Class(ListItem), FunctionBar_newEnterEsc("Send ", "Cancel ")); Panel* this = Panel_new(1, 1, 1, 1, true, Class(ListItem), FunctionBar_newEnterEsc("Send ", "Cancel "));
for(unsigned int i = 0; i < Platform_numberOfSignals; i++) const int defaultSignal = SIGTERM;
int defaultPosition = 15;
for(unsigned int i = 0; i < Platform_numberOfSignals; i++) {
Panel_set(this, i, (Object*) ListItem_new(Platform_signals[i].name, Platform_signals[i].number)); Panel_set(this, i, (Object*) ListItem_new(Platform_signals[i].name, Platform_signals[i].number));
// signal 15 is not always the 15th signal in the table
if (Platform_signals[i].number == defaultSignal) {
defaultPosition = i;
}
}
Panel_setHeader(this, "Send signal:"); Panel_setHeader(this, "Send signal:");
Panel_setSelected(this, DEFAULT_SIGNAL); Panel_setSelected(this, defaultPosition);
return this; return this;
} }

20
freebsd/Platform.c
View File

@ -31,11 +31,13 @@ in the source distribution for its full text.
extern ProcessFieldData Process_fields[]; extern ProcessFieldData Process_fields[];
#ifndef DEFAULT_SIGNAL }*/
#define DEFAULT_SIGNAL 15
#endif
static SignalItem Platform_signals[] = { ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
int Platform_numberOfFields = LAST_PROCESSFIELD;
SignalItem Platform_signals[] = {
{ .name = " 0 Cancel", .number = 0 }, { .name = " 0 Cancel", .number = 0 },
{ .name = " 1 SIGHUP", .number = 1 }, { .name = " 1 SIGHUP", .number = 1 },
{ .name = " 2 SIGINT", .number = 2 }, { .name = " 2 SIGINT", .number = 2 },
@ -72,12 +74,6 @@ static SignalItem Platform_signals[] = {
{ .name = "33 SIGLIBRT", .number = 33 }, { .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); unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem);
void Platform_setBindings(Htop_Action* keys) { void Platform_setBindings(Htop_Action* keys) {
@ -109,7 +105,7 @@ int Platform_getUptime() {
struct timeval bootTime, currTime; struct timeval bootTime, currTime;
int mib[2] = { CTL_KERN, KERN_BOOTTIME }; int mib[2] = { CTL_KERN, KERN_BOOTTIME };
size_t size = sizeof(bootTime); size_t size = sizeof(bootTime);
int err = sysctl(mib, 2, &bootTime, &size, NULL, 0); int err = sysctl(mib, 2, &bootTime, &size, NULL, 0);
if (err) { if (err) {
return -1; return -1;
@ -123,7 +119,7 @@ void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
struct loadavg loadAverage; struct loadavg loadAverage;
int mib[2] = { CTL_VM, VM_LOADAVG }; int mib[2] = { CTL_VM, VM_LOADAVG };
size_t size = sizeof(loadAverage); size_t size = sizeof(loadAverage);
int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0); int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0);
if (err) { if (err) {
*one = 0; *one = 0;