diff options
author | Oran Agra <oran@redislabs.com> | 2023-05-15 13:08:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-15 13:08:15 +0300 |
commit | a51eb05b1895babb17c37c36b963e2bcbd5496d5 (patch) | |
tree | 7be24b09e0a5621a03e9f9ffe9ef27fcb44d8345 /src/script.c | |
parent | e26a769d9627ebecb8607375580970a740348956 (diff) | |
parent | 986dbf716e0cb904c80bb444635cea3242859cc1 (diff) | |
download | redis-7.2.tar.gz |
Diffstat (limited to 'src/script.c')
-rw-r--r-- | src/script.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/script.c b/src/script.c index 2a7721065..70680e3ea 100644 --- a/src/script.c +++ b/src/script.c @@ -60,16 +60,16 @@ static void enterScriptTimedoutMode(scriptRunCtx *run_ctx) { blockingOperationStarts(); } -int scriptIsTimedout() { +int scriptIsTimedout(void) { return scriptIsRunning() && (curr_run_ctx->flags & SCRIPT_TIMEDOUT); } -client* scriptGetClient() { +client* scriptGetClient(void) { serverAssert(scriptIsRunning()); return curr_run_ctx->c; } -client* scriptGetCaller() { +client* scriptGetCaller(void) { serverAssert(scriptIsRunning()); return curr_run_ctx->original_client; } @@ -130,7 +130,7 @@ uint64_t scriptFlagsToCmdFlags(uint64_t cmd_flags, uint64_t script_flags) { /* Prepare the given run ctx for execution */ int scriptPrepareForRun(scriptRunCtx *run_ctx, client *engine_client, client *caller, const char *funcname, uint64_t script_flags, int ro) { serverAssert(!curr_run_ctx); - bool client_allow_oom = caller->flags & CLIENT_ALLOW_OOM; + int client_allow_oom = !!(caller->flags & CLIENT_ALLOW_OOM); int running_stale = server.masterhost && server.repl_state != REPL_STATE_CONNECTED && @@ -269,16 +269,16 @@ void scriptResetRun(scriptRunCtx *run_ctx) { } /* return true if a script is currently running */ -int scriptIsRunning() { +int scriptIsRunning(void) { return curr_run_ctx != NULL; } -const char* scriptCurrFunction() { +const char* scriptCurrFunction(void) { serverAssert(scriptIsRunning()); return curr_run_ctx->funcname; } -int scriptIsEval() { +int scriptIsEval(void) { serverAssert(scriptIsRunning()); return curr_run_ctx->flags & SCRIPT_EVAL_MODE; } @@ -571,7 +571,7 @@ error: incrCommandStatsOnError(cmd, ERROR_COMMAND_REJECTED); } -long long scriptRunDuration() { +long long scriptRunDuration(void) { serverAssert(scriptIsRunning()); return elapsedMs(curr_run_ctx->start_time); } |