Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Order HNTrie nodes alphabetically to allow for early bailout" 

This reverts commit f5f9e05071.
This commit is contained in:
Raymond Hill 2019-04-30 07:00:52 -04:00
parent f5f9e05071
commit 42bf659695
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/js/hntrie.js
View File

@ -181,14 +181,12 @@ const HNTrieContainer = class {
if ( ineedle === 0 ) { return -1; } if ( ineedle === 0 ) { return -1; }
ineedle -= 1; ineedle -= 1;
let c = this.buf[ineedle]; let c = this.buf[ineedle];
let v, i0, diff; let v, i0;
// find first segment with a first-character match // find first segment with a first-character match
for (;;) { for (;;) {
v = this.buf32[icell+2]; v = this.buf32[icell+2];
i0 = char0 + (v & 0x00FFFFFF); i0 = char0 + (v & 0x00FFFFFF);
diff = this.buf[i0] - c; if ( this.buf[i0] === c ) { break; }
if ( diff === 0 ) { break; }
if ( diff > 0 ) { return -1; }
icell = this.buf32[icell+0]; icell = this.buf32[icell+0];
if ( icell === 0 ) { return -1; } if ( icell === 0 ) { return -1; }
} }
@ -256,7 +254,7 @@ const HNTrieContainer = class {
} }
// //
const char0 = this.buf32[HNTRIE_CHAR0_SLOT]; const char0 = this.buf32[HNTRIE_CHAR0_SLOT];
let iprevious = iroot, diff, inext; let inext;
// find a matching cell: move down // find a matching cell: move down
for (;;) { for (;;) {
const vseg = this.buf32[icell+2]; const vseg = this.buf32[icell+2];
@ -265,38 +263,21 @@ const HNTrieContainer = class {
// remainder is at label boundary? if yes, no need to add // remainder is at label boundary? if yes, no need to add
// the rest since the shortest match is always reported // the rest since the shortest match is always reported
if ( this.buf[lhnchar-1] === 0x2E /* '.' */ ) { return -1; } if ( this.buf[lhnchar-1] === 0x2E /* '.' */ ) { return -1; }
iprevious = icell;
icell = this.buf32[icell+1]; icell = this.buf32[icell+1];
continue; continue;
} }
let isegchar0 = char0 + (vseg & 0x00FFFFFF); let isegchar0 = char0 + (vseg & 0x00FFFFFF);
// if first character is no match, move to next descendant // if first character is no match, move to next descendant
diff = this.buf[isegchar0] - this.buf[lhnchar-1]; if ( this.buf[isegchar0] !== this.buf[lhnchar-1] ) {
// current cell character greater than target character: insert
// a new node before current cell
if ( diff > 0 ) {
const inew = this.addCell(icell, 0, this.addSegment(lhnchar));
if ( icell === this.buf32[iprevious+0] ) {
this.buf32[iprevious+0] = inew;
} else /* if ( icell === this.buf32[iprevious+1] ) */ {
this.buf32[iprevious+1] = inew;
}
return 1;
}
// current cell character lesser than target character: keep
// looking
if ( diff !== 0 ) {
inext = this.buf32[icell+0]; inext = this.buf32[icell+0];
// no match found: insert a new leaf descendant
if ( inext === 0 ) { if ( inext === 0 ) {
this.buf32[icell+0] = this.addCell(0, 0, this.addSegment(lhnchar)); this.buf32[icell+0] = this.addCell(0, 0, this.addSegment(lhnchar));
return 1; return 1;
} }
iprevious = icell;
icell = inext; icell = inext;
continue; continue;
} }
// current cell character matches: 1st character was tested // 1st character was tested
let isegchar = 1; let isegchar = 1;
lhnchar -= 1; lhnchar -= 1;
// find 1st mismatch in rest of segment // find 1st mismatch in rest of segment
@ -305,8 +286,7 @@ const HNTrieContainer = class {
for (;;) { for (;;) {
if ( isegchar === lsegchar ) { break; } if ( isegchar === lsegchar ) { break; }
if ( lhnchar === 0 ) { break; } if ( lhnchar === 0 ) { break; }
diff = this.buf[isegchar0+isegchar] - this.buf[lhnchar-1]; if ( this.buf[isegchar0+isegchar] !== this.buf[lhnchar-1] ) { break; }
if ( diff !== 0 ) { break; }
isegchar += 1; isegchar += 1;
lhnchar -= 1; lhnchar -= 1;
} }
@ -324,7 +304,6 @@ const HNTrieContainer = class {
// needle remainder: yes // needle remainder: yes
else { else {
if ( inext !== 0 ) { if ( inext !== 0 ) {
iprevious = icell;
icell = inext; icell = inext;
continue; continue;
} }
@ -347,19 +326,14 @@ const HNTrieContainer = class {
this.buf32[icell+1], this.buf32[icell+1],
lsegchar - isegchar << 24 | isegchar0 + isegchar lsegchar - isegchar << 24 | isegchar0 + isegchar
); );
this.buf32[icell+1] = inext;
// needle remainder: no = need boundary cell // needle remainder: no = need boundary cell
if ( lhnchar === 0 ) { if ( lhnchar === 0 ) {
this.buf32[icell+1] = this.addCell(0, inext, 0); this.buf32[icell+1] = this.addCell(0, inext, 0);
} }
// needle remainder: yes = need new cell for remaining characters // needle remainder: yes = need new cell for remaining characters
else { else {
const isegment = this.addSegment(lhnchar); this.buf32[inext+0] = this.addCell(0, 0, this.addSegment(lhnchar));
if ( diff > 0 ) {
this.buf32[icell+1] = this.addCell(inext, 0, isegment);
} else {
this.buf32[icell+1] = inext;
this.buf32[inext+0] = this.addCell(0, 0, isegment);
}
} }
} }
return 1; return 1;