Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
cceeb88f
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 搜索 >>
提交
cceeb88f
编写于
9月 15, 2012
作者:
N
Nicolas Hennion
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use the news virtual_memory() and virtual_swap() fct
上级
7417215d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
55 addition
and
36 deletion
+55
-36
NEWS
NEWS
+5
-0
glances/glances.py
glances/glances.py
+50
-36
未找到文件。
NEWS
浏览文件 @
cceeb88f
Version 1.4.2
=============
* Use the news virtual_memory() and virtual_swap() fct (PsUtil)
Version 1.4.1.1
===============
...
...
glances/glances.py
浏览文件 @
cceeb88f
...
...
@@ -19,10 +19,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.";
#
__appname__
=
'glances'
__version__
=
"1.4.
1.1
"
__version__
=
"1.4.
2b
"
__author__
=
"Nicolas Hennion <nicolas@nicolargo.com>"
__licence__
=
"LGPL"
...
...
@@ -85,13 +83,21 @@ else:
psutil_get_io_counter_tag
=
True
try
:
# (phy|virt)mem_usage methods only available with PsUtil 0.3.0+
psutil
.
phymem_usage
()
psutil
.
virtmem_usage
()
except
Exception
:
psutil_mem_usage_tag
=
False
# virtual_memory() is only available with PsUtil 0.6+
psutil
.
virtual_memory
()
except
:
try
:
# (phy|virt)mem_usage methods only available with PsUtil 0.3.0+
psutil
.
phymem_usage
()
psutil
.
virtmem_usage
()
except
Exception
:
psutil_mem_usage_tag
=
False
else
:
psutil_mem_usage_tag
=
True
psutil_mem_vm
=
False
else
:
psutil_mem_usage_tag
=
True
psutil_mem_vm
=
True
try
:
# disk_(partitions|usage) methods only available with PsUtil 0.3.0+
...
...
@@ -565,35 +571,43 @@ class glancesStats:
self
.
load
=
{}
# MEM
# !!! TODO
# To be replaced by: psutil.virtual_memory() et psutil.swap_memory()
# In the PsUtil version 0.6 or higher
# !!!
#
try
:
# Only for Linux
cachemem
=
psutil
.
cached_phymem
()
+
psutil
.
phymem_buffers
()
except
Exception
:
cachemem
=
0
try
:
phymem
=
psutil
.
phymem_usage
()
self
.
mem
=
{
'cache'
:
cachemem
,
if
psutil_mem_vm
:
# If PsUtil 0.6+
phymem
=
psutil
.
virtual_memory
()
self
.
mem
=
{
'cache'
:
phymem
.
cached
+
phymem
.
buffers
,
'total'
:
phymem
.
total
,
'used'
:
phymem
.
used
,
'free'
:
phymem
.
free
,
'percent'
:
phymem
.
percent
}
except
Exception
:
self
.
mem
=
{}
try
:
virtmem
=
psutil
.
virtmem_usage
()
virtmem
=
psutil
.
swap_memory
()
self
.
memswap
=
{
'total'
:
virtmem
.
total
,
'used'
:
virtmem
.
used
,
'free'
:
virtmem
.
free
,
'percent'
:
virtmem
.
percent
}
except
Exception
:
self
.
memswap
=
{}
'percent'
:
virtmem
.
percent
}
else
:
# For olders PsUtil version
try
:
phymem
=
psutil
.
phymem_usage
()
try
:
# Cache stat only available for Linux
cachemem
=
psutil
.
cached_phymem
()
+
psutil
.
phymem_buffers
()
except
Exception
:
cachemem
=
0
self
.
mem
=
{
'cache'
:
cachemem
,
'total'
:
phymem
.
total
,
'used'
:
phymem
.
used
,
'free'
:
phymem
.
free
,
'percent'
:
phymem
.
percent
}
except
Exception
:
self
.
mem
=
{}
try
:
virtmem
=
psutil
.
virtmem_usage
()
self
.
memswap
=
{
'total'
:
virtmem
.
total
,
'used'
:
virtmem
.
used
,
'free'
:
virtmem
.
free
,
'percent'
:
virtmem
.
percent
}
except
Exception
:
self
.
memswap
=
{}
# NET
if
psutil_network_io_tag
:
...
...
@@ -1345,9 +1359,9 @@ class glancesScreen:
self
.
title_color
if
self
.
hascolors
else
curses
.
A_UNDERLINE
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
1
,
self
.
mem_x
+
offset_x
,
_
(
"Total:"
),
8
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
2
,
self
.
mem_x
+
offset_x
,
_
(
"Used:"
),
8
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
3
,
self
.
mem_x
+
offset_x
,
_
(
"Free:"
),
8
)
_
(
"Total:"
),
6
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
2
,
self
.
mem_x
+
offset_x
,
_
(
"Used:"
),
6
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
3
,
self
.
mem_x
+
offset_x
,
_
(
"Free:"
),
6
)
self
.
term_window
.
addnstr
(
self
.
mem_y
,
self
.
mem_x
+
offset_x
+
9
,
"{0:.1%}"
.
format
(
mem
[
'percent'
]
/
100
),
8
)
...
...
@@ -1376,11 +1390,11 @@ class glancesScreen:
self
.
title_color
if
self
.
hascolors
else
curses
.
A_UNDERLINE
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
1
,
self
.
mem_x
+
offset_x
+
25
,
_
(
"Total:"
),
8
)
_
(
"Total:"
),
6
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
2
,
self
.
mem_x
+
offset_x
+
25
,
_
(
"Used:"
),
8
)
_
(
"Used:"
),
6
)
self
.
term_window
.
addnstr
(
self
.
mem_y
+
3
,
self
.
mem_x
+
offset_x
+
25
,
_
(
"Free:"
),
8
)
_
(
"Free:"
),
6
)
self
.
term_window
.
addnstr
(
self
.
mem_y
,
self
.
mem_x
+
offset_x
+
34
,
"{0:.1%}"
.
format
(
memswap
[
'percent'
]
/
100
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录