Skip to content

Expose Redis/RedisAI main thread cpu usage via modules info #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2020
Merged

Expose Redis/RedisAI main thread cpu usage via modules info #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3da867b
[add] Expose Redis/RedisAI main thread cpu usage via modules info
filipecosta90 Dec 3, 2020
c8a2757
[fix] Fixed BG thread CPU percentage conversion (we were converting f…
filipecosta90 Dec 3, 2020
0d68a93
[fix] Fixed test_info_modules reply check
filipecosta90 Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 36 additions & 2 deletions src/redisai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@

#ifdef __linux__
#define _GNU_SOURCE
#endif

#define REDISMODULE_MAIN
#include "redismodule.h"
#include "tensor.h"
Expand Down Expand Up @@ -32,6 +37,12 @@
#define REDISAI_GIT_SHA "unknown"
#endif

#ifdef __linux__
#ifndef RUSAGE_THREAD
#define RUSAGE_THREAD 1
#endif
#endif

int redisMajorVersion;
int redisMinorVersion;
int redisPatchVersion;
Expand Down Expand Up @@ -986,10 +997,31 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
RedisModule_InfoAddFieldLongLong(ctx, "inter_op_parallelism", getBackendsInterOpParallelism());
RedisModule_InfoAddFieldLongLong(ctx, "intra_op_parallelism", getBackendsIntraOpParallelism());
struct rusage self_ru, c_ru;

// Return resource usage statistics for the calling process,
// which is the sum of resources used by all threads in the
// process
getrusage(RUSAGE_SELF, &self_ru);

// Return resource usage statistics for the calling thread
// which in this case is Redis/RedisAI main thread
// RUSAGE_THREAD is Linux-specific.
sds main_thread_used_cpu_sys = sdsempty();
sds main_thread_used_cpu_user = sdsempty();
#if (defined(__linux__) && defined(RUSAGE_THREAD))
struct rusage main_thread_ru;
getrusage(RUSAGE_THREAD, &main_thread_ru);
main_thread_used_cpu_sys =
sdscatprintf(main_thread_used_cpu_sys, "%ld.%06ld", (long)main_thread_ru.ru_stime.tv_sec,
(long)self_ru.ru_stime.tv_usec);
main_thread_used_cpu_user =
sdscatprintf(main_thread_used_cpu_user, "%ld.%06ld", (long)main_thread_ru.ru_utime.tv_sec,
(long)self_ru.ru_utime.tv_usec);
#else
sdscatprintf(main_thread_used_cpu_sys, "N/A");
sdscatprintf(main_thread_used_cpu_user, "N/A");
#endif

// Return resource usage statistics for all of its
// terminated child processes
getrusage(RUSAGE_CHILDREN, &c_ru);
Expand All @@ -1006,6 +1038,8 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
RedisModule_InfoAddFieldCString(ctx, "self_used_cpu_user", self_used_cpu_user);
RedisModule_InfoAddFieldCString(ctx, "children_used_cpu_sys", children_used_cpu_sys);
RedisModule_InfoAddFieldCString(ctx, "children_used_cpu_user", children_used_cpu_user);
RedisModule_InfoAddFieldCString(ctx, "main_thread_used_cpu_sys", main_thread_used_cpu_sys);
RedisModule_InfoAddFieldCString(ctx, "main_thread_used_cpu_user", main_thread_used_cpu_user);

AI_dictIterator *iter = AI_dictGetSafeIterator(run_queues);
AI_dictEntry *entry = AI_dictNext(iter);
Expand All @@ -1018,7 +1052,7 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
struct timespec ts;
clockid_t cid;
sds queue_used_cpu_total = sdscatprintf(
sdsempty(), "queue_%s_bthread_#%d_used_cpu_total", queue_name, i + 1);
sdsempty(), "queue_%s_bthread_n%d_used_cpu_total", queue_name, i + 1);
sds bthread_used_cpu_total = sdsempty();
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE) || \
defined(__cplusplus)
Expand All @@ -1034,7 +1068,7 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
} else {
bthread_used_cpu_total =
sdscatprintf(bthread_used_cpu_total, "%ld.%06ld", (long)ts.tv_sec,
(long)(ts.tv_nsec / 1000000));
(long)(ts.tv_nsec / 1000));
}
}
RedisModule_InfoAddFieldCString(ctx, queue_used_cpu_total, bthread_used_cpu_total);
Expand Down
2 changes: 1 addition & 1 deletion tests/flow/tests_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def test_info_modules(env):
env.assertEqual( 'ai_self_used_cpu_user' in ret, True )
env.assertEqual( 'ai_children_used_cpu_sys' in ret, True )
env.assertEqual( 'ai_children_used_cpu_user' in ret, True )
env.assertEqual( 'ai_queue_CPU_bthread_#1_used_cpu_total' in ret, True )
env.assertEqual( 'ai_queue_CPU_bthread_n1_used_cpu_total' in ret, True )

def test_lua_multi(env):
con = env.getConnection()
Expand Down