Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
7ef5c508
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7ef5c508
编写于
9月 01, 2015
作者:
P
Pavel Kartavyy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "dbms::Allocator: support big alignments for ███████████ [#METR-17814]"
This reverts commit 8d5d4b6b9265e2b5a103a6d713df81d7fe232745.
上级
044b70ff
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
28 deletion
+14
-28
dbms/include/DB/Common/Allocator.h
dbms/include/DB/Common/Allocator.h
+14
-28
未找到文件。
dbms/include/DB/Common/Allocator.h
浏览文件 @
7ef5c508
...
...
@@ -36,21 +36,16 @@ public:
if
(
size
>=
MMAP_THRESHOLD
)
{
if
(
alignment
<=
MMAP_MIN_ALIGNMENT
)
{
buf
=
mmap
(
NULL
,
size
,
PROT_READ
|
PROT_WRITE
,
MAP_PRIVATE
|
MAP_ANONYMOUS
,
-
1
,
0
);
if
(
MAP_FAILED
==
buf
)
DB
::
throwFromErrno
(
"Allocator: Cannot mmap."
,
DB
::
ErrorCodes
::
CANNOT_ALLOCATE_MEMORY
);
if
(
alignment
>
MMAP_MIN_ALIGNMENT
)
throw
DB
::
Exception
(
"Too large alignment: more than page size."
,
DB
::
ErrorCodes
::
BAD_ARGUMENTS
);
/// См. комментарий в HashTableAllocator.h
if
(
size
>=
HUGE_PAGE_SIZE
&&
0
!=
madvise
(
buf
,
size
,
MADV_HUGEPAGE
))
DB
::
throwFromErrno
(
"HashTableAllocator: Cannot madvise with MADV_HUGEPAGE."
,
DB
::
ErrorCodes
::
CANNOT_ALLOCATE_MEMORY
);
}
else
{
/// если выравнивание больше, чем размер страницы используем posix_memalign
buf
=
allocateUsingPosixMemalign
(
size
,
alignment
);
}
buf
=
mmap
(
NULL
,
size
,
PROT_READ
|
PROT_WRITE
,
MAP_PRIVATE
|
MAP_ANONYMOUS
,
-
1
,
0
);
if
(
MAP_FAILED
==
buf
)
DB
::
throwFromErrno
(
"Allocator: Cannot mmap."
,
DB
::
ErrorCodes
::
CANNOT_ALLOCATE_MEMORY
);
/// См. комментарий в HashTableAllocator.h
if
(
size
>=
HUGE_PAGE_SIZE
&&
0
!=
madvise
(
buf
,
size
,
MADV_HUGEPAGE
))
DB
::
throwFromErrno
(
"HashTableAllocator: Cannot madvise with MADV_HUGEPAGE."
,
DB
::
ErrorCodes
::
CANNOT_ALLOCATE_MEMORY
);
}
else
{
...
...
@@ -63,7 +58,11 @@ public:
}
else
{
buf
=
allocateUsingPosixMemalign
(
size
,
alignment
);
buf
=
nullptr
;
int
res
=
posix_memalign
(
&
buf
,
alignment
,
size
);
if
(
0
!=
res
)
DB
::
throwFromErrno
(
"Cannot allocate memory (posix_memalign)"
,
DB
::
ErrorCodes
::
CANNOT_ALLOCATE_MEMORY
,
res
);
}
}
...
...
@@ -122,17 +121,4 @@ public:
return
buf
;
}
private:
void
*
allocateUsingPosixMemalign
(
size_t
size
,
size_t
alignment
)
{
void
*
buf
=
nullptr
;
int
res
=
posix_memalign
(
&
buf
,
alignment
,
size
);
if
(
0
!=
res
)
DB
::
throwFromErrno
(
"Cannot allocate memory (posix_memalign)"
,
DB
::
ErrorCodes
::
CANNOT_ALLOCATE_MEMORY
,
res
);
return
buf
;
}
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录