Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
别团等shy哥发育
redis
提交
66b7f8a0
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,发现更多精彩内容 >>
提交
66b7f8a0
编写于
1月 28, 2014
作者:
J
Jonathan Pickett
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
working through issues regarding sentinal not working
上级
e1f312e5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
3 deletion
+21
-3
deps/hiredis/async.c
deps/hiredis/async.c
+3
-3
src/Win32_Interop/win32fixes.c
src/Win32_Interop/win32fixes.c
+18
-0
未找到文件。
deps/hiredis/async.c
浏览文件 @
66b7f8a0
...
@@ -156,9 +156,9 @@ redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
...
@@ -156,9 +156,9 @@ redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
struct
sockaddr_in
sa
;
struct
sockaddr_in
sa
;
redisContext
*
c
=
redisPreConnectNonBlock
(
ip
,
port
,
&
sa
);
redisContext
*
c
=
redisPreConnectNonBlock
(
ip
,
port
,
&
sa
);
redisAsyncContext
*
ac
=
redisAsyncInitialize
(
c
);
redisAsyncContext
*
ac
=
redisAsyncInitialize
(
c
);
if
(
aeWinSocketConnect
(
c
->
fd
,
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
0
)
{
if
(
aeWinSocketConnect
(
ac
->
c
.
fd
,
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
0
)
{
c
->
err
=
errno
;
ac
->
c
.
err
=
errno
;
strerror_r
(
errno
,
c
->
errstr
,
sizeof
(
c
->
errstr
));
strerror_r
(
errno
,
ac
->
c
.
errstr
,
sizeof
(
ac
->
c
.
errstr
));
}
}
__redisAsyncCopyError
(
ac
);
__redisAsyncCopyError
(
ac
);
return
ac
;
return
ac
;
...
...
src/Win32_Interop/win32fixes.c
浏览文件 @
66b7f8a0
...
@@ -84,6 +84,24 @@ pid_t wait3(int *stat_loc, int options, void *rusage) {
...
@@ -84,6 +84,24 @@ pid_t wait3(int *stat_loc, int options, void *rusage) {
REDIS_NOTUSED
(
stat_loc
);
REDIS_NOTUSED
(
stat_loc
);
REDIS_NOTUSED
(
options
);
REDIS_NOTUSED
(
options
);
REDIS_NOTUSED
(
rusage
);
REDIS_NOTUSED
(
rusage
);
//JEP: BUGBUG
// http://linux.die.net/man/2/wait3 says:
// "wait3(status, options, rusage); is equivalent to: waitpid(-1, status, options); "
//
// http://linux.die.net/man/2/waitpid says:
// "The value of pid can be:
// < -1 meaning wait for any child process whose process group ID is equal to the absolute value of pid.
// -1 meaning wait for any child process.
// 0 meaning wait for any child process whose process group ID is equal to that of the calling process.
// > 0 meaning wait for the child whose process ID is equal to the value of pid."
//
// On Windows waitpid evaluates to _cwait, so the -1 passed referrs to the current process. Thus it will never signal.
//
// Since windows parent->child relationships are unreliable (process ids are recycled leading to unexpected PID relationships),
// the hiredis mechanism of process signaling will have to be changed. It should be using process handles on Windows.
return
(
pid_t
)
waitpid
((
intptr_t
)
-
1
,
0
,
WAIT_FLAGS
);
return
(
pid_t
)
waitpid
((
intptr_t
)
-
1
,
0
,
WAIT_FLAGS
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录