Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_34031325
engine
提交
dd634d34
E
engine
项目概览
qq_34031325
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dd634d34
编写于
7月 10, 2017
作者:
R
Ryan Macnak
提交者:
GitHub
7月 10, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Allow SIGQUIT to toggle the vm-service server a la command line Dart. (#3857)" (#3859)
This reverts commit
d67b614a
. Fuchsia TO-370
上级
d67b614a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
25 deletion
+8
-25
runtime/dart_init.cc
runtime/dart_init.cc
+7
-8
runtime/dart_service_isolate.cc
runtime/dart_service_isolate.cc
+1
-17
未找到文件。
runtime/dart_init.cc
浏览文件 @
dd634d34
...
...
@@ -195,16 +195,15 @@ Dart_Isolate ServiceIsolateCreateCallback(const char* script_uri,
DartUI
::
InitForIsolate
();
DartRuntimeHooks
::
Install
(
DartRuntimeHooks
::
SecondaryIsolate
,
script_uri
);
const
Settings
&
settings
=
Settings
::
Get
();
std
::
string
ip
=
settings
.
ipv6
?
"::1"
:
"127.0.0.1"
;
intptr_t
port
=
-
1
;
if
(
settings
.
enable_observatory
)
{
port
=
settings
.
observatory_port
;
std
::
string
ip
=
settings
.
ipv6
?
"::1"
:
"127.0.0.1"
;
const
intptr_t
port
=
settings
.
observatory_port
;
const
bool
disable_websocket_origin_check
=
false
;
const
bool
service_isolate_booted
=
DartServiceIsolate
::
Startup
(
ip
,
port
,
tonic
::
DartState
::
HandleLibraryTag
,
IsRunningPrecompiledCode
(),
disable_websocket_origin_check
,
error
);
FTL_CHECK
(
service_isolate_booted
)
<<
error
;
}
const
bool
disable_websocket_origin_check
=
false
;
const
bool
service_isolate_booted
=
DartServiceIsolate
::
Startup
(
ip
,
port
,
tonic
::
DartState
::
HandleLibraryTag
,
IsRunningPrecompiledCode
(),
disable_websocket_origin_check
,
error
);
FTL_CHECK
(
service_isolate_booted
)
<<
error
;
if
(
g_service_isolate_hook
)
g_service_isolate_hook
(
IsRunningPrecompiledCode
());
...
...
runtime/dart_service_isolate.cc
浏览文件 @
dd634d34
...
...
@@ -160,7 +160,7 @@ bool DartServiceIsolate::Startup(std::string server_ip,
// port when the HTTP server is started.
server_port
=
0
;
}
// Set the HTTP
server'
s port.
// Set the HTTP
's server
s port.
result
=
Dart_SetField
(
library
,
Dart_NewStringFromCString
(
"_port"
),
Dart_NewInteger
(
server_port
));
SHUTDOWN_ON_ERROR
(
result
);
...
...
@@ -171,22 +171,6 @@ bool DartServiceIsolate::Startup(std::string server_ip,
Dart_SetField
(
library
,
Dart_NewStringFromCString
(
"_originCheckDisabled"
),
Dart_NewBoolean
(
disable_origin_check
));
SHUTDOWN_ON_ERROR
(
result
);
// Get _getWatchSignalInternal from dart:io.
Dart_Handle
dart_io_str
=
Dart_NewStringFromCString
(
"dart:io"
);
SHUTDOWN_ON_ERROR
(
dart_io_str
);
Dart_Handle
io_lib
=
Dart_LookupLibrary
(
dart_io_str
);
SHUTDOWN_ON_ERROR
(
io_lib
);
Dart_Handle
function_name
=
Dart_NewStringFromCString
(
"_getWatchSignalInternal"
);
SHUTDOWN_ON_ERROR
(
function_name
);
Dart_Handle
signal_watch
=
Dart_Invoke
(
io_lib
,
function_name
,
0
,
NULL
);
SHUTDOWN_ON_ERROR
(
signal_watch
);
Dart_Handle
field_name
=
Dart_NewStringFromCString
(
"_signalWatch"
);
SHUTDOWN_ON_ERROR
(
field_name
);
result
=
Dart_SetField
(
library
,
field_name
,
signal_watch
);
SHUTDOWN_ON_ERROR
(
field_name
);
return
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录