Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
7739a1a9
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,发现更多精彩内容 >>
提交
7739a1a9
编写于
5月 09, 2016
作者:
N
Nicolargo
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'issue843' into develop
上级
36e788f2
291ff647
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
9 deletion
+11
-9
NEWS
NEWS
+1
-0
glances/processes.py
glances/processes.py
+10
-9
未找到文件。
NEWS
浏览文件 @
7739a1a9
...
...
@@ -19,6 +19,7 @@ Bugs corrected:
* Crash on launch when viewing temperature of laptop HDD in sleep mode (issue #824)
* [Web UI] Fix folders plugin never displayed (issue #829)
* Correct issue IP plugin: VPN with no internet access (issue #842)
* Idle process is back on FreeBSD and Windows (issue #844)
Deprecated:
...
...
glances/processes.py
浏览文件 @
7739a1a9
...
...
@@ -406,24 +406,25 @@ class GlancesProcesses(object):
if
self
.
no_kernel_threads
and
not
WINDOWS
and
is_kernel_thread
(
proc
):
continue
# If self.max_processes is None: Only retr
ei
ve mandatory stats
# Else: retr
ei
ve mandatory and standard stats
# If self.max_processes is None: Only retr
ie
ve mandatory stats
# Else: retr
ie
ve mandatory and standard stats
s
=
self
.
__get_process_stats
(
proc
,
mandatory_stats
=
True
,
standard_stats
=
self
.
max_processes
is
None
)
# ignore the 'idle' process on Windows and *BSD
# ignore the 'kernel_task' process on OS X
# waiting for upstream patch from psutil
if
(
BSD
and
s
[
'name'
]
==
'idle'
or
WINDOWS
and
s
[
'name'
]
==
'System Idle Process'
or
OSX
and
s
[
'name'
]
==
'kernel_task'
):
continue
# Continue to the next process if it has to be filtered
if
s
is
None
or
(
self
.
is_filtered
(
s
[
'cmdline'
])
and
self
.
is_filtered
(
s
[
'name'
])):
excluded_processes
.
add
(
proc
)
continue
# Ok add the process to the list
processdict
[
proc
]
=
s
# ignore the 'idle' process on Windows and *BSD
# ignore the 'kernel_task' process on OS X
# waiting for upstream patch from psutil
if
(
BSD
and
processdict
[
proc
][
'name'
]
==
'idle'
or
WINDOWS
and
processdict
[
proc
][
'name'
]
==
'System Idle Process'
or
OSX
and
processdict
[
proc
][
'name'
]
==
'kernel_task'
):
continue
# Update processcount (global statistics)
try
:
self
.
processcount
[
str
(
proc
.
status
())]
+=
1
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录