From: Josef Cejka Date: Wed, 3 Aug 2022 11:33:21 +0000 (+0200) Subject: debuginfod: optimize regular expressions in groom() X-Git-Tag: elfutils-0.188~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc2b85c4536f415547981fc4cf176e3fae967acc;p=thirdparty%2Felfutils.git debuginfod: optimize regular expressions in groom() Check if applying of -I and -X during grooming is enabled before the regular expressions are matched. Signed-off-by: Josef Cejka --- diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index 2ff63e22f..a8b5d7f43 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,7 @@ +2022-08-02 Josef Cejka + + * debuginfod.cxx (groom): Don't evaluate regex unless needed. + 2022-07-29 Josef Cejka * debuginfod.cxx: Create db indexes for fast delete while grooming. diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx index 303ffe00c..a089d0bd4 100644 --- a/debuginfod/debuginfod.cxx +++ b/debuginfod/debuginfod.cxx @@ -3580,11 +3580,17 @@ void groom() int64_t fileid = sqlite3_column_int64 (files, 1); const char* filename = ((const char*) sqlite3_column_text (files, 2) ?: ""); struct stat s; - bool reg_include = !regexec (&file_include_regex, filename, 0, 0, 0); - bool reg_exclude = !regexec (&file_exclude_regex, filename, 0, 0, 0); + bool regex_file_drop = 0; + + if (regex_groom) + { + bool reg_include = !regexec (&file_include_regex, filename, 0, 0, 0); + bool reg_exclude = !regexec (&file_exclude_regex, filename, 0, 0, 0); + regex_file_drop = reg_exclude && !reg_include; + } rc = stat(filename, &s); - if ( (regex_groom && reg_exclude && !reg_include) || rc < 0 || (mtime != (int64_t) s.st_mtime) ) + if ( regex_file_drop || rc < 0 || (mtime != (int64_t) s.st_mtime) ) { if (verbose > 2) obatched(clog) << "groom: stale file=" << filename << " mtime=" << mtime << endl;