Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
别团等shy哥发育
redis
提交
642df0ee
R
redis
项目概览
别团等shy哥发育
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
642df0ee
编写于
6月 01, 2015
作者:
A
Alexis Campailla
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor fixes in VectoredHeapMapper
Fixed boundary check heapEnd Improved logging
上级
9e7b21ca
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
9 addition
and
8 deletion
+9
-8
src/Win32_Interop/Win32_QFork.cpp
src/Win32_Interop/Win32_QFork.cpp
+9
-8
未找到文件。
src/Win32_Interop/Win32_QFork.cpp
浏览文件 @
642df0ee
...
...
@@ -613,12 +613,12 @@ BOOL QForkMasterInit( __int64 maxheapBytes ) {
}
LONG
CALLBACK
VectoredHeapMapper
(
PEXCEPTION_POINTERS
info
)
{
if
(
info
->
ExceptionRecord
->
ExceptionCode
==
STATUS_ACCESS_VIOLATION
&&
if
(
info
->
ExceptionRecord
->
ExceptionCode
==
STATUS_ACCESS_VIOLATION
&&
info
->
ExceptionRecord
->
NumberParameters
==
2
)
{
intptr_t
failingMemoryAddress
=
info
->
ExceptionRecord
->
ExceptionInformation
[
1
];
intptr_t
heapStart
=
(
intptr_t
)
g_pQForkControl
->
heapStart
;
intptr_t
heapEnd
=
heapStart
+
((
SIZE_T
)
g_pQForkControl
->
availableBlocksInHeap
*
g_pQForkControl
->
heapBlockSize
);
if
(
failingMemoryAddress
>=
heapStart
&&
failingMemoryAddress
<=
heapEnd
)
if
(
failingMemoryAddress
>=
heapStart
&&
failingMemoryAddress
<
heapEnd
)
{
intptr_t
startOfMapping
=
failingMemoryAddress
-
failingMemoryAddress
%
g_systemAllocationGranularity
;
intptr_t
mmfOffset
=
startOfMapping
-
heapStart
;
...
...
@@ -634,6 +634,7 @@ LONG CALLBACK VectoredHeapMapper(PEXCEPTION_POINTERS info) {
LODWORD
(
mmfOffset
),
bytesToMap
,
(
LPVOID
)
startOfMapping
);
if
(
pMapped
!=
NULL
)
{
return
EXCEPTION_CONTINUE_EXECUTION
;
...
...
@@ -641,15 +642,15 @@ LONG CALLBACK VectoredHeapMapper(PEXCEPTION_POINTERS info) {
else
{
DWORD
err
=
GetLastError
();
::
redisLog
(
REDIS_WARNING
,
"
\n
F(0x%p)"
,
startOfMapping
);
::
redisLog
(
REDIS_WARNING
,
"
\t
MapViewOfFileEx failed with error 0x%08X.
\n
"
,
err
);
::
redisLog
(
REDIS_WARNING
,
"
MapViewOfFileEx failed with error 0x%08X.
\n
"
,
err
);
::
redisLog
(
REDIS_WARNING
,
"
\t
startOfMapping 0x%p"
,
startOfMapping
);
::
redisLog
(
REDIS_WARNING
,
"
\t
heapStart 0x%p
\n
"
,
heapStart
);
::
redisLog
(
REDIS_WARNING
,
"
\t
heapEnd 0x%p
\n
"
,
heapEnd
);
::
redisLog
(
REDIS_WARNING
,
"
\t
failing access location 0x%p
\n
"
,
failingMemoryAddress
);
::
redisLog
(
REDIS_WARNING
,
"
\t
offset into mmf to start mapping 0x%
016X
\n
"
,
mmfOffset
);
::
redisLog
(
REDIS_WARNING
,
"
\t
start of new mapping 0x%p
\n
"
,
startOfMapping
);
::
redisLog
(
REDIS_WARNING
,
"
\t
bytes to map 0x%
08x
\n
"
,
bytesToMap
);
::
redisLog
(
REDIS_WARNING
,
"
\t
continuing exception handler search
\n
"
);
::
redisLog
(
REDIS_WARNING
,
"
\t
offset into mmf to start mapping 0x%
p
\n
"
,
mmfOffset
);
::
redisLog
(
REDIS_WARNING
,
"
\t
start of new mapping 0x%p
\n
"
,
startOfMapping
);
::
redisLog
(
REDIS_WARNING
,
"
\t
bytes to map 0x%
p
\n
"
,
bytesToMap
);
::
redisLog
(
REDIS_WARNING
,
"
\t
continuing exception handler search
\n
"
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录