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/platform/runtime.rs | 8 +++++--- crates/shirabe/src/platform/version.rs | 10 ++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/platform') diff --git a/crates/shirabe/src/platform/runtime.rs b/crates/shirabe/src/platform/runtime.rs index 40297907..28cfa095 100644 --- a/crates/shirabe/src/platform/runtime.rs +++ b/crates/shirabe/src/platform/runtime.rs @@ -4,7 +4,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ PhpMixed, class_exists, function_exists, html_entity_decode, implode, instantiate_class, ltrim, - strip_tags, trim, + php_regex, strip_tags, trim, }; /// Seam over the PHP runtime so PlatformRepository can be tested against mocked @@ -96,7 +96,7 @@ impl Runtime { let mut matches: IndexMap = IndexMap::new(); if Preg::match3( - r"~

\s*]*>([^<]+)\s*

~i", + php_regex!(r"~

\s*]*>([^<]+)\s*

~i"), html, Some(&mut matches), ) { @@ -114,7 +114,9 @@ impl Runtime { let mut matches: IndexMap> = IndexMap::new(); if Preg::match_all3( - r#"~\s*\s*(.*?)\s*\s*\s*(.*?)\s*\s*~is"#, + php_regex!( + r#"~\s*\s*(.*?)\s*\s*\s*(.*?)\s*\s*~is"# + ), html, Some(&mut matches), ) > 0 diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs index cbbbe44e..feed1b85 100644 --- a/crates/shirabe/src/platform/version.rs +++ b/crates/shirabe/src/platform/version.rs @@ -2,7 +2,7 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; -use shirabe_php_shim::version_compare; +use shirabe_php_shim::{php_regex, version_compare}; pub struct Version; @@ -12,7 +12,9 @@ impl Version { let mut matches: IndexMap = IndexMap::new(); if !Preg::match3( - r"/^(?P[0-9.]+)(?P[a-z]{0,2})(?P(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/", + php_regex!( + r"/^(?P[0-9.]+)(?P[a-z]{0,2})(?P(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/" + ), openssl_version, Some(&mut matches), ) { @@ -56,7 +58,7 @@ impl Version { pub fn parse_libjpeg(libjpeg_version: &str) -> Option { let mut matches: IndexMap = IndexMap::new(); if !Preg::match3( - r"/^(?P\d+)(?P[a-z]*)$/", + php_regex!(r"/^(?P\d+)(?P[a-z]*)$/"), libjpeg_version, Some(&mut matches), ) { @@ -81,7 +83,7 @@ impl Version { pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option { let mut matches: IndexMap = IndexMap::new(); if !Preg::match3( - r"/^(?P\d{4})(?P[a-z]*)$/", + php_regex!(r"/^(?P\d{4})(?P[a-z]*)$/"), zoneinfo_version, Some(&mut matches), ) { -- cgit v1.3.1