From 91692846909ed191addb7ec1c34aad11392ab88b Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 18 Jul 2026 15:03:55 +0900 Subject: perf(regex): eliminate per-call clone overhead in preg_* dispatch regex::Regex::clone() does not share the underlying meta engine's search-cache pool, so every fresh clone pays a ~10us warmup cost on its first use. Two changes together eliminate this across nearly all preg_* call sites: - A php_regex! macro resolves PHP-style patterns to a per-call-site &'static regex::Regex (via regex-macro's LazyLock), applied at the majority of call sites throughout the codebase. - Call sites still passing dynamic pattern strings go through PATTERN_CACHE, which now stores Arc<(Regex, bool)> and hands out Arc::clone()s instead of cloning the Regex itself. PregPattern::resolve() returns a ResolvedPattern enum (Arc or 'static reference) rather than an owned Regex, so neither path ever clones the Regex proper. Co-Authored-By: Claude Sonnet 5 --- crates/shirabe/src/util/composer_mirror.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/util/composer_mirror.rs') diff --git a/crates/shirabe/src/util/composer_mirror.rs b/crates/shirabe/src/util/composer_mirror.rs index 31f71279..a6f60621 100644 --- a/crates/shirabe/src/util/composer_mirror.rs +++ b/crates/shirabe/src/util/composer_mirror.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Util/ComposerMirror.php use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; -use shirabe_php_shim::hash; +use shirabe_php_shim::{hash, php_regex}; pub struct ComposerMirror; @@ -15,7 +15,7 @@ impl ComposerMirror { pretty_version: Option<&str>, ) -> String { let reference = reference.map(|r| { - if Preg::is_match(r"{^([a-f0-9]*|%reference%)$}", r) { + if Preg::is_match(php_regex!(r"{^([a-f0-9]*|%reference%)$}"), r) { r.to_string() } else { hash("md5", r) @@ -56,7 +56,9 @@ impl ComposerMirror { let mut gh_matches: indexmap::IndexMap = indexmap::IndexMap::new(); let mut bb_matches: indexmap::IndexMap = indexmap::IndexMap::new(); let normalized_url = if Preg::match3( - r"#^(?:(?:https?|git)://github\.com/|git@github\.com:)([^/]+)/(.+?)(?:\.git)?$#", + php_regex!( + r"#^(?:(?:https?|git)://github\.com/|git@github\.com:)([^/]+)/(.+?)(?:\.git)?$#" + ), url, Some(&mut gh_matches), ) { @@ -72,7 +74,7 @@ impl ComposerMirror { .unwrap_or_default(), ) } else if Preg::match3( - r"#^https://bitbucket\.org/([^/]+)/(.+?)(?:\.git)?/?$#", + php_regex!(r"#^https://bitbucket\.org/([^/]+)/(.+?)(?:\.git)?/?$#"), url, Some(&mut bb_matches), ) { @@ -88,7 +90,7 @@ impl ComposerMirror { .unwrap_or_default(), ) } else { - Preg::replace(r"{[^a-z0-9_.-]}i", "-", url.trim_matches('/')) + Preg::replace(php_regex!(r"{[^a-z0-9_.-]}i"), "-", url.trim_matches('/')) }; ["%package%", "%normalizedUrl%", "%type%"] -- cgit v1.3.1