Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
indiff7643
Terarkdb
提交
6ba1084f
T
Terarkdb
项目概览
indiff7643
/
Terarkdb
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Terarkdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6ba1084f
编写于
2月 27, 2014
作者:
K
Kai Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some compilation bugs in different platforms
Summary: detect some problems when testing my 3rd party release tool.
上级
99e4b40a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
10 deletion
+14
-10
Makefile
Makefile
+6
-2
util/auto_roll_logger_test.cc
util/auto_roll_logger_test.cc
+2
-2
util/thread_local_test.cc
util/thread_local_test.cc
+6
-6
未找到文件。
Makefile
浏览文件 @
6ba1084f
...
...
@@ -12,6 +12,10 @@ OPT += -O2 -fno-omit-frame-pointer -momit-leaf-frame-pointer
else
OPT
+=
-fno-omit-frame-pointer
-momit-leaf-frame-pointer
endif
ifeq
($(MAKECMDGOALS),shared_lib)
PLATFORM_SHARED_LDFLAGS
=
-fPIC
endif
#-----------------------------------------------
# detect what platform we're building on
...
...
@@ -135,8 +139,8 @@ $(SHARED2): $(SHARED3)
ln
-fs
$(SHARED3)
$(SHARED2)
endif
$(SHARED3)
:
$(LIBOBJECTS)
$(CXX)
$(PLATFORM_SHARED_LDFLAGS)$(SHARED2)
$(CXXFLAGS)
$(PLATFORM_SHARED_CFLAGS)
$(LDFLAGS)
$(SOURCES)
-o
$@
$(SHARED3)
:
$(CXX)
$(PLATFORM_SHARED_LDFLAGS)$(SHARED2)
$(CXXFLAGS)
$(PLATFORM_SHARED_CFLAGS)
$(LDFLAGS)
$(SOURCES)
-o
$@
endif
# PLATFORM_SHARED_EXT
...
...
util/auto_roll_logger_test.cc
浏览文件 @
6ba1084f
...
...
@@ -245,7 +245,7 @@ TEST(AutoRollLoggerTest, InfoLogLevel) {
InitTestDb
();
size_t
log_size
=
8192
;
in
t
log_lines
=
0
;
size_
t
log_lines
=
0
;
// an extra-scope to force the AutoRollLogger to flush the log file when it
// becomes out of scope.
{
...
...
@@ -275,7 +275,7 @@ TEST(AutoRollLoggerTest, InfoLogLevel) {
}
}
std
::
ifstream
inFile
(
AutoRollLoggerTest
::
kLogFile
.
c_str
());
in
t
lines
=
std
::
count
(
std
::
istreambuf_iterator
<
char
>
(
inFile
),
size_
t
lines
=
std
::
count
(
std
::
istreambuf_iterator
<
char
>
(
inFile
),
std
::
istreambuf_iterator
<
char
>
(),
'\n'
);
ASSERT_EQ
(
log_lines
,
lines
);
inFile
.
close
();
...
...
util/thread_local_test.cc
浏览文件 @
6ba1084f
...
...
@@ -103,7 +103,7 @@ TEST(ThreadLocalTest, UniqueIdTest) {
TEST
(
ThreadLocalTest
,
SequentialReadWriteTest
)
{
// global id list carries over 3, 1, 2, 0
ASSERT_EQ
(
IDChecker
::
PeekId
(),
0
);
ASSERT_EQ
(
IDChecker
::
PeekId
(),
0
u
);
port
::
Mutex
mu
;
port
::
CondVar
cv
(
&
mu
);
...
...
@@ -133,7 +133,7 @@ TEST(ThreadLocalTest, SequentialReadWriteTest) {
};
for
(
int
iter
=
0
;
iter
<
1024
;
++
iter
)
{
ASSERT_EQ
(
IDChecker
::
PeekId
(),
1
);
ASSERT_EQ
(
IDChecker
::
PeekId
(),
1
u
);
// Another new thread, read/write should not see value from previous thread
env_
->
StartThread
(
func
,
static_cast
<
void
*>
(
&
p
));
mu
.
Lock
();
...
...
@@ -141,13 +141,13 @@ TEST(ThreadLocalTest, SequentialReadWriteTest) {
cv
.
Wait
();
}
mu
.
Unlock
();
ASSERT_EQ
(
IDChecker
::
PeekId
(),
1
);
ASSERT_EQ
(
IDChecker
::
PeekId
(),
1
u
);
}
}
TEST
(
ThreadLocalTest
,
ConcurrentReadWriteTest
)
{
// global id list carries over 3, 1, 2, 0
ASSERT_EQ
(
IDChecker
::
PeekId
(),
0
);
ASSERT_EQ
(
IDChecker
::
PeekId
(),
0
u
);
ThreadLocalPtr
tls2
;
port
::
Mutex
mu1
;
...
...
@@ -226,11 +226,11 @@ TEST(ThreadLocalTest, ConcurrentReadWriteTest) {
}
mu2
.
Unlock
();
ASSERT_EQ
(
IDChecker
::
PeekId
(),
3
);
ASSERT_EQ
(
IDChecker
::
PeekId
(),
3
u
);
}
TEST
(
ThreadLocalTest
,
Unref
)
{
ASSERT_EQ
(
IDChecker
::
PeekId
(),
0
);
ASSERT_EQ
(
IDChecker
::
PeekId
(),
0
u
);
auto
unref
=
[](
void
*
ptr
)
{
auto
&
p
=
*
static_cast
<
Params
*>
(
ptr
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录