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
8a1c304b
Commit
8a1c304b
authored
May 05, 2014
by
Hisham Muhammad
Browse files
Merge branch 'master' of
https://github.com/hishamhm/htop
parents
b7de9bd0
f0e2a0e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
ProcessList.c
View file @
8a1c304b
...
...
@@ -584,7 +584,7 @@ static bool ProcessList_readStatmFile(Process* process, const char* dirname, con
#ifdef HAVE_OPENVZ
static
void
ProcessList_readOpenVZData
(
Process
*
process
,
const
char
*
dirname
,
const
char
*
name
)
{
static
void
ProcessList_readOpenVZData
(
ProcessList
*
this
,
Process
*
process
,
const
char
*
dirname
,
const
char
*
name
)
{
if
(
(
!
(
this
->
flags
&
PROCESS_FLAG_OPENVZ
))
||
(
access
(
"/proc/vz"
,
R_OK
)
!=
0
))
{
process
->
vpid
=
process
->
pid
;
process
->
ctid
=
0
;
...
...
@@ -812,7 +812,7 @@ static bool ProcessList_processEntries(ProcessList* this, const char* dirname, P
process
->
user
=
UsersTable_getRef
(
this
->
usersTable
,
process
->
st_uid
);
#ifdef HAVE_OPENVZ
ProcessList_readOpenVZData
(
process
,
dirname
,
name
);
ProcessList_readOpenVZData
(
this
,
process
,
dirname
,
name
);
#endif
#ifdef HAVE_VSERVER
...
...
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