1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delay start of the match cache optimization (#7738)

Browse Source
This commit is contained in:
TSUYUSATO Kitsune 2023-05-04 13:15:51 +09:00 committed by GitHub
parent 18b27185c3
commit ac730d3e75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2023-05-04 04:16:11 +00:00 
Merged-By: makenowjust <make.just.on@gmail.com>
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
regexec.c
View File

@ -953,7 +953,7 @@ onig_region_copy(OnigRegion* to, const OnigRegion* from)
#ifdef USE_MATCH_CACHE #ifdef USE_MATCH_CACHE
#define MATCH_ARG_INIT_MATCH_CACHE(msa) do {\ #define MATCH_ARG_INIT_MATCH_CACHE(msa) do {\
(msa).enable_match_cache = 0;\ (msa).match_cache_status = MATCH_CACHE_STATUS_UNINIT;\
(msa).num_fails = 0;\ (msa).num_fails = 0;\
(msa).num_cache_opcodes = NUM_CACHE_OPCODES_UNINIT;\ (msa).num_cache_opcodes = NUM_CACHE_OPCODES_UNINIT;\
(msa).cache_opcodes = (OnigCacheOpcode*)NULL;\ (msa).cache_opcodes = (OnigCacheOpcode*)NULL;\
@ -2438,7 +2438,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
#endif #endif
# define CHECK_MATCH_CACHE do {\ # define CHECK_MATCH_CACHE do {\
if (msa->enable_match_cache) {\ if (msa->match_cache_status == MATCH_CACHE_STATUS_ENABLED) {\
long cache_point = find_cache_point(reg, msa->cache_opcodes, msa->num_cache_opcodes, pbegin, stk_base, repeat_stk);\ long cache_point = find_cache_point(reg, msa->cache_opcodes, msa->num_cache_opcodes, pbegin, stk_base, repeat_stk);\
if (cache_point >= 0) {\ if (cache_point >= 0) {\
long match_cache_point = msa->num_cache_points * (long)(s - str) + cache_point;\ long match_cache_point = msa->num_cache_points * (long)(s - str) + cache_point;\
@ -3543,7 +3543,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
goto null_check_found; goto null_check_found;
} }
# ifdef USE_MATCH_CACHE # ifdef USE_MATCH_CACHE
if (ischanged && msa->enable_match_cache) { if (ischanged && msa->match_cache_status == MATCH_CACHE_STATUS_ENABLED) {
RelAddrType rel; RelAddrType rel;
OnigUChar *null_check_start; OnigUChar *null_check_start;
OnigUChar *null_check_end = pbegin; OnigUChar *null_check_end = pbegin;
@ -3961,17 +3961,24 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
pkeep = stk->u.state.pkeep; pkeep = stk->u.state.pkeep;
#ifdef USE_MATCH_CACHE #ifdef USE_MATCH_CACHE
if (++msa->num_fails >= (long)(end - str) + 1 && msa->num_cache_opcodes == NUM_CACHE_OPCODES_UNINIT) { if (
msa->enable_match_cache = 1; msa->match_cache_status != MATCH_CACHE_STATUS_DISABLED &&
if (msa->num_cache_opcodes == NUM_CACHE_OPCODES_UNINIT) { ++msa->num_fails >= (long)(end - str) * msa->num_cache_opcodes
) {
if (msa->match_cache_status == MATCH_CACHE_STATUS_UNINIT) {
msa->match_cache_status = MATCH_CACHE_STATUS_INIT;
OnigPosition r = count_num_cache_opcodes(reg, &msa->num_cache_opcodes); OnigPosition r = count_num_cache_opcodes(reg, &msa->num_cache_opcodes);
if (r < 0) goto bytecode_error; if (r < 0) goto bytecode_error;
} }
if (msa->num_cache_opcodes == NUM_CACHE_OPCODES_IMPOSSIBLE || msa->num_cache_opcodes == 0) { if (msa->num_cache_opcodes == NUM_CACHE_OPCODES_IMPOSSIBLE || msa->num_cache_opcodes == 0) {
msa->enable_match_cache = 0; msa->match_cache_status = MATCH_CACHE_STATUS_DISABLED;
goto fail_match_cache_opt; goto fail_match_cache;
}
if (msa->num_fails < (long)(end - str) * msa->num_cache_opcodes) {
goto fail_match_cache;
} }
if (msa->cache_opcodes == NULL) { if (msa->cache_opcodes == NULL) {
msa->match_cache_status = MATCH_CACHE_STATUS_ENABLED;
OnigCacheOpcode* cache_opcodes = (OnigCacheOpcode*)xmalloc(msa->num_cache_opcodes * sizeof(OnigCacheOpcode)); OnigCacheOpcode* cache_opcodes = (OnigCacheOpcode*)xmalloc(msa->num_cache_opcodes * sizeof(OnigCacheOpcode));
if (cache_opcodes == NULL) { if (cache_opcodes == NULL) {
return ONIGERR_MEMORY; return ONIGERR_MEMORY;
@ -4013,7 +4020,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
msa->match_cache_buf = match_cache_buf; msa->match_cache_buf = match_cache_buf;
} }
} }
fail_match_cache_opt: fail_match_cache:
#endif #endif
#ifdef USE_COMBINATION_EXPLOSION_CHECK #ifdef USE_COMBINATION_EXPLOSION_CHECK

9
regint.h
View File

@ -909,7 +909,7 @@ typedef struct {
uint64_t end_time; uint64_t end_time;
#endif #endif
#ifdef USE_MATCH_CACHE #ifdef USE_MATCH_CACHE
int enable_match_cache; int match_cache_status;
long num_fails; long num_fails;
long num_cache_opcodes; long num_cache_opcodes;
OnigCacheOpcode* cache_opcodes; OnigCacheOpcode* cache_opcodes;
@ -918,8 +918,13 @@ typedef struct {
#endif #endif
} OnigMatchArg; } OnigMatchArg;
#define NUM_CACHE_OPCODES_UNINIT 1
#define NUM_CACHE_OPCODES_IMPOSSIBLE -1 #define NUM_CACHE_OPCODES_IMPOSSIBLE -1
#define NUM_CACHE_OPCODES_UNINIT -2
#define MATCH_CACHE_STATUS_UNINIT 1
#define MATCH_CACHE_STATUS_INIT 2
#define MATCH_CACHE_STATUS_DISABLED -1
#define MATCH_CACHE_STATUS_ENABLED 0
#define IS_CODE_SB_WORD(enc,code) \ #define IS_CODE_SB_WORD(enc,code) \
(ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_WORD(enc,code)) (ONIGENC_IS_CODE_ASCII(code) && ONIGENC_IS_CODE_WORD(enc,code))