Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
anbox
提交
15a27ec8
A
anbox
项目概览
openeuler
/
anbox
通知
24
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
anbox
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
15a27ec8
编写于
6月 10, 2017
作者:
S
Simon Fels
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add command line option to use system dbus
上级
7fc8bb46
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
15 deletion
+11
-15
src/anbox/cmds/session_manager.cpp
src/anbox/cmds/session_manager.cpp
+9
-9
src/anbox/cmds/session_manager.h
src/anbox/cmds/session_manager.h
+2
-6
未找到文件。
src/anbox/cmds/session_manager.cpp
浏览文件 @
15a27ec8
...
...
@@ -85,16 +85,9 @@ std::istream& operator>>(std::istream& in, anbox::graphics::GLRendererServer::Co
}
}
anbox
::
cmds
::
SessionManager
::
BusFactory
anbox
::
cmds
::
SessionManager
::
session_bus_factory
()
{
return
[]()
{
return
std
::
make_shared
<
core
::
dbus
::
Bus
>
(
core
::
dbus
::
WellKnownBus
::
session
);
};
}
anbox
::
cmds
::
SessionManager
::
SessionManager
(
const
BusFactory
&
bus_factory
)
anbox
::
cmds
::
SessionManager
::
SessionManager
()
:
CommandWithFlagsAndAction
{
cli
::
Name
{
"session-manager"
},
cli
::
Usage
{
"session-manager"
},
cli
::
Description
{
"Run the the anbox session manager"
}},
bus_factory_
(
bus_factory
),
window_size_
(
default_single_window_size
)
{
// Just for the purpose to allow QtMir (or unity8) to find this on our
// /proc/*/cmdline
...
...
@@ -117,6 +110,9 @@ anbox::cmds::SessionManager::SessionManager(const BusFactory &bus_factory)
flag
(
cli
::
make_flag
(
cli
::
Name
{
"experimental"
},
cli
::
Description
{
"Allows users to use experimental features"
},
experimental_
));
flag
(
cli
::
make_flag
(
cli
::
Name
{
"use-system-dbus"
},
cli
::
Description
{
"Use system instead of session DBus"
},
use_system_dbus_
));
action
([
this
](
const
cli
::
Command
::
Context
&
)
{
auto
trap
=
core
::
posix
::
trap_signals_for_process
(
...
...
@@ -248,7 +244,11 @@ anbox::cmds::SessionManager::SessionManager(const BusFactory &bus_factory)
dispatcher
->
dispatch
([
&
]()
{
container_
->
start
(
container_configuration
);
});
}
auto
bus
=
bus_factory_
();
auto
bus_type
=
core
::
dbus
::
WellKnownBus
::
session
;
if
(
use_system_dbus_
)
bus_type
=
core
::
dbus
::
WellKnownBus
::
system
;
auto
bus
=
std
::
make_shared
<
core
::
dbus
::
Bus
>
(
bus_type
);
bus
->
install_executor
(
core
::
dbus
::
asio
::
make_executor
(
bus
,
rt
->
service
()));
auto
skeleton
=
anbox
::
dbus
::
skeleton
::
Service
::
create_for_bus
(
bus
,
app_manager
);
...
...
src/anbox/cmds/session_manager.h
浏览文件 @
15a27ec8
...
...
@@ -36,21 +36,17 @@ class Client;
namespace
cmds
{
class
SessionManager
:
public
cli
::
CommandWithFlagsAndAction
{
public:
typedef
std
::
function
<
core
::
dbus
::
Bus
::
Ptr
()
>
BusFactory
;
static
BusFactory
session_bus_factory
();
SessionManager
(
const
BusFactory
&
bus_factory
=
session_bus_factory
());
SessionManager
();
private:
std
::
shared_ptr
<
container
::
Client
>
container_
;
BusFactory
bus_factory_
;
std
::
string
desktop_file_hint_
;
graphics
::
GLRendererServer
::
Config
::
Driver
gles_driver_
;
bool
single_window_
=
false
;
graphics
::
Rect
window_size_
;
bool
standalone_
=
false
;
bool
experimental_
=
false
;
bool
use_system_dbus_
=
false
;
};
}
// namespace cmds
}
// namespace anbox
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录