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
da5dc458
Commit
da5dc458
authored
Nov 19, 2019
by
antirez
Browse files
Rename var to fixed_time_expire now that is more general.
parent
0fefed25
Changes
4
Show whitespace changes
Inline
Side-by-side
src/blocked.c
View file @
da5dc458
...
@@ -269,7 +269,7 @@ void handleClientsBlockedOnKeys(void) {
...
@@ -269,7 +269,7 @@ void handleClientsBlockedOnKeys(void) {
* that) without the risk of it being freed in the second
* that) without the risk of it being freed in the second
* lookup, invalidating the first one.
* lookup, invalidating the first one.
* See https://github.com/antirez/redis/pull/6554. */
* See https://github.com/antirez/redis/pull/6554. */
server
.
call_depth
++
;
server
.
fixed_time_expire
++
;
updateCachedTime
(
0
);
updateCachedTime
(
0
);
/* Serve clients blocked on list key. */
/* Serve clients blocked on list key. */
...
@@ -467,8 +467,7 @@ void handleClientsBlockedOnKeys(void) {
...
@@ -467,8 +467,7 @@ void handleClientsBlockedOnKeys(void) {
}
}
}
}
}
}
server
.
fixed_time_expire
--
;
server
.
call_depth
--
;
/* Free this item. */
/* Free this item. */
decrRefCount
(
rl
->
key
);
decrRefCount
(
rl
->
key
);
...
...
src/db.c
View file @
da5dc458
...
@@ -1151,7 +1151,7 @@ int keyIsExpired(redisDb *db, robj *key) {
...
@@ -1151,7 +1151,7 @@ int keyIsExpired(redisDb *db, robj *key) {
* may re-open the same key multiple times, can invalidate an already
* may re-open the same key multiple times, can invalidate an already
* open object in a next call, if the next call will see the key expired,
* open object in a next call, if the next call will see the key expired,
* while the first did not. */
* while the first did not. */
else
if
(
server
.
call_depth
>
0
)
{
else
if
(
server
.
fixed_time_expire
>
0
)
{
now
=
server
.
mstime
;
now
=
server
.
mstime
;
}
}
/* For the other cases, we want to use the most fresh time we have. */
/* For the other cases, we want to use the most fresh time we have. */
...
...
src/server.c
View file @
da5dc458
...
@@ -2038,7 +2038,7 @@ void initServer(void) {
...
@@ -2038,7 +2038,7 @@ void initServer(void) {
server
.
hz
=
server
.
config_hz
;
server
.
hz
=
server
.
config_hz
;
server
.
pid
=
getpid
();
server
.
pid
=
getpid
();
server
.
current_client
=
NULL
;
server
.
current_client
=
NULL
;
server.
call_depth
= 0;
server
.
fixed_time_expire
=
0
;
server
.
clients
=
listCreate
();
server
.
clients
=
listCreate
();
server
.
clients_index
=
raxNew
();
server
.
clients_index
=
raxNew
();
server
.
clients_to_close
=
listCreate
();
server
.
clients_to_close
=
listCreate
();
...
@@ -2431,7 +2431,7 @@ void call(client *c, int flags) {
...
@@ -2431,7 +2431,7 @@ void call(client *c, int flags) {
int
client_old_flags
=
c
->
flags
;
int
client_old_flags
=
c
->
flags
;
struct
redisCommand
*
real_cmd
=
c
->
cmd
;
struct
redisCommand
*
real_cmd
=
c
->
cmd
;
server.
call_depth
++;
server
.
fixed_time_expire
++
;
/* Sent the command to clients in MONITOR mode, only if the commands are
/* Sent the command to clients in MONITOR mode, only if the commands are
* not generated from reading an AOF. */
* not generated from reading an AOF. */
...
@@ -2547,7 +2547,7 @@ void call(client *c, int flags) {
...
@@ -2547,7 +2547,7 @@ void call(client *c, int flags) {
redisOpArrayFree
(
&
server
.
also_propagate
);
redisOpArrayFree
(
&
server
.
also_propagate
);
}
}
server
.
also_propagate
=
prev_also_propagate
;
server
.
also_propagate
=
prev_also_propagate
;
server.
call_depth
--;
server
.
fixed_time_expire
--
;
server
.
stat_numcommands
++
;
server
.
stat_numcommands
++
;
}
}
...
...
src/server.h
View file @
da5dc458
...
@@ -990,7 +990,7 @@ struct redisServer {
...
@@ -990,7 +990,7 @@ struct redisServer {
list
*
clients_pending_write
;
/* There is to write or install handler. */
list
*
clients_pending_write
;
/* There is to write or install handler. */
list
*
slaves
,
*
monitors
;
/* List of slaves and MONITORs */
list
*
slaves
,
*
monitors
;
/* List of slaves and MONITORs */
client
*
current_client
;
/* Current client executing the command. */
client
*
current_client
;
/* Current client executing the command. */
long
call_depth
;
/* call() re-entering count
. */
long
fixed_time_expire
;
/* If > 0, expire keys against server.mstime
. */
rax
*
clients_index
;
/* Active clients dictionary by client ID. */
rax
*
clients_index
;
/* Active clients dictionary by client ID. */
int
clients_paused
;
/* True if clients are currently paused */
int
clients_paused
;
/* True if clients are currently paused */
mstime_t
clients_pause_end_time
;
/* Time when we undo clients_paused */
mstime_t
clients_pause_end_time
;
/* Time when we undo clients_paused */
...
...
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