Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
382fac50
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,发现更多精彩内容 >>
提交
382fac50
编写于
11月 29, 2015
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename OS vars for consistency
上级
c3c0c103
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
42 addition
and
43 deletion
+42
-43
glances/autodiscover.py
glances/autodiscover.py
+2
-2
glances/config.py
glances/config.py
+5
-5
glances/globals.py
glances/globals.py
+4
-5
glances/main.py
glances/main.py
+3
-3
glances/outputs/glances_curses.py
glances/outputs/glances_curses.py
+5
-5
glances/password.py
glances/password.py
+4
-4
glances/plugins/glances_ip.py
glances/plugins/glances_ip.py
+2
-2
glances/plugins/glances_processlist.py
glances/plugins/glances_processlist.py
+4
-4
glances/processes.py
glances/processes.py
+9
-9
glances/standalone.py
glances/standalone.py
+2
-2
glances/webserver.py
glances/webserver.py
+2
-2
未找到文件。
glances/autodiscover.py
浏览文件 @
382fac50
...
...
@@ -22,7 +22,7 @@
import
socket
import
sys
from
glances.globals
import
appname
,
is_bsd
from
glances.globals
import
appname
,
BSD
from
glances.logger
import
logger
try
:
...
...
@@ -194,7 +194,7 @@ class GlancesAutoDiscoverClient(object):
# XXX *BSDs: Segmentation fault (core dumped)
# -- https://bitbucket.org/al45tair/netifaces/issues/15
if
not
is_bsd
:
if
not
BSD
:
try
:
# -B @ overwrite the dynamic IPv4 choice
if
zeroconf_bind_address
==
'0.0.0.0'
:
...
...
glances/config.py
浏览文件 @
382fac50
...
...
@@ -24,7 +24,7 @@ import sys
from
io
import
open
from
glances.compat
import
ConfigParser
,
NoOptionError
from
glances.globals
import
appname
,
is_bsd
,
is_linux
,
is_mac
,
is_windows
,
sys_prefix
from
glances.globals
import
appname
,
BSD
,
LINUX
,
OSX
,
WINDOWS
,
sys_prefix
from
glances.logger
import
logger
...
...
@@ -65,24 +65,24 @@ class Config(object):
if
self
.
config_dir
:
paths
.
append
(
self
.
config_dir
)
if
is_linux
or
is_bsd
:
if
LINUX
or
BSD
:
paths
.
append
(
os
.
path
.
join
(
os
.
environ
.
get
(
'XDG_CONFIG_HOME'
)
or
os
.
path
.
expanduser
(
'~/.config'
),
appname
,
self
.
config_filename
))
if
is_bsd
:
if
BSD
:
paths
.
append
(
os
.
path
.
join
(
sys
.
prefix
,
'etc'
,
appname
,
self
.
config_filename
))
else
:
paths
.
append
(
os
.
path
.
join
(
'/etc'
,
appname
,
self
.
config_filename
))
elif
is_mac
:
elif
OSX
:
paths
.
append
(
os
.
path
.
join
(
os
.
path
.
expanduser
(
'~/Library/Application Support/'
),
appname
,
self
.
config_filename
))
paths
.
append
(
os
.
path
.
join
(
sys_prefix
,
'etc'
,
appname
,
self
.
config_filename
))
elif
is_windows
:
elif
WINDOWS
:
paths
.
append
(
os
.
path
.
join
(
os
.
environ
.
get
(
'APPDATA'
),
appname
,
self
.
config_filename
))
...
...
glances/globals.py
浏览文件 @
382fac50
...
...
@@ -29,11 +29,10 @@ psutil_version = __import__('glances').__psutil_version
# Operating system flag
# Note: Somes libs depends of OS
is_bsd
=
sys
.
platform
.
find
(
'bsd'
)
!=
-
1
is_freebsd
=
sys
.
platform
.
startswith
(
'freebsd'
)
is_linux
=
sys
.
platform
.
startswith
(
'linux'
)
is_mac
=
sys
.
platform
.
startswith
(
'darwin'
)
is_windows
=
sys
.
platform
.
startswith
(
'win'
)
BSD
=
sys
.
platform
.
find
(
'bsd'
)
!=
-
1
LINUX
=
sys
.
platform
.
startswith
(
'linux'
)
OSX
=
sys
.
platform
.
startswith
(
'darwin'
)
WINDOWS
=
sys
.
platform
.
startswith
(
'win'
)
# Path definitions
work_path
=
os
.
path
.
realpath
(
os
.
path
.
dirname
(
__file__
))
...
...
glances/main.py
浏览文件 @
382fac50
...
...
@@ -25,7 +25,7 @@ import sys
import
tempfile
from
glances.config
import
Config
from
glances.globals
import
appname
,
is_linux
,
is_windows
,
psutil_version
,
version
from
glances.globals
import
appname
,
LINUX
,
WINDOWS
,
psutil_version
,
version
from
glances.logger
import
logger
...
...
@@ -194,10 +194,10 @@ Start the client browser (browser mode):\n\
dest
=
'process_short_name'
,
help
=
'force short name for processes name'
)
parser
.
add_argument
(
'-0'
,
'--disable-irix'
,
action
=
'store_true'
,
default
=
False
,
dest
=
'disable_irix'
,
help
=
'Task
\'
s cpu usage will be divided by the total number of CPUs'
)
if
not
is_windows
:
if
not
WINDOWS
:
parser
.
add_argument
(
'--hide-kernel-threads'
,
action
=
'store_true'
,
default
=
False
,
dest
=
'no_kernel_threads'
,
help
=
'hide kernel threads in process list'
)
if
is_linux
:
if
LINUX
:
parser
.
add_argument
(
'--tree'
,
action
=
'store_true'
,
default
=
False
,
dest
=
'process_tree'
,
help
=
'display processes as a tree'
)
parser
.
add_argument
(
'-b'
,
'--byte'
,
action
=
'store_true'
,
default
=
False
,
...
...
glances/outputs/glances_curses.py
浏览文件 @
382fac50
...
...
@@ -23,14 +23,14 @@ import re
import
sys
from
glances.compat
import
u
from
glances.globals
import
is_mac
,
is_windows
from
glances.globals
import
OSX
,
WINDOWS
from
glances.logger
import
logger
from
glances.logs
import
glances_logs
from
glances.processes
import
glances_processes
from
glances.timer
import
Timer
# Import curses lib for "normal" operating system and consolelog for Windows
if
not
is_windows
:
if
not
WINDOWS
:
try
:
import
curses
import
curses.panel
...
...
@@ -705,7 +705,7 @@ class _GlancesCurses(object):
self
.
new_line
()
self
.
display_plugin
(
stats_processlist
,
display_optional
=
(
screen_x
>
102
),
display_additional
=
(
not
is_mac
),
display_additional
=
(
not
OSX
),
max_y
=
(
screen_y
-
self
.
get_stats_display_height
(
stats_alert
)
-
2
))
self
.
new_line
()
self
.
display_plugin
(
stats_alert
)
...
...
@@ -794,7 +794,7 @@ class _GlancesCurses(object):
for
y
,
m
in
enumerate
(
message
.
split
(
'
\n
'
)):
popup
.
addnstr
(
2
+
y
,
2
,
m
,
len
(
m
))
if
is_input
and
not
is_windows
:
if
is_input
and
not
WINDOWS
:
# Create a subwindow for the text field
subpop
=
popup
.
derwin
(
1
,
input_size
,
2
,
2
+
len
(
m
))
subpop
.
attron
(
self
.
colors_list
[
'FILTER'
])
...
...
@@ -1250,7 +1250,7 @@ class GlancesCursesBrowser(_GlancesCurses):
return
True
if
not
is_windows
:
if
not
WINDOWS
:
class
GlancesTextbox
(
Textbox
,
object
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
...
...
glances/password.py
浏览文件 @
382fac50
...
...
@@ -27,7 +27,7 @@ import uuid
from
io
import
open
from
glances.compat
import
b
,
input
from
glances.globals
import
appname
,
is_bsd
,
is_linux
,
is_mac
,
is_windows
from
glances.globals
import
appname
,
BSD
,
LINUX
,
OSX
,
WINDOWS
from
glances.logger
import
logger
...
...
@@ -47,11 +47,11 @@ class GlancesPassword(object):
* OS X: ~/Library/glances
* Windows: %APPDATA%\glances
"""
if
is_linux
or
is_bsd
:
if
LINUX
or
BSD
:
app_path
=
os
.
environ
.
get
(
'XDG_CONFIG_HOME'
)
or
os
.
path
.
expanduser
(
'~/.config'
)
elif
is_mac
:
elif
OSX
:
app_path
=
os
.
path
.
join
(
os
.
environ
.
get
(
'HOME'
),
'Library'
)
elif
is_windows
:
elif
WINDOWS
:
app_path
=
os
.
environ
.
get
(
'APPDATA'
)
else
:
app_path
=
'.'
...
...
glances/plugins/glances_ip.py
浏览文件 @
382fac50
...
...
@@ -20,13 +20,13 @@
"""IP plugin."""
from
glances.compat
import
iterkeys
from
glances.globals
import
is_bsd
from
glances.globals
import
BSD
from
glances.logger
import
logger
from
glances.plugins.glances_plugin
import
GlancesPlugin
# XXX *BSDs: Segmentation fault (core dumped)
# -- https://bitbucket.org/al45tair/netifaces/issues/15
if
not
is_bsd
:
if
not
BSD
:
try
:
import
netifaces
netifaces_tag
=
True
...
...
glances/plugins/glances_processlist.py
浏览文件 @
382fac50
...
...
@@ -24,7 +24,7 @@ import os
from
datetime
import
timedelta
from
glances.compat
import
iteritems
from
glances.globals
import
is_windows
from
glances.globals
import
WINDOWS
from
glances.logger
import
logger
from
glances.processes
import
glances_processes
from
glances.plugins.glances_core
import
Plugin
as
CorePlugin
...
...
@@ -224,8 +224,8 @@ class Plugin(GlancesPlugin):
if
nice
is
None
:
nice
=
'?'
msg
=
'{0:>5}'
.
format
(
nice
)
if
isinstance
(
nice
,
int
)
and
((
is_windows
and
nice
!=
32
)
or
(
not
is_windows
and
nice
!=
0
)):
if
isinstance
(
nice
,
int
)
and
((
WINDOWS
and
nice
!=
32
)
or
(
not
WINDOWS
and
nice
!=
0
)):
ret
.
append
(
self
.
curse_add_line
(
msg
,
decoration
=
'NICE'
))
else
:
ret
.
append
(
self
.
curse_add_line
(
msg
))
...
...
@@ -361,7 +361,7 @@ class Plugin(GlancesPlugin):
v
=
p
[
'ionice'
].
ioclass
# Linux: The scheduling class. 0 for none, 1 for real time, 2 for best-effort, 3 for idle.
# Windows: On Windows only ioclass is used and it can be set to 2 (normal), 1 (low) or 0 (very low).
if
is_windows
:
if
WINDOWS
:
if
v
==
0
:
msg
+=
k
+
'Very Low'
elif
v
==
1
:
...
...
glances/processes.py
浏览文件 @
382fac50
...
...
@@ -22,7 +22,7 @@ import os
import
re
from
glances.compat
import
iteritems
,
itervalues
from
glances.globals
import
is_bsd
,
is_linux
,
is_mac
,
is_windows
from
glances.globals
import
BSD
,
LINUX
,
OSX
,
WINDOWS
from
glances.logger
import
logger
from
glances.timer
import
Timer
,
getTimeSinceLastUpdate
...
...
@@ -405,7 +405,7 @@ class GlancesProcesses(object):
# If io_tag = 0 > Access denied (display "?")
# If io_tag = 1 > No access denied (display the IO rate)
# Note Disk IO stat not available on Mac OS
if
not
is_mac
:
if
not
OSX
:
try
:
# Get the process IO counters
proc_io
=
proc
.
io_counters
()
...
...
@@ -513,7 +513,7 @@ class GlancesProcesses(object):
procstat
[
'num_threads'
]
=
None
# Number of handles (Windows only)
if
is_windows
:
if
WINDOWS
:
try
:
procstat
.
update
(
proc
.
as_dict
(
attrs
=
[
'num_handles'
]))
except
psutil
.
NoSuchProcess
:
...
...
@@ -523,7 +523,7 @@ class GlancesProcesses(object):
# SWAP memory (Only on Linux based OS)
# http://www.cyberciti.biz/faq/linux-which-process-is-using-swap/
if
is_linux
:
if
LINUX
:
try
:
procstat
[
'memory_swap'
]
=
sum
(
[
v
.
swap
for
v
in
proc
.
memory_maps
()])
...
...
@@ -545,7 +545,7 @@ class GlancesProcesses(object):
# IO Nice
# http://pythonhosted.org/psutil/#psutil.Process.ionice
if
is_linux
or
is_windows
:
if
LINUX
or
WINDOWS
:
try
:
procstat
.
update
(
proc
.
as_dict
(
attrs
=
[
'ionice'
]))
except
psutil
.
NoSuchProcess
:
...
...
@@ -591,7 +591,7 @@ class GlancesProcesses(object):
processdict
=
{}
for
proc
in
psutil
.
process_iter
():
# Ignore kernel threads if needed
if
self
.
no_kernel_threads
and
not
is_windows
and
is_kernel_thread
(
proc
):
if
self
.
no_kernel_threads
and
not
WINDOWS
and
is_kernel_thread
(
proc
):
continue
# If self.max_processes is None: Only retreive mandatory stats
...
...
@@ -607,9 +607,9 @@ class GlancesProcesses(object):
# ignore the 'idle' process on Windows and *BSD
# ignore the 'kernel_task' process on OS X
# waiting for upstream patch from psutil
if
(
is_bsd
and
processdict
[
proc
][
'name'
]
==
'idle'
or
is_windows
and
processdict
[
proc
][
'name'
]
==
'System Idle Process'
or
is_mac
and
processdict
[
proc
][
'name'
]
==
'kernel_task'
):
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
:
...
...
glances/standalone.py
浏览文件 @
382fac50
...
...
@@ -21,7 +21,7 @@
from
time
import
sleep
from
glances.globals
import
is_windows
from
glances.globals
import
WINDOWS
from
glances.logger
import
logger
from
glances.processes
import
glances_processes
from
glances.stats
import
GlancesStats
...
...
@@ -52,7 +52,7 @@ class GlancesStandalone(object):
if
args
.
process_filter
is
not
None
:
glances_processes
.
process_filter
=
args
.
process_filter
if
(
not
is_windows
)
and
args
.
no_kernel_threads
:
if
(
not
WINDOWS
)
and
args
.
no_kernel_threads
:
# Ignore kernel threads in process list
glances_processes
.
disable_kernel_threads
()
...
...
glances/webserver.py
浏览文件 @
382fac50
...
...
@@ -19,7 +19,7 @@
"""Glances Web Interface (Bottle based)."""
from
glances.globals
import
is_windows
from
glances.globals
import
WINDOWS
from
glances.processes
import
glances_processes
from
glances.stats
import
GlancesStats
from
glances.outputs.glances_bottle
import
GlancesBottle
...
...
@@ -33,7 +33,7 @@ class GlancesWebServer(object):
# Init stats
self
.
stats
=
GlancesStats
(
config
)
if
not
is_windows
and
args
.
no_kernel_threads
:
if
not
WINDOWS
and
args
.
no_kernel_threads
:
# Ignore kernel threads in process list
glances_processes
.
disable_kernel_threads
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录