From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 9DE281FF180 for ; Fri, 1 Aug 2025 11:53:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5ED091529E; Fri, 1 Aug 2025 11:54:47 +0200 (CEST) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Fri, 1 Aug 2025 11:54:28 +0200 Message-ID: <20250801095431.117317-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250801095431.117317-1-l.wagner@proxmox.com> References: <20250801095431.117317-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1754042070077 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH cluster 2/5] pmxcfs: status: avoid unnecessary string allocations X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Lukas Wagner --- 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