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
2f7da0fd
Commit
2f7da0fd
authored
Mar 31, 2018
by
antirez
Browse files
Modules Timer API: fix infinite loop and export API.
parent
b85a465c
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/module.c
View file @
2f7da0fd
...
...
@@ -4100,10 +4100,12 @@ RedisModuleTimerID RM_CreateTimer(RedisModuleCtx *ctx, mstime_t period, RedisMod
while
(
1
)
{
key
=
htonu64
(
expiretime
);
int
retval
=
raxInsert
(
Timers
,(
unsigned
char
*
)
&
key
,
sizeof
(
key
),
timer
,
NULL
);
if
(
retval
)
if
(
retval
)
{
expiretime
=
key
;
else
break
;
}
else
{
expiretime
++
;
}
}
/* We need to install the main event loop timer if it's not already
...
...
@@ -4551,4 +4553,7 @@ void moduleRegisterCoreAPI(void) {
REGISTER_API
(
GetClusterNodeInfo
);
REGISTER_API
(
GetClusterNodesList
);
REGISTER_API
(
FreeClusterNodesList
);
REGISTER_API
(
CreateTimer
);
REGISTER_API
(
StopTimer
);
REGISTER_API
(
GetTimerInfo
);
}
src/modules/Makefile
View file @
2f7da0fd
...
...
@@ -13,7 +13,7 @@ endif
.SUFFIXES
:
.c .so .xo .o
all
:
helloworld.so hellotype.so helloblock.so testmodule.so hellocluster.so
all
:
helloworld.so hellotype.so helloblock.so testmodule.so hellocluster.so
hellotimer.so
.c.xo
:
$(CC)
-I
.
$(CFLAGS)
$(SHOBJ_CFLAGS)
-fPIC
-c
$<
-o
$@
...
...
@@ -38,6 +38,11 @@ hellocluster.xo: ../redismodule.h
hellocluster.so
:
hellocluster.xo
$(LD)
-o
$@
$<
$(SHOBJ_LDFLAGS)
$(LIBS)
-lc
hellotimer.xo
:
../redismodule.h
hellotimer.so
:
hellotimer.xo
$(LD)
-o
$@
$<
$(SHOBJ_LDFLAGS)
$(LIBS)
-lc
testmodule.xo
:
../redismodule.h
testmodule.so
:
testmodule.xo
...
...
src/redismodule.h
View file @
2f7da0fd
...
...
@@ -147,6 +147,7 @@ typedef size_t (*RedisModuleTypeMemUsageFunc)(const void *value);
typedef
void
(
*
RedisModuleTypeDigestFunc
)(
RedisModuleDigest
*
digest
,
void
*
value
);
typedef
void
(
*
RedisModuleTypeFreeFunc
)(
void
*
value
);
typedef
void
(
*
RedisModuleClusterMessageReceiver
)(
RedisModuleCtx
*
ctx
,
const
char
*
sender_id
,
uint8_t
type
,
const
unsigned
char
*
payload
,
uint32_t
len
);
typedef
void
(
*
RedisModuleTimerProc
)(
RedisModuleCtx
*
ctx
,
void
*
data
);
#define REDISMODULE_TYPE_METHOD_VERSION 1
typedef
struct
RedisModuleTypeMethods
{
...
...
@@ -272,6 +273,9 @@ int REDISMODULE_API_FUNC(RedisModule_SendClusterMessage)(RedisModuleCtx *ctx, ch
int
REDISMODULE_API_FUNC
(
RedisModule_GetClusterNodeInfo
)(
RedisModuleCtx
*
ctx
,
const
char
*
id
,
char
*
ip
,
char
*
master_id
,
int
*
port
,
int
*
flags
);
char
**
REDISMODULE_API_FUNC
(
RedisModule_GetClusterNodesList
)(
RedisModuleCtx
*
ctx
,
size_t
*
numnodes
);
void
REDISMODULE_API_FUNC
(
RedisModule_FreeClusterNodesList
)(
char
**
ids
);
RedisModuleTimerID
REDISMODULE_API_FUNC
(
RedisModule_CreateTimer
)(
RedisModuleCtx
*
ctx
,
mstime_t
period
,
RedisModuleTimerProc
callback
,
void
*
data
);
int
REDISMODULE_API_FUNC
(
RedisModule_StopTimer
)(
RedisModuleCtx
*
ctx
,
RedisModuleTimerID
id
,
void
**
data
);
int
REDISMODULE_API_FUNC
(
RedisModule_GetTimerInfo
)(
RedisModuleCtx
*
ctx
,
RedisModuleTimerID
id
,
uint64_t
*
remaining
,
void
**
data
);
/* Experimental APIs */
#ifdef REDISMODULE_EXPERIMENTAL_API
...
...
@@ -400,6 +404,9 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int
REDISMODULE_GET_API
(
GetClusterNodeInfo
);
REDISMODULE_GET_API
(
GetClusterNodesList
);
REDISMODULE_GET_API
(
FreeClusterNodesList
);
REDISMODULE_GET_API
(
CreateTimer
);
REDISMODULE_GET_API
(
StopTimer
);
REDISMODULE_GET_API
(
GetTimerInfo
);
#ifdef REDISMODULE_EXPERIMENTAL_API
REDISMODULE_GET_API
(
GetThreadSafeContext
);
...
...
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