Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Test Xdevice
提交
8412889f
T
Test Xdevice
项目概览
OpenHarmony
/
Test Xdevice
大约 1 年 前同步成功
通知
6
Star
23
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Test Xdevice
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8412889f
编写于
7月 26, 2022
作者:
D
deveco_test
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix mac bug
Signed-off-by:
N
deveco_test
<
liguangjie1@huawei.com
>
上级
90b5f7f3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
6 deletion
+23
-6
extension/src/xdevice_extension/_core/utils.py
extension/src/xdevice_extension/_core/utils.py
+18
-4
src/xdevice/_core/utils.py
src/xdevice/_core/utils.py
+5
-2
未找到文件。
extension/src/xdevice_extension/_core/utils.py
浏览文件 @
8412889f
...
...
@@ -101,18 +101,32 @@ def is_proc_running(pid, name=None):
proc
=
subprocess
.
Popen
([
"C:
\\
Windows
\\
System32
\\
findstr"
,
"%s"
%
pid
],
stdin
=
proc_sub
.
stdout
,
stdout
=
subprocess
.
PIPE
,
shell
=
False
)
else
:
elif
platform
.
system
()
==
"Linux"
:
# /bin/ps -ef | /bin/grep -v grep | /bin/grep -w pid
proc_sub
=
subprocess
.
Popen
([
"/bin/ps"
,
"-ef"
],
stdout
=
subprocess
.
PIPE
,
shell
=
False
)
proc_v_sub
=
subprocess
.
Popen
([
"/bin/grep"
,
"-v"
,
"grep"
],
stdin
=
proc_sub
.
stdout
,
stdout
=
subprocess
.
PIPE
,
shell
=
False
)
proc
=
subprocess
.
Popen
([
"/bin/grep"
,
"-w"
,
"%s"
%
pid
],
stdin
=
proc_v_sub
.
stdout
,
stdout
=
subprocess
.
PIPE
,
shell
=
False
)
elif
platform
.
system
()
==
"Darwin"
:
# /bin/ps -ef | /bin/grep -v grep | /bin/grep -w pid
proc_sub
=
subprocess
.
Popen
([
"ps"
,
"-ef"
],
proc_sub
=
subprocess
.
Popen
([
"
/bin/
ps"
,
"-ef"
],
stdout
=
subprocess
.
PIPE
,
shell
=
False
)
proc_v_sub
=
subprocess
.
Popen
([
"grep"
,
"-v"
,
"grep"
],
proc_v_sub
=
subprocess
.
Popen
([
"
/usr/bin/
grep"
,
"-v"
,
"grep"
],
stdin
=
proc_sub
.
stdout
,
stdout
=
subprocess
.
PIPE
,
shell
=
False
)
proc
=
subprocess
.
Popen
([
"grep"
,
"-w"
,
"%s"
%
pid
],
proc
=
subprocess
.
Popen
([
"
/usr/bin/
grep"
,
"-w"
,
"%s"
%
pid
],
stdin
=
proc_v_sub
.
stdout
,
stdout
=
subprocess
.
PIPE
,
shell
=
False
)
else
:
raise
Exception
(
"Unknown system environment."
)
(
out
,
_
)
=
proc
.
communicate
()
out
=
get_decode
(
out
).
strip
()
LOG
.
debug
(
"check %s proc running output: %s"
,
pid
,
out
)
...
...
src/xdevice/_core/utils.py
浏览文件 @
8412889f
...
...
@@ -117,9 +117,12 @@ def is_proc_running(pid, name=None):
if
platform
.
system
()
==
"Windows"
:
list_command
=
[
"C:
\\
Windows
\\
System32
\\
tasklist"
]
find_command
=
[
"C:
\\
Windows
\\
System32
\\
findstr"
,
"%s"
%
pid
]
elif
platform
.
system
()
==
"Darwin"
:
list_command
=
[
"/bin/ps"
,
"-ef"
]
find_command
=
[
"/usr/bin/grep"
,
"%s"
%
pid
]
else
:
list_command
=
[
"ps"
,
"-ef"
]
find_command
=
[
"grep"
,
"%s"
%
pid
]
list_command
=
[
"
/bin/
ps"
,
"-ef"
]
find_command
=
[
"
/bin/
grep"
,
"%s"
%
pid
]
proc
=
_get_find_proc
(
find_command
,
list_command
)
(
out
,
_
)
=
proc
.
communicate
()
out
=
get_decode
(
out
).
strip
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录