Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
clmforever
oceanbase
提交
f71e5149
O
oceanbase
项目概览
clmforever
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f71e5149
编写于
11月 03, 2022
作者:
O
obdev
提交者:
wangzelin.wzl
11月 03, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make sanity support aarch64
上级
0cd1d555
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
7 addition
and
4 deletion
+7
-4
deps/oblib/src/CMakeLists.txt
deps/oblib/src/CMakeLists.txt
+1
-1
deps/oblib/src/lib/alloc/libsanity_aarch64.so
deps/oblib/src/lib/alloc/libsanity_aarch64.so
+0
-0
deps/oblib/src/lib/alloc/libsanity_x86_64.so
deps/oblib/src/lib/alloc/libsanity_x86_64.so
+0
-0
deps/oblib/src/lib/resource/achunk_mgr.cpp
deps/oblib/src/lib/resource/achunk_mgr.cpp
+5
-2
src/objit/CMakeLists.txt
src/objit/CMakeLists.txt
+1
-1
未找到文件。
deps/oblib/src/CMakeLists.txt
浏览文件 @
f71e5149
...
...
@@ -45,7 +45,7 @@ if (OB_USE_CLANG)
if
(
ENABLE_SANITY
)
target_compile_options
(
oblib_base_base
INTERFACE
"$<$<COMPILE_LANGUAGE:CXX>:SHELL:-Xclang -load -Xclang
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/alloc/libsanity.so>"
"$<$<COMPILE_LANGUAGE:CXX>:SHELL:-Xclang -load -Xclang
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/alloc/libsanity
_
${
ARCHITECTURE
}
.so>"
-fno-builtin-memset
-fno-builtin-bzero
-fno-builtin-memcpy
...
...
deps/oblib/src/lib/alloc/libsanity_aarch64.so
0 → 100755
浏览文件 @
f71e5149
文件已添加
deps/oblib/src/lib/alloc/libsanity.so
→
deps/oblib/src/lib/alloc/libsanity
_x86_64
.so
浏览文件 @
f71e5149
文件已移动
deps/oblib/src/lib/resource/achunk_mgr.cpp
浏览文件 @
f71e5149
...
...
@@ -130,7 +130,7 @@ void *AChunkMgr::low_alloc(const uint64_t size, const bool can_use_huge_page, bo
void
*
ptr
=
nullptr
;
huge_page_used
=
false
;
const
int
prot
=
PROT_READ
|
PROT_WRITE
;
const
int
flags
=
MAP_PRIVATE
|
MAP_ANONYMOUS
|
(
SANITY_BOOL_EXPR
(
alloc_shadow
)
?
MAP_FIXED
:
0
);
int
flags
=
MAP_PRIVATE
|
MAP_ANONYMOUS
|
(
SANITY_BOOL_EXPR
(
alloc_shadow
)
?
MAP_FIXED
:
0
);
int
huge_flags
=
flags
;
#ifdef MAP_HUGETLB
if
(
OB_LIKELY
(
can_use_huge_page
))
{
...
...
@@ -143,8 +143,11 @@ void *AChunkMgr::low_alloc(const uint64_t size, const bool can_use_huge_page, bo
if
(
SANITY_BOOL_EXPR
(
alloc_shadow
))
{
int64_t
new_addr
=
ATOMIC_FAA
(
&
global_canonical_addr
,
size
);
if
(
!
SANITY_ADDR_IN_RANGE
((
void
*
)
new_addr
))
{
LOG_ERROR
(
"sanity address exhausted"
,
K
(
errno
),
KP
(
new_addr
));
LOG_WARN
(
"sanity address exhausted"
,
K
(
errno
),
KP
(
new_addr
));
ATOMIC_FAA
(
&
global_canonical_addr
,
-
size
);
ptr
=
NULL
;
// let it goon, it means no shadow, same as out of checker!
// in aarch64, mmap will return EPERM error when NULL address and MAP_FIXED are privided at the same time
flags
&=
~
MAP_FIXED
;
}
else
{
ptr
=
(
void
*
)
new_addr
;
}
...
...
src/objit/CMakeLists.txt
浏览文件 @
f71e5149
...
...
@@ -28,7 +28,7 @@ add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0 -g -O2 -frtti)
if
(
${
ARCHITECTURE
}
STREQUAL
"x86_64"
)
LLVM_MAP_COMPONENTS_TO_LIBNAMES
(
llvm_libs Support Core IRReader ExecutionEngine OrcJit McJit X86CodeGen X86AsmParser runtimedyld bitreader bitwriter object objectyaml target DebugInfoDWARF Symbolize
)
else
()
LLVM_MAP_COMPONENTS_TO_LIBNAMES
(
llvm_libs Support Core IRReader ExecutionEngine OrcJit McJit AArch64CodeGen AArch64AsmParser runtimedyld bitreader bitwriter object objectyaml target DebugInfoDWARF
)
LLVM_MAP_COMPONENTS_TO_LIBNAMES
(
llvm_libs Support Core IRReader ExecutionEngine OrcJit McJit AArch64CodeGen AArch64AsmParser runtimedyld bitreader bitwriter object objectyaml target DebugInfoDWARF
Symbolize
)
endif
()
set
(
CMAKE_MODULE_PATH
"
${
LLVM_CMAKE_DIR
}
"
)
include
(
${
LLVM_CMAKE_DIR
}
/HandleLLVMOptions.cmake
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录