From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 948823856DCF for ; Mon, 9 May 2022 22:57:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 948823856DCF Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x07.wildebeest.org [172.31.17.137]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 249C13000599; Tue, 10 May 2022 00:57:57 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id C44552E8237E; Tue, 10 May 2022 00:57:56 +0200 (CEST) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [PATCH 2/3] debuginfod: Remove debuginfod_init_cache Date: Tue, 10 May 2022 00:57:22 +0200 Message-Id: <20220509225723.96902-3-mark@klomp.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220509225723.96902-1-mark@klomp.org> References: <20220509225723.96902-1-mark@klomp.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: elfutils-devel@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Elfutils-devel mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 May 2022 22:58:00 -0000 debuginfod_init_cache would create all config files if they didn't exist yet. It always made two stat calls. Then debuginfod_clean_cache would call debuginfod_config_cache which did the same checks and created any missing config files. Just make sure the cache_path directory exists and remove debuginfod_init_cache before calling debuginfod_clean_cache. Signed-off-by: Mark Wielaard --- debuginfod/ChangeLog | 6 ++++ debuginfod/debuginfod-client.c | 61 +++++----------------------------- 2 files changed, 15 insertions(+), 52 deletions(-) diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index 46a6e22b..c9aa4fcf 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,9 @@ +2022-05-09 Mark Wielaard + + * debuginfod-client.c (debuginfod_init_cache): Remove. + (debuginfod_query_server): Don't call debuginfod_init_cache, call + mkdir then debuginfod_clean_cache. + 2022-05-09 Mark Wielaard * debuginfod-client.c (debuginfod_config_cache): Always open with diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c index 3b2728f1..6bdf1908 100644 --- a/debuginfod/debuginfod-client.c +++ b/debuginfod/debuginfod-client.c @@ -274,55 +274,6 @@ debuginfod_config_cache(char *config_path, return cache_config; } -/* Create the cache and interval file if they do not already exist. - Return 0 if cache and config file are initialized, otherwise return - the appropriate error code. */ -static int -debuginfod_init_cache (char *cache_path, char *interval_path, char *maxage_path) -{ - struct stat st; - - /* If the cache and config file already exist then we are done. */ - if (stat(cache_path, &st) == 0 && stat(interval_path, &st) == 0) - return 0; - - /* Create the cache and config files as necessary. */ - if (stat(cache_path, &st) != 0 && mkdir(cache_path, ACCESSPERMS) < 0) - return -errno; - - int fd = -1; - - /* init cleaning interval config file. */ - fd = open(interval_path, O_CREAT | O_RDWR, DEFFILEMODE); - if (fd < 0) - return -errno; - - if (dprintf(fd, "%ld", cache_clean_default_interval_s) < 0) - { - int ret = -errno; - close (fd); - return ret; - } - - close (fd); - - /* init max age config file. */ - if (stat(maxage_path, &st) != 0 - && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0) - return -errno; - - if (dprintf(fd, "%ld", cache_default_max_unused_age_s) < 0) - { - int ret = -errno; - close (fd); - return ret; - } - - close (fd); - return 0; -} - - /* Delete any files that have been unmodied for a period longer than $DEBUGINFOD_CACHE_CLEAN_INTERVAL_S. */ static int @@ -795,9 +746,15 @@ debuginfod_query_server (debuginfod_client *c, if (vfd >= 0) dprintf (vfd, "checking cache dir %s\n", cache_path); - rc = debuginfod_init_cache(cache_path, interval_path, maxage_path); - if (rc != 0) - goto out; + /* Make sure cache dir exists. debuginfo_clean_cache will then make + sure the interval, cache_miss and maxage files exist. */ + if (mkdir (cache_path, ACCESSPERMS) != 0 + && errno != EEXIST) + { + rc = -errno; + goto out; + } + rc = debuginfod_clean_cache(c, cache_path, interval_path, maxage_path); if (rc != 0) goto out; -- 2.30.2