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/tests/dependency_resolver/pool_optimizer_test.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs') diff --git a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs index 08d5f989..d5cdbc78 100644 --- a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs +++ b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs @@ -12,8 +12,8 @@ use shirabe::package::version::version_parser::VersionParser; use shirabe::repository::handle::LockArrayRepositoryHandle; use shirabe::repository::lock_array_repository::LockArrayRepository; use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_php_shim::PREG_SPLIT_DELIM_CAPTURE; use shirabe_php_shim::PhpMixed; +use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, php_regex}; use std::path::PathBuf; fn load_package(package_data: &PhpMixed) -> BasePackageHandle { @@ -62,7 +62,7 @@ fn reduce_packages_info_for_comparison(packages: &[BasePackageHandle]) -> Vec IndexMap { let contents = shirabe_php_shim::file_get_contents(file).unwrap(); let tokens = Preg::split4( - r"#(?:^|\n*)--([A-Z-]+)--\n#", + php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"), &contents, -1, PREG_SPLIT_DELIM_CAPTURE, @@ -147,7 +147,7 @@ fn provide_integration_tests() -> IndexMap< for file in files { let file = file.to_str().unwrap().to_string(); - if !Preg::is_match(r"/\.test$/", &file) { + if !Preg::is_match(php_regex!(r"/\.test$/"), &file) { continue; } -- cgit v1.3.1