gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Moved RMAPI_FUNC_SUPPORTED location such that it will be visible to modules (#8037)

Browse Source 
The RMAPI_FUNC_SUPPORTED was defined in the wrong place on redismodule.h
and was not visible to modules.
This commit is contained in:
Meir Shpilraien (Spielrein) 2020-11-09 10:46:23 +02:00 committed by GitHub
parent bcc46a2f25
commit 97d647a139
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/redismodule.h
View File

@ -1020,13 +1020,13 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int
#define RedisModule_Assert(_e) ((_e)?(void)0 : (RedisModule__Assert(#_e,__FILE__,__LINE__),exit(1))) #define RedisModule_Assert(_e) ((_e)?(void)0 : (RedisModule__Assert(#_e,__FILE__,__LINE__),exit(1)))
#define RMAPI_FUNC_SUPPORTED(func) (func != NULL)
#else #else
/* Things only defined for the modules core, not exported to modules /* Things only defined for the modules core, not exported to modules
* including this file. */ * including this file. */
#define RedisModuleString robj #define RedisModuleString robj
#define RMAPI_FUNC_SUPPORTED(func) (func != NULL)
#endif /* REDISMODULE_CORE */ #endif /* REDISMODULE_CORE */
#endif /* REDISMODULE_H */ #endif /* REDISMODULE_H */

6
tests/modules/fork.c
View File

@ -28,6 +28,12 @@ int fork_create(RedisModuleCtx *ctx, RedisModuleString **argv, int argc)
RedisModule_WrongArity(ctx); RedisModule_WrongArity(ctx);
return REDISMODULE_OK; return REDISMODULE_OK;
} }
if(!RMAPI_FUNC_SUPPORTED(RedisModule_Fork)){
RedisModule_ReplyWithError(ctx, "Fork api is not supported in the current redis version");
return REDISMODULE_OK;
}
RedisModule_StringToLongLong(argv[1], &code_to_exit_with); RedisModule_StringToLongLong(argv[1], &code_to_exit_with);
exitted_with_code = -1; exitted_with_code = -1;
child_pid = RedisModule_Fork(done_handler, (void*)0xdeadbeef); child_pid = RedisModule_Fork(done_handler, (void*)0xdeadbeef);