From 82cc568878c4cb5f98c6687e49446c89c7795414 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 1 Apr 2014 17:12:44 -0700
Subject: [PATCH] fix memory leak in new sdiag RPC
Also remove some logging that we no longer want
---
src/common/slurm_protocol_defs.c | 10 +++++++++-
src/sdiag/sdiag.c | 5 +++++
src/slurmctld/proc_req.c | 12 +++---------
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c
index db6946343f2..0a8faf2ad90 100644
--- a/src/common/slurm_protocol_defs.c
+++ b/src/common/slurm_protocol_defs.c
@@ -962,7 +962,15 @@ extern void slurm_free_suspend_int_msg(suspend_int_msg_t *msg)
extern void slurm_free_stats_response_msg(stats_info_response_msg_t *msg)
{
- xfree(msg);
+ if (msg) {
+ xfree(msg->rpc_type_id);
+ xfree(msg->rpc_type_cnt);
+ xfree(msg->rpc_type_time);
+ xfree(msg->rpc_user_id);
+ xfree(msg->rpc_user_cnt);
+ xfree(msg->rpc_user_time);
+ xfree(msg);
+ }
}
extern void slurm_free_spank_env_request_msg(spank_env_request_msg_t *msg)
diff --git a/src/sdiag/sdiag.c b/src/sdiag/sdiag.c
index c086101682a..373b6791299 100644
--- a/src/sdiag/sdiag.c
+++ b/src/sdiag/sdiag.c
@@ -89,6 +89,11 @@ int main(int argc, char *argv[])
if (rc == SLURM_SUCCESS) {
_sort_rpc();
rc = _print_stats();
+#ifdef MEMORY_LEAK_DEBUG
+ slurm_free_stats_response_msg(buf);
+ xfree(rpc_type_ave_time);
+ xfree(rpc_user_ave_time);
+#endif
} else
slurm_perror("slurm_get_statistics");
}
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 32bc3fd062b..39eab258b6d 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -4809,10 +4809,7 @@ static void _pack_rpc_stats(int resp, char **buffer_ptr, int *buffer_size,
buffer = create_buf(*buffer_ptr, *buffer_size);
set_buf_offset(buffer, *buffer_size);
for (i = 0; i < rpc_type_size; i++) {
- if (rpc_type_id[i]) {
- info("rpc_type:%u count:%u time:%"PRIu64"",
- rpc_type_id[i], rpc_type_cnt[i], rpc_type_time[i]);
- } else
+ if (rpc_type_id[i] == 0)
break;
}
pack32(i, buffer);
@@ -4820,11 +4817,8 @@ static void _pack_rpc_stats(int resp, char **buffer_ptr, int *buffer_size,
pack32_array(rpc_type_cnt, i, buffer);
pack64_array(rpc_type_time, i, buffer);
- for (i = 0; i < rpc_user_size; i++) {
- if (rpc_user_id[i] || (i == 0)) {
- info("rpc_user:%u count:%u time:%"PRIu64"",
- rpc_user_id[i], rpc_user_cnt[i], rpc_user_time[i]);
- } else
+ for (i = 1; i < rpc_user_size; i++) {
+ if (rpc_user_id[i] == 0)
break;
}
pack32(i, buffer);
--
GitLab