Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
d50f49eb
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
d50f49eb
编写于
9月 30, 2014
作者:
N
Nicolargo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correct issue on Mac OS X running in non root (issue #423)
上级
57569b23
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
21 deletion
+26
-21
glances/core/glances_processes.py
glances/core/glances_processes.py
+26
-21
未找到文件。
glances/core/glances_processes.py
浏览文件 @
d50f49eb
...
...
@@ -318,7 +318,7 @@ class GlancesProcesses(object):
processdict
=
{}
for
proc
in
psutil
.
process_iter
():
# If self.get_max_processes() is None: Only retreive mandatory stats
# Else: retreive mandatory
adn standard stast
# Else: retreive mandatory
and standard stats
s
=
self
.
__get_process_stats
(
proc
,
mandatory_stats
=
True
,
standard_stats
=
self
.
get_max_processes
()
is
None
)
...
...
@@ -348,14 +348,28 @@ class GlancesProcesses(object):
except
:
pass
# Process optimization
# Only retreive stats for visible processes (get_max_processes)
if
self
.
get_max_processes
()
is
not
None
:
# Sort the internal dict and cut the top N (Return a list of tuple)
# tuple=key (proc), dict (returned by __get_process_stats)
processiter
=
sorted
(
processdict
.
items
(),
key
=
lambda
x
:
x
[
1
][
self
.
getsortkey
()],
reverse
=
True
)
first
=
True
for
i
in
processiter
[
0
:
self
.
get_max_processes
()]:
# Already existing mandatory stats
procstat
=
i
[
1
]
try
:
processiter
=
sorted
(
processdict
.
items
(),
key
=
lambda
x
:
x
[
1
][
self
.
getsortkey
()],
reverse
=
True
)
except
TypeError
:
# Fallback to all process (issue #423)
processloop
=
processdict
.
items
()
first
=
False
else
:
processloop
=
processiter
[
0
:
self
.
get_max_processes
()]
first
=
True
else
:
# Get all processes stats
processloop
=
processdict
.
items
()
first
=
False
for
i
in
processloop
:
# Already existing mandatory stats
procstat
=
i
[
1
]
if
self
.
get_max_processes
()
is
not
None
:
# Update with standard stats
# and extended stats but only for TOP (first) process
s
=
self
.
__get_process_stats
(
i
[
0
],
...
...
@@ -365,21 +379,12 @@ class GlancesProcesses(object):
if
s
is
None
:
continue
procstat
.
update
(
s
)
# Add a specific time_since_update stats for bitrate
procstat
[
'time_since_update'
]
=
time_since_update
# Update process list
self
.
processlist
.
append
(
procstat
)
# Next...
first
=
False
else
:
# Get all the processes
for
i
in
processdict
.
items
():
# Already existing mandatory and standard stats
procstat
=
i
[
1
]
# Add a specific time_since_update stats for bitrate
procstat
[
'time_since_update'
]
=
time_since_update
# Update process list
self
.
processlist
.
append
(
procstat
)
# Add a specific time_since_update stats for bitrate
procstat
[
'time_since_update'
]
=
time_since_update
# Update process list
self
.
processlist
.
append
(
procstat
)
# Next...
first
=
False
# Clean internals caches if timeout is reached
if
self
.
cache_timer
.
finished
():
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录