Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
3642557a
Commit
3642557a
authored
Oct 28, 2012
by
YAMAMOTO Takashi
Committed by
antirez
Jun 26, 2013
Browse files
don't assume time_t == long
time_t is always 64bit on recent versions of NetBSD.
parent
30f3ae03
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/config.c
View file @
3642557a
...
@@ -973,8 +973,8 @@ void configGetCommand(redisClient *c) {
...
@@ -973,8 +973,8 @@ void configGetCommand(redisClient *c) {
int
j
;
int
j
;
for
(
j
=
0
;
j
<
server
.
saveparamslen
;
j
++
)
{
for
(
j
=
0
;
j
<
server
.
saveparamslen
;
j
++
)
{
buf
=
sdscatprintf
(
buf
,
"%
l
d %d"
,
buf
=
sdscatprintf
(
buf
,
"%
j
d %d"
,
server
.
saveparams
[
j
].
seconds
,
(
intmax_t
)
server
.
saveparams
[
j
].
seconds
,
server
.
saveparams
[
j
].
changes
);
server
.
saveparams
[
j
].
changes
);
if
(
j
!=
server
.
saveparamslen
-
1
)
if
(
j
!=
server
.
saveparamslen
-
1
)
buf
=
sdscatlen
(
buf
,
" "
,
1
);
buf
=
sdscatlen
(
buf
,
" "
,
1
);
...
...
src/redis.c
View file @
3642557a
...
@@ -2017,8 +2017,8 @@ sds genRedisInfoString(char *section) {
...
@@ -2017,8 +2017,8 @@ sds genRedisInfoString(char *section) {
"process_id:%ld
\r\n
"
"process_id:%ld
\r\n
"
"run_id:%s
\r\n
"
"run_id:%s
\r\n
"
"tcp_port:%d
\r\n
"
"tcp_port:%d
\r\n
"
"uptime_in_seconds:%
l
d
\r\n
"
"uptime_in_seconds:%
j
d
\r\n
"
"uptime_in_days:%
l
d
\r\n
"
"uptime_in_days:%
j
d
\r\n
"
"hz:%d
\r\n
"
"hz:%d
\r\n
"
"lru_clock:%ld
\r\n
"
"lru_clock:%ld
\r\n
"
"config_file:%s
\r\n
"
,
"config_file:%s
\r\n
"
,
...
@@ -2038,8 +2038,8 @@ sds genRedisInfoString(char *section) {
...
@@ -2038,8 +2038,8 @@ sds genRedisInfoString(char *section) {
(
long
)
getpid
(),
(
long
)
getpid
(),
server
.
runid
,
server
.
runid
,
server
.
port
,
server
.
port
,
uptime
,
(
intmax_t
)
uptime
,
uptime
/
(
3600
*
24
),
(
intmax_t
)(
uptime
/
(
3600
*
24
)
)
,
server
.
hz
,
server
.
hz
,
(
unsigned
long
)
server
.
lruclock
,
(
unsigned
long
)
server
.
lruclock
,
server
.
configfile
?
server
.
configfile
:
""
);
server
.
configfile
?
server
.
configfile
:
""
);
...
@@ -2096,30 +2096,30 @@ sds genRedisInfoString(char *section) {
...
@@ -2096,30 +2096,30 @@ sds genRedisInfoString(char *section) {
"loading:%d
\r\n
"
"loading:%d
\r\n
"
"rdb_changes_since_last_save:%lld
\r\n
"
"rdb_changes_since_last_save:%lld
\r\n
"
"rdb_bgsave_in_progress:%d
\r\n
"
"rdb_bgsave_in_progress:%d
\r\n
"
"rdb_last_save_time:%
l
d
\r\n
"
"rdb_last_save_time:%
j
d
\r\n
"
"rdb_last_bgsave_status:%s
\r\n
"
"rdb_last_bgsave_status:%s
\r\n
"
"rdb_last_bgsave_time_sec:%
l
d
\r\n
"
"rdb_last_bgsave_time_sec:%
j
d
\r\n
"
"rdb_current_bgsave_time_sec:%
l
d
\r\n
"
"rdb_current_bgsave_time_sec:%
j
d
\r\n
"
"aof_enabled:%d
\r\n
"
"aof_enabled:%d
\r\n
"
"aof_rewrite_in_progress:%d
\r\n
"
"aof_rewrite_in_progress:%d
\r\n
"
"aof_rewrite_scheduled:%d
\r\n
"
"aof_rewrite_scheduled:%d
\r\n
"
"aof_last_rewrite_time_sec:%
l
d
\r\n
"
"aof_last_rewrite_time_sec:%
j
d
\r\n
"
"aof_current_rewrite_time_sec:%
l
d
\r\n
"
"aof_current_rewrite_time_sec:%
j
d
\r\n
"
"aof_last_bgrewrite_status:%s
\r\n
"
,
"aof_last_bgrewrite_status:%s
\r\n
"
,
server
.
loading
,
server
.
loading
,
server
.
dirty
,
server
.
dirty
,
server
.
rdb_child_pid
!=
-
1
,
server
.
rdb_child_pid
!=
-
1
,
server
.
lastsave
,
(
intmax_t
)
server
.
lastsave
,
(
server
.
lastbgsave_status
==
REDIS_OK
)
?
"ok"
:
"err"
,
(
server
.
lastbgsave_status
==
REDIS_OK
)
?
"ok"
:
"err"
,
server
.
rdb_save_time_last
,
(
intmax_t
)
server
.
rdb_save_time_last
,
(
server
.
rdb_child_pid
==
-
1
)
?
(
intmax_t
)(
(
server
.
rdb_child_pid
==
-
1
)
?
-
1
:
time
(
NULL
)
-
server
.
rdb_save_time_start
,
-
1
:
time
(
NULL
)
-
server
.
rdb_save_time_start
)
,
server
.
aof_state
!=
REDIS_AOF_OFF
,
server
.
aof_state
!=
REDIS_AOF_OFF
,
server
.
aof_child_pid
!=
-
1
,
server
.
aof_child_pid
!=
-
1
,
server
.
aof_rewrite_scheduled
,
server
.
aof_rewrite_scheduled
,
server
.
aof_rewrite_time_last
,
(
intmax_t
)
server
.
aof_rewrite_time_last
,
(
server
.
aof_child_pid
==
-
1
)
?
(
intmax_t
)(
(
server
.
aof_child_pid
==
-
1
)
?
-
1
:
time
(
NULL
)
-
server
.
aof_rewrite_time_start
,
-
1
:
time
(
NULL
)
-
server
.
aof_rewrite_time_start
)
,
(
server
.
aof_lastbgrewrite_status
==
REDIS_OK
)
?
"ok"
:
"err"
);
(
server
.
aof_lastbgrewrite_status
==
REDIS_OK
)
?
"ok"
:
"err"
);
if
(
server
.
aof_state
!=
REDIS_AOF_OFF
)
{
if
(
server
.
aof_state
!=
REDIS_AOF_OFF
)
{
...
@@ -2158,16 +2158,16 @@ sds genRedisInfoString(char *section) {
...
@@ -2158,16 +2158,16 @@ sds genRedisInfoString(char *section) {
}
}
info
=
sdscatprintf
(
info
,
info
=
sdscatprintf
(
info
,
"loading_start_time:%
l
d
\r\n
"
"loading_start_time:%
j
d
\r\n
"
"loading_total_bytes:%llu
\r\n
"
"loading_total_bytes:%llu
\r\n
"
"loading_loaded_bytes:%llu
\r\n
"
"loading_loaded_bytes:%llu
\r\n
"
"loading_loaded_perc:%.2f
\r\n
"
"loading_loaded_perc:%.2f
\r\n
"
"loading_eta_seconds:%
l
d
\r\n
"
"loading_eta_seconds:%
j
d
\r\n
"
,
,(
unsigned
long
)
server
.
loading_start_time
,
(
intmax_t
)
server
.
loading_start_time
,
(
unsigned
long
long
)
server
.
loading_total_bytes
,
(
unsigned
long
long
)
server
.
loading_total_bytes
,
(
unsigned
long
long
)
server
.
loading_loaded_bytes
,
(
unsigned
long
long
)
server
.
loading_loaded_bytes
,
perc
,
perc
,
eta
(
intmax_t
)
eta
);
);
}
}
}
}
...
@@ -2244,8 +2244,8 @@ sds genRedisInfoString(char *section) {
...
@@ -2244,8 +2244,8 @@ sds genRedisInfoString(char *section) {
if
(
server
.
repl_state
!=
REDIS_REPL_CONNECTED
)
{
if
(
server
.
repl_state
!=
REDIS_REPL_CONNECTED
)
{
info
=
sdscatprintf
(
info
,
info
=
sdscatprintf
(
info
,
"master_link_down_since_seconds:%
l
d
\r\n
"
,
"master_link_down_since_seconds:%
j
d
\r\n
"
,
(
long
)
server
.
unixtime
-
server
.
repl_down_since
);
(
intmax_t
)
server
.
unixtime
-
server
.
repl_down_since
);
}
}
info
=
sdscatprintf
(
info
,
info
=
sdscatprintf
(
info
,
"slave_priority:%d
\r\n
"
"slave_priority:%d
\r\n
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment