Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
hanoi2005
redis
提交
9e7b21ca
R
redis
项目概览
hanoi2005
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,体验更适合开发者的 AI 搜索 >>
提交
9e7b21ca
编写于
5月 29, 2015
作者:
A
Alexis Campailla
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Eliminate #ifdefs related to off_t
上级
03492e24
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
42 deletion
+5
-42
src/redis-check-aof.c
src/redis-check-aof.c
+3
-12
src/redis.c
src/redis.c
+0
-5
src/redis.h
src/redis.h
+2
-20
src/replication.c
src/replication.c
+0
-5
未找到文件。
src/redis-check-aof.c
浏览文件 @
9e7b21ca
...
...
@@ -55,11 +55,7 @@
}
static
char
error
[
1024
];
#ifdef _WIN32
long
long
epos
;
#else
static
off_t
epos
;
#endif
int
consumeNewline
(
char
*
buf
)
{
if
(
strncmp
(
buf
,
"
\r\n
"
,
2
)
!=
0
)
{
...
...
@@ -167,19 +163,14 @@ int main(int argc, char **argv) {
int
fix
=
0
;
FILE
*
fp
;
struct
redis_stat
sb
;
off_t
size
;
off_t
pos
;
off_t
diff
;
#ifdef _WIN32
long
long
size
;
long
long
pos
;
long
long
diff
;
_fmode
=
_O_BINARY
;
setmode
(
_fileno
(
stdin
),
_O_BINARY
);
setmode
(
_fileno
(
stdout
),
_O_BINARY
);
setmode
(
_fileno
(
stderr
),
_O_BINARY
);
#else
off_t
size
;
off_t
pos
;
off_t
diff
;
#endif
if
(
argc
<
2
)
{
...
...
src/redis.c
浏览文件 @
9e7b21ca
...
...
@@ -2820,13 +2820,8 @@ sds genRedisInfoString(char *section) {
if
(
server
.
loading
)
{
double
perc
;
time_t
eta
,
elapsed
;
#ifdef _WIN32
long
long
remaining_bytes
=
server
.
loading_total_bytes
-
server
.
loading_loaded_bytes
;
#else
off_t
remaining_bytes
=
server
.
loading_total_bytes
-
server
.
loading_loaded_bytes
;
#endif
perc
=
((
double
)
server
.
loading_loaded_bytes
/
(
server
.
loading_total_bytes
+
1
))
*
100
;
...
...
src/redis.h
浏览文件 @
9e7b21ca
...
...
@@ -521,11 +521,10 @@ typedef struct redisClient {
#ifdef _WIN32
char
replFileCopy
[
_MAX_PATH
];
long
long
repldboff
;
/* replication DB file offset */
long
long
repldbsize
;
/* replication DB file size */
#else
long
repldboff
;
/* replication DB file offset */
off_t
repldbsize
;
/* replication DB file size */
long
repldboff
;
/* replication DB file offset */
INDUCE_MERGE_CONFLICT
#endif
off_t
repldbsize
;
/* replication DB file size */
sds
replpreamble
;
/* replication DB preamble. */
long
long
reploff
;
/* replication offset if this is our master */
long
long
repl_ack_off
;
/* replication ack offset, if this is a slave */
...
...
@@ -663,13 +662,8 @@ struct redisServer {
uint64_t
next_client_id
;
/* Next client unique ID. Incremental. */
/* RDB / AOF loading information */
int
loading
;
/* We are loading data from disk if true */
#ifdef _WIN32
long
long
loading_total_bytes
;
long
long
loading_loaded_bytes
;
#else
off_t
loading_total_bytes
;
off_t
loading_loaded_bytes
;
#endif
time_t
loading_start_time
;
off_t
loading_process_events_interval_bytes
;
/* Fast pointers to often looked up command */
...
...
@@ -720,15 +714,9 @@ struct redisServer {
char
*
aof_filename
;
/* Name of the AOF file */
int
aof_no_fsync_on_rewrite
;
/* Don't fsync if a rewrite is in prog. */
int
aof_rewrite_perc
;
/* Rewrite AOF if % growth is > M and... */
#ifdef _WIN32
long
long
aof_rewrite_min_size
;
/* the AOF file is at least N bytes. */
long
long
aof_rewrite_base_size
;
/* AOF size on latest startup or rewrite. */
long
long
aof_current_size
;
/* AOF current size. */
#else
off_t
aof_rewrite_min_size
;
/* the AOF file is at least N bytes. */
off_t
aof_rewrite_base_size
;
/* AOF size on latest startup or rewrite. */
off_t
aof_current_size
;
/* AOF current size. */
#endif
int
aof_rewrite_scheduled
;
/* Rewrite once BGSAVE terminates. */
pid_t
aof_child_pid
;
/* PID if rewriting process */
list
*
aof_rewrite_buf_blocks
;
/* Hold changes during an AOF rewrite. */
...
...
@@ -798,15 +786,9 @@ struct redisServer {
redisClient
*
cached_master
;
/* Cached master to be reused for PSYNC. */
int
repl_syncio_timeout
;
/* Timeout for synchronous I/O calls */
int
repl_state
;
/* Replication status if the instance is a slave */
#ifdef _WIN64
int64_t
repl_transfer_size
;
/* Size of RDB to read from master during sync. */
int64_t
repl_transfer_read
;
/* Amount of RDB read from master during sync. */
int64_t
repl_transfer_last_fsync_off
;
/* Offset when we fsync-ed last time. */
#else
off_t
repl_transfer_size
;
/* Size of RDB to read from master during sync. */
off_t
repl_transfer_read
;
/* Amount of RDB read from master during sync. */
off_t
repl_transfer_last_fsync_off
;
/* Offset when we fsync-ed last time. */
#endif
int
repl_transfer_s
;
/* Slave -> Master SYNC socket */
int
repl_transfer_fd
;
/* Slave -> Master SYNC temp file descriptor */
char
*
repl_transfer_tmpfile
;
/* Slave-> master SYNC temp file name */
...
...
src/replication.c
浏览文件 @
9e7b21ca
...
...
@@ -1125,13 +1125,8 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
if
(
server
.
repl_transfer_read
>=
server
.
repl_transfer_last_fsync_off
+
REPL_MAX_WRITTEN_BEFORE_FSYNC
)
{
#ifdef _WIN64
int64_t
sync_size
=
server
.
repl_transfer_read
-
server
.
repl_transfer_last_fsync_off
;
#else
off_t
sync_size
=
server
.
repl_transfer_read
-
server
.
repl_transfer_last_fsync_off
;
#endif
rdb_fsync_range
(
server
.
repl_transfer_fd
,
server
.
repl_transfer_last_fsync_off
,
sync_size
);
server
.
repl_transfer_last_fsync_off
+=
sync_size
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录