Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xindoo
redis
提交
9ebed7cf
R
redis
项目概览
xindoo
/
redis
通知
2
Star
2
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,发现更多精彩内容 >>
提交
9ebed7cf
编写于
2月 22, 2010
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed 32bit make target to work on Linux out of the box
上级
12d090d2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
9 deletion
+13
-9
Makefile
Makefile
+4
-1
redis.c
redis.c
+7
-7
test-redis.tcl
test-redis.tcl
+2
-1
未找到文件。
Makefile
浏览文件 @
9ebed7cf
...
...
@@ -79,7 +79,10 @@ log:
git log
'--pretty=format:%ad %s'
--date
=
short
>
Changelog
32bit
:
make
ARCH
=
"-arch i386"
@
echo
""
@
echo
"WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
@
echo
""
make
ARCH
=
"-m32"
gprof
:
make
PROF
=
"-pg"
...
...
redis.c
浏览文件 @
9ebed7cf
...
...
@@ -7406,7 +7406,7 @@ static int vmWriteObjectOnSwap(robj *o, off_t page) {
if
(
fseeko
(
server
.
vm_fp
,
page
*
server
.
vm_page_size
,
SEEK_SET
)
==
-
1
)
{
if
(
server
.
vm_enabled
)
pthread_mutex_unlock
(
&
server
.
io_swapfile_mutex
);
redisLog
(
REDIS_WARNING
,
"Critical VM problem in vm
SwapObjectBlocking
(): can't seek: %s"
,
"Critical VM problem in vm
WriteObjectOnSwap
(): can't seek: %s"
,
strerror
(
errno
));
return
REDIS_ERR
;
}
...
...
@@ -7922,8 +7922,8 @@ static void *IOThreadEntryPoint(void *arg) {
lockThreadedIO
();
if
(
listLength
(
server
.
io_newjobs
)
==
0
)
{
/* No new jobs in queue, exit. */
redisLog
(
REDIS_DEBUG
,
"Thread %l
l
d exiting, nothing to do"
,
(
long
long
)
pthread_self
());
redisLog
(
REDIS_DEBUG
,
"Thread %ld exiting, nothing to do"
,
(
long
)
pthread_self
());
server
.
io_active_threads
--
;
unlockThreadedIO
();
return
NULL
;
...
...
@@ -7936,8 +7936,8 @@ static void *IOThreadEntryPoint(void *arg) {
listAddNodeTail
(
server
.
io_processing
,
j
);
ln
=
listLast
(
server
.
io_processing
);
/* We use ln later to remove it */
unlockThreadedIO
();
redisLog
(
REDIS_DEBUG
,
"Thread %l
l
d got a new job (type %d): %p about key '%s'"
,
(
long
long
)
pthread_self
(),
j
->
type
,
(
void
*
)
j
,
(
char
*
)
j
->
key
->
ptr
);
redisLog
(
REDIS_DEBUG
,
"Thread %ld got a new job (type %d): %p about key '%s'"
,
(
long
)
pthread_self
(),
j
->
type
,
(
void
*
)
j
,
(
char
*
)
j
->
key
->
ptr
);
/* Process the Job */
if
(
j
->
type
==
REDIS_IOJOB_LOAD
)
{
...
...
@@ -7952,8 +7952,8 @@ static void *IOThreadEntryPoint(void *arg) {
}
/* Done: insert the job into the processed queue */
redisLog
(
REDIS_DEBUG
,
"Thread %l
l
d completed the job: %p (key %s)"
,
(
long
long
)
pthread_self
(),
(
void
*
)
j
,
(
char
*
)
j
->
key
->
ptr
);
redisLog
(
REDIS_DEBUG
,
"Thread %ld completed the job: %p (key %s)"
,
(
long
)
pthread_self
(),
(
void
*
)
j
,
(
char
*
)
j
->
key
->
ptr
);
lockThreadedIO
();
listDelNode
(
server
.
io_processing
,
ln
);
listAddNodeTail
(
server
.
io_processed
,
j
);
...
...
test-redis.tcl
浏览文件 @
9ebed7cf
...
...
@@ -952,6 +952,7 @@ proc main {server port} {
$r sort tosort
{
DESC
}
}
[
lsort -decreasing -integer $res
]
while 1
{
test
{
SORT speed, sorting 10000 elements list using BY, 100 times
}
{
set start
[
clock clicks -milliseconds
]
for
{
set i 0
}
{
$i
< 100
}
{
incr i
}
{
...
...
@@ -962,7 +963,7 @@ proc main {server port} {
flush stdout
format
{}
}
{}
}
test
{
SORT speed, sorting 10000 elements list directly, 100 times
}
{
set start
[
clock clicks -milliseconds
]
for
{
set i 0
}
{
$i
< 100
}
{
incr i
}
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录