Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
F
freeswitch
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
张华
freeswitch
Commits
27389f29
提交
27389f29
authored
5月 03, 2018
作者:
Mike Jerris
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FS-11047: [build] support v8 6.6 fixes from Andrey Volk
上级
2744c128
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
13 行增加
和
20 行删除
+13
-20
javascript.hpp
src/mod/languages/mod_v8/include/javascript.hpp
+1
-1
mod_v8.cpp
src/mod/languages/mod_v8/mod_v8.cpp
+2
-2
jsbase.cpp
src/mod/languages/mod_v8/src/jsbase.cpp
+6
-13
jsmain.cpp
src/mod/languages/mod_v8/src/jsmain.cpp
+4
-4
没有找到文件。
src/mod/languages/mod_v8/include/javascript.hpp
浏览文件 @
27389f29
...
...
@@ -127,7 +127,7 @@
/* Macro for basic script state check (to know if the script is being terminated), should be called before calling any callback actual code */
#define JS_CHECK_SCRIPT_STATE() \
if (
v8::V8::IsExecutionTerminating(info.GetIsolate()
)) return;\
if (
info.GetIsolate()->IsExecutionTerminating(
)) return;\
if (JSMain::GetScriptInstanceFromIsolate(info.GetIsolate()) && JSMain::GetScriptInstanceFromIsolate(info.GetIsolate())->GetForcedTermination()) return
/* Macro for easy unlocking an isolate on a long running c call */
...
...
src/mod/languages/mod_v8/mod_v8.cpp
浏览文件 @
27389f29
...
...
@@ -645,7 +645,7 @@ static int v8_parse_and_execute(switch_core_session_t *session, const char *inpu
isolate
->
SetData
(
0
,
js
);
// New global template
Handle
<
ObjectTemplate
>
global
=
ObjectTemplate
::
New
();
Handle
<
ObjectTemplate
>
global
=
ObjectTemplate
::
New
(
isolate
);
if
(
global
.
IsEmpty
())
{
switch_log_printf
(
SWITCH_CHANNEL_LOG
,
SWITCH_LOG_ERROR
,
"Failed to create JS global object template
\n
"
);
...
...
@@ -793,7 +793,7 @@ static int v8_parse_and_execute(switch_core_session_t *session, const char *inpu
free
(
path
);
}
TryCatch
try_catch
;
TryCatch
try_catch
(
isolate
)
;
// Compile the source code.
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
...
...
src/mod/languages/mod_v8/src/jsbase.cpp
浏览文件 @
27389f29
...
...
@@ -153,16 +153,8 @@ void JSBase::CreateInstance(const v8::FunctionCallbackInfo<Value>& args)
autoDestroy
=
args
[
1
]
->
BooleanValue
();
}
else
{
// Create a new C++ instance
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
Isolate
*
isolate
=
args
.
GetIsolate
();
v8
::
Local
<
v8
::
Context
>
context
=
isolate
->
GetCurrentContext
();
v8
::
Local
<
v8
::
String
>
key
=
String
::
NewFromUtf8
(
isolate
,
"constructor_method"
);
v8
::
Local
<
v8
::
Private
>
privateKey
=
v8
::
Private
::
ForApi
(
isolate
,
key
);
Handle
<
External
>
ex
;
v8
::
MaybeLocal
<
v8
::
Value
>
hiddenValue
=
args
.
Callee
()
->
GetPrivate
(
context
,
privateKey
);
if
(
!
hiddenValue
.
IsEmpty
())
{
ex
=
Handle
<
External
>::
Cast
(
hiddenValue
.
ToLocalChecked
());
}
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=6
Handle
<
External
>
ex
=
Handle
<
External
>::
Cast
(
args
.
Data
());
#else
Handle
<
External
>
ex
=
Handle
<
External
>::
Cast
(
args
.
Callee
()
->
GetHiddenValue
(
String
::
NewFromUtf8
(
args
.
GetIsolate
(),
"constructor_method"
)));
#endif
...
...
@@ -232,13 +224,14 @@ void JSBase::Register(Isolate *isolate, const js_class_definition_t *desc)
void
JSBase
::
RegisterInstance
(
Isolate
*
isolate
,
string
name
,
bool
autoDestroy
)
{
// Get the context's global scope (that's where we'll put the constructor)
Handle
<
Object
>
global
=
isolate
->
GetCurrentContext
()
->
Global
();
Local
<
Context
>
context
=
isolate
->
GetCurrentContext
();
Handle
<
Object
>
global
=
context
->
Global
();
Local
<
Function
>
func
=
Local
<
Function
>::
Cast
(
global
->
Get
(
v8
::
String
::
NewFromUtf8
(
isolate
,
this
->
GetJSClassName
().
c_str
())));
// Add the C++ instance as an argument, so it won't try to create another one.
Handle
<
Value
>
args
[]
=
{
External
::
New
(
isolate
,
this
),
Boolean
::
New
(
isolate
,
autoDestroy
)
};
Handle
<
Object
>
newObj
=
func
->
NewInstance
(
2
,
args
);
Handle
<
Object
>
newObj
=
func
->
NewInstance
(
context
,
2
,
args
).
ToLocalChecked
(
);
// Add the instance to JavaScript.
if
(
name
.
size
()
>
0
)
{
...
...
src/mod/languages/mod_v8/src/jsmain.cpp
浏览文件 @
27389f29
...
...
@@ -209,7 +209,7 @@ const string JSMain::GetExceptionInfo(Isolate* isolate, TryCatch* try_catch)
ss
<<
" "
;
}
int
end
=
message
->
GetEndColumn
(
);
int
32_t
end
=
message
->
GetEndColumn
(
isolate
->
GetCurrentContext
()).
FromMaybe
(
0
);
for
(
int
i
=
start
;
i
<
end
;
i
++
)
{
ss
<<
"^"
;
...
...
@@ -292,7 +292,7 @@ const string JSMain::ExecuteString(const string& scriptData, const string& fileN
isolate
->
SetData
(
0
,
this
);
Handle
<
ObjectTemplate
>
global
=
ObjectTemplate
::
New
();
Handle
<
ObjectTemplate
>
global
=
ObjectTemplate
::
New
(
isolate
);
global
->
Set
(
String
::
NewFromUtf8
(
isolate
,
"include"
),
FunctionTemplate
::
New
(
isolate
,
Include
));
global
->
Set
(
String
::
NewFromUtf8
(
isolate
,
"require"
),
FunctionTemplate
::
New
(
isolate
,
Include
));
global
->
Set
(
String
::
NewFromUtf8
(
isolate
,
"log"
),
FunctionTemplate
::
New
(
isolate
,
Log
));
...
...
@@ -323,7 +323,7 @@ const string JSMain::ExecuteString(const string& scriptData, const string& fileN
inst
->
obj
->
RegisterInstance
(
isolate
,
inst
->
name
,
inst
->
auto_destroy
);
}
TryCatch
try_catch
;
TryCatch
try_catch
(
isolate
)
;
// Compile the source code.
#if defined(V8_MAJOR_VERSION) && V8_MAJOR_VERSION >=5
...
...
@@ -583,7 +583,7 @@ void JSMain::ExitScript(Isolate *isolate, const char *msg)
js
->
forcedTerminationScriptFile
=
GetStackInfo
(
isolate
,
&
js
->
forcedTerminationLineNumber
);
}
V8
::
TerminateExecution
(
isolate
);
isolate
->
TerminateExecution
(
);
}
char
*
JSMain
::
GetStackInfo
(
Isolate
*
isolate
,
int
*
lineNumber
)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论