Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
htop
Commits
23798359
Commit
23798359
authored
Oct 06, 2015
by
Martin "eto" Misuth
Browse files
Added platform dependent DEFAULT_SIGNAL define, for now for:
FreeBSD Linux Other platforms will have it undefined for now.
parent
86417e41
Changes
3
Hide whitespace changes
Inline
Side-by-side
SignalsPanel.c
View file @
23798359
...
...
@@ -31,6 +31,6 @@ Panel* SignalsPanel_new() {
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_setHeader
(
this
,
"Send signal:"
);
Panel_setSelected
(
this
,
16
);
// 16th item is SIGTERM
Panel_setSelected
(
this
,
DEFAULT_SIGNAL
);
return
this
;
}
freebsd/Platform.c
View file @
23798359
...
...
@@ -31,6 +31,10 @@ in the source distribution for its full text.
extern ProcessFieldData Process_fields[];
#ifndef DEFAULT_SIGNAL
#define DEFAULT_SIGNAL 15
#endif
static SignalItem Platform_signals[] = {
{ .name = " 0 Cancel", .number = 0 },
{ .name = " 1 SIGHUP", .number = 1 },
...
...
linux/Platform.c
View file @
23798359
...
...
@@ -32,6 +32,11 @@ in the source distribution for its full text.
#include "BatteryMeter.h"
#include "LinuxProcess.h"
#include "SignalsPanel.h"
#ifndef DEFAULT_SIGNAL
#define DEFAULT_SIGNAL 16
#endif
}*/
ProcessField
Platform_defaultFields
[]
=
{
PID
,
USER
,
PRIORITY
,
NICE
,
M_SIZE
,
M_RESIDENT
,
M_SHARE
,
STATE
,
PERCENT_CPU
,
PERCENT_MEM
,
TIME
,
COMM
,
0
};
...
...
@@ -176,14 +181,14 @@ double Platform_setCPUValues(Meter* this, int cpu) {
percent
=
v
[
0
]
+
v
[
1
]
+
v
[
2
]
+
v
[
3
]
+
v
[
4
]
+
v
[
5
]
+
v
[
6
];
}
else
{
percent
=
v
[
0
]
+
v
[
1
]
+
v
[
2
]
+
v
[
3
]
+
v
[
4
];
}
}
}
else
{
v
[
2
]
=
cpuData
->
systemAllPeriod
/
total
*
100
.
0
;
v
[
3
]
=
(
cpuData
->
stealPeriod
+
cpuData
->
guestPeriod
)
/
total
*
100
.
0
;
Meter_setItems
(
this
,
4
);
percent
=
v
[
0
]
+
v
[
1
]
+
v
[
2
]
+
v
[
3
];
}
percent
=
MIN
(
100
.
0
,
MAX
(
0
.
0
,
percent
));
percent
=
MIN
(
100
.
0
,
MAX
(
0
.
0
,
percent
));
if
(
isnan
(
percent
))
percent
=
0
.
0
;
return
percent
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment