Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bingbingbingbing
mono
提交
2a5c864a
M
mono
项目概览
bingbingbingbing
/
mono
与 Fork 源项目一致
从无法访问的项目Fork
通知
35
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mono
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2a5c864a
编写于
12月 18, 2018
作者:
U
UnityAlex
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added ability to continue domain unload when an exception is encountered
上级
b808f844
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
9 deletion
+25
-9
mono/metadata/appdomain.c
mono/metadata/appdomain.c
+15
-8
mono/metadata/appdomain.h
mono/metadata/appdomain.h
+2
-1
mono/metadata/unity-utils.c
mono/metadata/unity-utils.c
+7
-0
mono/metadata/unity-utils.h
mono/metadata/unity-utils.h
+1
-0
未找到文件。
mono/metadata/appdomain.c
浏览文件 @
2a5c864a
...
...
@@ -2277,7 +2277,7 @@ ves_icall_System_AppDomain_InternalUnload (gint32 domain_id, MonoError *error)
return
;
MonoException
*
exc
=
NULL
;
mono_domain_try_unload
(
domain
,
(
MonoObject
**
)
&
exc
);
mono_domain_try_unload
(
domain
,
(
MonoObject
**
)
&
exc
,
NULL
);
if
(
exc
)
mono_error_set_exception_instance
(
error
,
exc
);
}
...
...
@@ -2643,7 +2643,7 @@ void
mono_domain_unload
(
MonoDomain
*
domain
)
{
MonoObject
*
exc
=
NULL
;
mono_domain_try_unload
(
domain
,
&
exc
);
mono_domain_try_unload
(
domain
,
&
exc
,
NULL
);
}
static
MonoThreadInfoWaitRet
...
...
@@ -2659,9 +2659,12 @@ guarded_wait (MonoThreadHandle *thread_handle, guint32 timeout, gboolean alertab
}
/**
* mono_domain_unload:
* mono_domain_
try_
unload:
* \param domain The domain to unload
* \param exc Exception information
* \param callback Passes exception information back to caller before domain is unloaded
*
* NOTE: If the callback param is not null the domain unload will continue after executing the callback.
*
* Unloads an appdomain. Follows the process outlined in:
* http://blogs.gotdotnet.com/cbrumme
...
...
@@ -2678,7 +2681,7 @@ guarded_wait (MonoThreadHandle *thread_handle, guint32 timeout, gboolean alertab
* process could end up trying to abort the current thread.
*/
void
mono_domain_try_unload
(
MonoDomain
*
domain
,
MonoObject
**
exc
)
mono_domain_try_unload
(
MonoDomain
*
domain
,
MonoObject
**
exc
,
MonoUnityExceptionFunc
callback
)
{
MonoError
error
;
MonoThreadHandle
*
thread_handle
;
...
...
@@ -2724,10 +2727,14 @@ mono_domain_try_unload (MonoDomain *domain, MonoObject **exc)
}
if
(
*
exc
)
{
/* Roll back the state change */
domain
->
state
=
MONO_APPDOMAIN_CREATED
;
mono_domain_set
(
caller_domain
,
FALSE
);
return
;
if
(
callback
!=
NULL
)
callback
(
*
exc
);
else
{
/* Roll back the state change */
domain
->
state
=
MONO_APPDOMAIN_CREATED
;
mono_domain_set
(
caller_domain
,
FALSE
);
return
;
}
}
mono_domain_set
(
caller_domain
,
FALSE
);
...
...
mono/metadata/appdomain.h
浏览文件 @
2a5c864a
...
...
@@ -27,6 +27,7 @@ typedef struct _MonoJitInfo MonoJitInfo;
typedef
void
(
*
MonoDomainFunc
)
(
MonoDomain
*
domain
,
void
*
user_data
);
typedef
void
(
*
MonoDomainAssemblyFunc
)
(
MonoAssembly
*
assembly
,
void
*
user_data
);
typedef
void
(
*
MonoUnityExceptionFunc
)
(
MonoObject
*
exc
);
MONO_API
MonoDomain
*
mono_init
(
const
char
*
filename
);
...
...
@@ -100,7 +101,7 @@ MONO_API void
mono_domain_unload
(
MonoDomain
*
domain
);
MONO_API
void
mono_domain_try_unload
(
MonoDomain
*
domain
,
MonoObject
**
exc
);
mono_domain_try_unload
(
MonoDomain
*
domain
,
MonoObject
**
exc
,
MonoUnityExceptionFunc
callback
);
MONO_API
mono_bool
mono_domain_is_unloading
(
MonoDomain
*
domain
);
...
...
mono/metadata/unity-utils.c
浏览文件 @
2a5c864a
...
...
@@ -736,6 +736,13 @@ void mono_unity_domain_install_capture_context_method(MonoDomain* domain, gpoint
domain
->
capture_context_method
=
callback
;
}
void
mono_unity_domain_unload
(
MonoDomain
*
domain
,
MonoUnityExceptionFunc
callback
)
{
MonoObject
*
exc
=
NULL
;
mono_domain_try_unload
(
domain
,
&
exc
,
callback
);
}
//array
int
mono_unity_array_get_element_size
(
MonoArray
*
arr
)
...
...
mono/metadata/unity-utils.h
浏览文件 @
2a5c864a
...
...
@@ -102,6 +102,7 @@ guint32 mono_unity_method_get_token(MonoMethod *method);
void
mono_unity_domain_install_finalize_runtime_invoke
(
MonoDomain
*
domain
,
RuntimeInvokeFunction
callback
);
void
mono_unity_domain_install_capture_context_runtime_invoke
(
MonoDomain
*
domain
,
RuntimeInvokeFunction
callback
);
void
mono_unity_domain_install_capture_context_method
(
MonoDomain
*
domain
,
void
*
callback
);
MONO_API
void
mono_unity_domain_unload
(
MonoDomain
*
domain
,
MonoUnityExceptionFunc
callback
);
//array
int
mono_unity_array_get_element_size
(
MonoArray
*
arr
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录