aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/platform
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-07-18 15:03:55 +0900
committernsfisis <nsfisis@gmail.com>2026-07-18 15:54:27 +0900
commit91692846909ed191addb7ec1c34aad11392ab88b (patch)
tree7c477055e432fd43a98e5dddc016e07dcfc67f60 /crates/shirabe/src/platform
parent4ae58baf8618f5fe916ba2a69faaca93514134ce (diff)
downloadphp-shirabe-91692846909ed191addb7ec1c34aad11392ab88b.tar.gz
php-shirabe-91692846909ed191addb7ec1c34aad11392ab88b.tar.zst
php-shirabe-91692846909ed191addb7ec1c34aad11392ab88b.zip
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 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/platform')
-rw-r--r--crates/shirabe/src/platform/runtime.rs8
-rw-r--r--crates/shirabe/src/platform/version.rs10
2 files changed, 11 insertions, 7 deletions
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<CaptureKey, String> = IndexMap::new();
if Preg::match3(
- r"~<h2>\s*<a[^>]*>([^<]+)</a>\s*</h2>~i",
+ php_regex!(r"~<h2>\s*<a[^>]*>([^<]+)</a>\s*</h2>~i"),
html,
Some(&mut matches),
) {
@@ -114,7 +114,9 @@ impl Runtime {
let mut matches: IndexMap<CaptureKey, Vec<String>> = IndexMap::new();
if Preg::match_all3(
- r#"~<tr>\s*<td class="e">\s*(.*?)\s*</td>\s*<td class="v">\s*(.*?)\s*</td>\s*</tr>~is"#,
+ php_regex!(
+ r#"~<tr>\s*<td class="e">\s*(.*?)\s*</td>\s*<td class="v">\s*(.*?)\s*</td>\s*</tr>~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<CaptureKey, String> = IndexMap::new();
if !Preg::match3(
- r"/^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/",
+ php_regex!(
+ r"/^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?: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<String> {
let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
if !Preg::match3(
- r"/^(?P<major>\d+)(?P<minor>[a-z]*)$/",
+ php_regex!(r"/^(?P<major>\d+)(?P<minor>[a-z]*)$/"),
libjpeg_version,
Some(&mut matches),
) {
@@ -81,7 +83,7 @@ impl Version {
pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option<String> {
let mut matches: IndexMap<CaptureKey, String> = IndexMap::new();
if !Preg::match3(
- r"/^(?P<year>\d{4})(?P<revision>[a-z]*)$/",
+ php_regex!(r"/^(?P<year>\d{4})(?P<revision>[a-z]*)$/"),
zoneinfo_version,
Some(&mut matches),
) {