From: Lukas Wagner <l.wagner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH cluster 2/5] pmxcfs: status: avoid unnecessary string allocations
Date: Fri, 1 Aug 2025 11:54:28 +0200 [thread overview]
Message-ID: <20250801095431.117317-2-l.wagner@proxmox.com> (raw)
In-Reply-To: <20250801095431.117317-1-l.wagner@proxmox.com>
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
---
src/pmxcfs/status.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/pmxcfs/status.c b/src/pmxcfs/status.c
index 886d0bd..e438d9f 100644
--- a/src/pmxcfs/status.c
+++ b/src/pmxcfs/status.c
@@ -1374,14 +1374,12 @@ static void update_rrd_data(const char *key, gconstpointer data, size_t len) {
filename = g_strdup_printf("%s", filename_pve2);
} else {
// neither file exists, check for directories to decide and create file
- char *dir_pve2 = g_strdup_printf(RRDDIR "/pve2-node");
- char *dir_pve90 = g_strdup_printf(RRDDIR "/pve-node-9.0");
- if (g_file_test(dir_pve90, G_FILE_TEST_IS_DIR)) {
+ if (g_file_test(RRDDIR "/pve-node-9.0", G_FILE_TEST_IS_DIR)) {
int argcount = sizeof(rrd_def_node_pve9_0) / sizeof(void *) - 1;
create_rrd_file(filename, argcount, rrd_def_node_pve9_0);
- } else if (g_file_test(dir_pve2, G_FILE_TEST_IS_DIR)) {
+ } else if (g_file_test(RRDDIR "/pve2-node", G_FILE_TEST_IS_DIR)) {
use_pve2_file = 1;
g_free(filename);
@@ -1404,8 +1402,6 @@ static void update_rrd_data(const char *key, gconstpointer data, size_t len) {
int argcount = sizeof(rrd_def_node_pve9_0) / sizeof(void *) - 1;
create_rrd_file(filename, argcount, rrd_def_node_pve9_0);
}
- g_free(dir_pve2);
- g_free(dir_pve90);
}
skip = 2; // first two columns are live data that isn't archived
@@ -1450,14 +1446,12 @@ static void update_rrd_data(const char *key, gconstpointer data, size_t len) {
filename = g_strdup_printf("%s", filename_pve2);
} else {
// neither file exists, check for directories to decide and create file
- char *dir_pve2 = g_strdup_printf(RRDDIR "/pve2-vm");
- char *dir_pve90 = g_strdup_printf(RRDDIR "/pve-vm-9.0");
- if (g_file_test(dir_pve90, G_FILE_TEST_IS_DIR)) {
+ if (g_file_test(RRDDIR "/pve-vm-9.0", G_FILE_TEST_IS_DIR)) {
int argcount = sizeof(rrd_def_vm_pve9_0) / sizeof(void *) - 1;
create_rrd_file(filename, argcount, rrd_def_vm_pve9_0);
- } else if (g_file_test(dir_pve2, G_FILE_TEST_IS_DIR)) {
+ } else if (g_file_test(RRDDIR "/pve2-vm", G_FILE_TEST_IS_DIR)) {
use_pve2_file = 1;
g_free(filename);
@@ -1472,8 +1466,6 @@ static void update_rrd_data(const char *key, gconstpointer data, size_t len) {
int argcount = sizeof(rrd_def_vm_pve9_0) / sizeof(void *) - 1;
create_rrd_file(filename, argcount, rrd_def_vm_pve9_0);
}
- g_free(dir_pve2);
- g_free(dir_pve90);
}
skip = 4; // first 4 columns are live data that isn't archived
@@ -1520,17 +1512,15 @@ static void update_rrd_data(const char *key, gconstpointer data, size_t len) {
filename = g_strdup_printf("%s", filename_pve2);
} else {
// neither file exists, check for directories to decide and create file
- char *dir_pve2 = g_strdup_printf(RRDDIR "/pve2-storage");
- char *dir_pve90 = g_strdup_printf(RRDDIR "/pve-storage-9.0");
- if (g_file_test(dir_pve90, G_FILE_TEST_IS_DIR)) {
+ if (g_file_test(RRDDIR "/pve-storage-9.0", G_FILE_TEST_IS_DIR)) {
char *dir = g_path_get_dirname(filename);
checked_mkdir(dir, 0755);
g_free(dir);
int argcount = sizeof(rrd_def_storage_pve9_0) / sizeof(void *) - 1;
create_rrd_file(filename, argcount, rrd_def_storage_pve9_0);
- } else if (g_file_test(dir_pve2, G_FILE_TEST_IS_DIR)) {
+ } else if (g_file_test(RRDDIR "/pve2-storage", G_FILE_TEST_IS_DIR)) {
g_free(filename);
filename = g_strdup_printf("%s", filename_pve2);
@@ -1551,8 +1541,6 @@ static void update_rrd_data(const char *key, gconstpointer data, size_t len) {
int argcount = sizeof(rrd_def_storage_pve9_0) / sizeof(void *) - 1;
create_rrd_file(filename, argcount, rrd_def_storage_pve9_0);
}
- g_free(dir_pve2);
- g_free(dir_pve90);
}
// actual data columns didn't change between pve2-storage and pve-storage-9.0
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-08-01 9:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-01 9:54 [pve-devel] [PATCH cluster 1/5] pmxcfs: status: add one more missing g_free Lukas Wagner
2025-08-01 9:54 ` Lukas Wagner [this message]
2025-08-01 9:54 ` [pve-devel] [PATCH cluster 3/5] pmxcfs: status: call g_strdup instead of g_strdup_printf when no formatting is needed Lukas Wagner
2025-08-01 9:54 ` [pve-devel] [PATCH cluster 4/5] pmxcfs: status: remove string literal params for g_strdup_printf Lukas Wagner
2025-08-01 9:54 ` [pve-devel] [PATCH cluster 5/5] pmxcfs: status: avoid g_strdup when not needed Lukas Wagner
2025-08-01 11:32 ` [pve-devel] [PATCH cluster 1/5] pmxcfs: status: add one more missing g_free Maximiliano Sandoval
2025-08-01 12:52 ` Thomas Lamprecht
2025-08-01 13:04 ` Lukas Wagner
2025-08-01 12:55 ` Lukas Wagner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250801095431.117317-2-l.wagner@proxmox.com \
--to=l.wagner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox