Skip to content

Commit dd25681

Browse files
committed
[wip] further prunned CPU info
1 parent fbc21ab commit dd25681

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

src/redisai.c

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -997,24 +997,29 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
997997
RedisModule_InfoAddFieldLongLong(ctx, "inter_op_parallelism", getBackendsInterOpParallelism());
998998
RedisModule_InfoAddFieldLongLong(ctx, "intra_op_parallelism", getBackendsIntraOpParallelism());
999999
struct rusage self_ru, c_ru;
1000-
1000+
10011001
// Return resource usage statistics for the calling process,
10021002
// which is the sum of resources used by all threads in the
10031003
// process
10041004
getrusage(RUSAGE_SELF, &self_ru);
10051005

1006-
// Return resource usage statistics for the calling thread
1007-
// which in this case is Redis/RedisAI main thread
1008-
// RUSAGE_THREAD is Linux-specific.
1006+
// Return resource usage statistics for the calling thread
1007+
// which in this case is Redis/RedisAI main thread
1008+
// RUSAGE_THREAD is Linux-specific.
1009+
sds main_thread_used_cpu_sys = sdsempty();
1010+
sds main_thread_used_cpu_user = sdsempty();
10091011
#if (defined(__linux__) && defined(RUSAGE_THREAD))
10101012
struct rusage main_thread_ru;
10111013
getrusage(RUSAGE_THREAD, &main_thread_ru);
1012-
sds main_thread_used_cpu_user =
1013-
sdscatprintf(sdsempty(), "%ld.%06ld", (long)main_thread_ru.ru_stime.tv_sec,
1014+
main_thread_used_cpu_sys =
1015+
sdscatprintf(main_thread_used_cpu_sys, "%ld.%06ld", (long)main_thread_ru.ru_stime.tv_sec,
10141016
(long)self_ru.ru_stime.tv_usec);
1015-
sds main_thread_used_cpu_sys =
1016-
sdscatprintf(sdsempty(), "%ld.%06ld", (long)main_thread_ru.ru_utime.tv_sec,
1017+
main_thread_used_cpu_user =
1018+
sdscatprintf(main_thread_used_cpu_user, "%ld.%06ld", (long)main_thread_ru.ru_utime.tv_sec,
10171019
(long)self_ru.ru_utime.tv_usec);
1020+
#else
1021+
sdscatprintf(main_thread_used_cpu_sys, "N/A");
1022+
sdscatprintf(main_thread_used_cpu_user, "N/A");
10181023
#endif
10191024

10201025
// Return resource usage statistics for all of its
@@ -1033,10 +1038,9 @@ void RAI_moduleInfoFunc(RedisModuleInfoCtx *ctx, int for_crash_report) {
10331038
RedisModule_InfoAddFieldCString(ctx, "self_used_cpu_user", self_used_cpu_user);
10341039
RedisModule_InfoAddFieldCString(ctx, "children_used_cpu_sys", children_used_cpu_sys);
10351040
RedisModule_InfoAddFieldCString(ctx, "children_used_cpu_user", children_used_cpu_user);
1036-
#if (defined(__linux__) && defined(RUSAGE_THREAD))
10371041
RedisModule_InfoAddFieldCString(ctx, "main_thread_used_cpu_sys", main_thread_used_cpu_sys);
10381042
RedisModule_InfoAddFieldCString(ctx, "main_thread_used_cpu_user", main_thread_used_cpu_user);
1039-
#endif
1043+
10401044
AI_dictIterator *iter = AI_dictGetSafeIterator(run_queues);
10411045
AI_dictEntry *entry = AI_dictNext(iter);
10421046
while (entry) {

0 commit comments

Comments
 (0)