debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Speedup adblock by removing greedy regex if we have 1 or 2 signatures

Browse source
This commit is contained in:
Alexander Butenko 2010-01-14 01:52:43 +01:00 committed by Christian Dywan
parent 11ff993ecd
commit 4dae65d802
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/adblock.c
View file

@ -926,6 +926,7 @@ adblock_compile_regexp (GHashTable* tbl,
if (!g_regex_match_simple ("^/.*[\\^\\$\\*].*/$", patt, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY)) if (!g_regex_match_simple ("^/.*[\\^\\$\\*].*/$", patt, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY))
{ {
int len = strlen (patt); int len = strlen (patt);
int signature_count = 0;
for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) { for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) {
sig = g_strndup (patt + pos, SIGNATURE_SIZE); sig = g_strndup (patt + pos, SIGNATURE_SIZE);
if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) && if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
@ -933,6 +934,7 @@ adblock_compile_regexp (GHashTable* tbl,
{ {
/* g_debug ("sig: %s %s", sig, patt); */ /* g_debug ("sig: %s %s", sig, patt); */
g_hash_table_insert (keystbl, sig, regex); g_hash_table_insert (keystbl, sig, regex);
signature_count++;
} }
else else
{ {
@ -945,6 +947,8 @@ adblock_compile_regexp (GHashTable* tbl,
g_free (sig); g_free (sig);
} }
} }
if (signature_count > 1 && g_hash_table_lookup (tbl, opts))
g_hash_table_steal (tbl, opts);
} }
else else
{ {