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
db80f202
Commit
db80f202
authored
Mar 07, 2016
by
Hisham Muhammad
Browse files
Avoid global, as done by @gaod in #387.
parent
98e43816
Changes
2
Hide whitespace changes
Inline
Side-by-side
freebsd/FreeBSDProcessList.c
View file @
db80f202
...
@@ -86,9 +86,6 @@ static int MIB_kern_cp_time[2];
...
@@ -86,9 +86,6 @@ static int MIB_kern_cp_time[2];
static
int
MIB_kern_cp_times
[
2
];
static
int
MIB_kern_cp_times
[
2
];
static
int
kernelFScale
;
static
int
kernelFScale
;
// XXX hack
static
unsigned
long
long
int
Global_totalMem
;
ProcessList
*
ProcessList_new
(
UsersTable
*
usersTable
,
Hashtable
*
pidWhiteList
,
uid_t
userId
)
{
ProcessList
*
ProcessList_new
(
UsersTable
*
usersTable
,
Hashtable
*
pidWhiteList
,
uid_t
userId
)
{
size_t
len
;
size_t
len
;
char
errbuf
[
_POSIX2_LINE_MAX
];
char
errbuf
[
_POSIX2_LINE_MAX
];
...
@@ -307,8 +304,6 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
...
@@ -307,8 +304,6 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
//pl->totalMem *= pageSizeKb;
//pl->totalMem *= pageSizeKb;
sysctl
(
MIB_hw_physmem
,
2
,
&
(
pl
->
totalMem
),
&
len
,
NULL
,
0
);
sysctl
(
MIB_hw_physmem
,
2
,
&
(
pl
->
totalMem
),
&
len
,
NULL
,
0
);
pl
->
totalMem
/=
1024
;
pl
->
totalMem
/=
1024
;
// XXX hack
Global_totalMem
=
pl
->
totalMem
;
sysctl
(
MIB_vm_stats_vm_v_active_count
,
4
,
&
(
fpl
->
memActive
),
&
len
,
NULL
,
0
);
sysctl
(
MIB_vm_stats_vm_v_active_count
,
4
,
&
(
fpl
->
memActive
),
&
len
,
NULL
,
0
);
fpl
->
memActive
*=
pageSizeKb
;
fpl
->
memActive
*=
pageSizeKb
;
...
@@ -487,7 +482,7 @@ void ProcessList_goThroughEntries(ProcessList* this) {
...
@@ -487,7 +482,7 @@ void ProcessList_goThroughEntries(ProcessList* this) {
// from FreeBSD source /src/usr.bin/top/machine.c
// from FreeBSD source /src/usr.bin/top/machine.c
proc
->
m_size
=
kproc
->
ki_size
/
1024
/
pageSizeKb
;
proc
->
m_size
=
kproc
->
ki_size
/
1024
/
pageSizeKb
;
proc
->
m_resident
=
kproc
->
ki_rssize
;
proc
->
m_resident
=
kproc
->
ki_rssize
;
proc
->
percent_mem
=
(
proc
->
m_resident
*
PAGE_SIZE_KB
)
/
(
double
)(
Global_
totalMem
)
*
100
.
0
;
proc
->
percent_mem
=
(
proc
->
m_resident
*
PAGE_SIZE_KB
)
/
(
double
)(
this
->
totalMem
)
*
100
.
0
;
proc
->
nlwp
=
kproc
->
ki_numthreads
;
proc
->
nlwp
=
kproc
->
ki_numthreads
;
proc
->
time
=
(
kproc
->
ki_runtime
+
5000
)
/
10000
;
proc
->
time
=
(
kproc
->
ki_runtime
+
5000
)
/
10000
;
...
...
freebsd/FreeBSDProcessList.h
View file @
db80f202
...
@@ -55,7 +55,6 @@ typedef struct FreeBSDProcessList_ {
...
@@ -55,7 +55,6 @@ typedef struct FreeBSDProcessList_ {
ProcessList
*
ProcessList_new
(
UsersTable
*
usersTable
,
Hashtable
*
pidWhiteList
,
uid_t
userId
);
ProcessList
*
ProcessList_new
(
UsersTable
*
usersTable
,
Hashtable
*
pidWhiteList
,
uid_t
userId
);
void
ProcessList_delete
(
ProcessList
*
this
);
void
ProcessList_delete
(
ProcessList
*
this
);
...
...
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