fine tuning abp filters performance

Author: gorhill

js/abp-filters.js

@@ -88,6 +88,14 @@ var FilterEntry = function(token) {
     this.suffix = '';
 };
 
+FilterEntry.prototype.matchString = function(s, tokenBeg, tokenEnd) {
+    if ( s.indexOf(this.suffix, tokenEnd) !== tokenEnd ) {
+        return false;
+    }
+    tokenBeg -= this.prefix.length;
+    return s.indexOf(this.prefix, tokenBeg) === tokenBeg;
+};
+
 /******************************************************************************/
 
 // Reset all, thus reducing to a minimum memory footprint of the context.
@@ -311,41 +319,42 @@ var freeze = function() {
 
 /******************************************************************************/
 
-var matchFromIdList = function(s, tokenBeg, tokenEnd, list) {
-    if ( list === undefined ) {
-        return false;
-    }
+var matchFromFilterIndex = function(s, tokenBeg, tokenEnd, index) {
+    return filterDict[index].matchString(s, tokenBeg, tokenEnd);
+};
 
-    var f;
-    if ( typeof list === 'number' ) {
-        f = filterDict[list];
-        if ( s.lastIndexOf(f.prefix, tokenBeg) !== (tokenBeg - f.prefix.length) ) {
-            return false;
+/******************************************************************************/
+
+var matchFromFilterIndices = function(s, tokenBeg, tokenEnd, indices) {
+    var indicesEnd = indices.length;
+    var indexBeg = 0, indexEnd;
+    while ( indexBeg < indicesEnd ) {
+        indexEnd = indices.indexOf(' ', indexBeg);
+        if ( indexEnd < 0 ) {
+            indexEnd = indicesEnd;
         }
-        if ( s.indexOf(f.suffix, tokenEnd) !== tokenEnd ) {
-            return false;
+        if ( filterDict[indices.slice(indexBeg, indexEnd)].matchString(s, tokenBeg, tokenEnd) ) {
+            return true;
         }
-        // console.log('HTTPBA.filters.matchFromIdList(): "%s" matches "%s"', f.prefix + f.token + f.suffix, s);
-        return true;
+        indexBeg = indexEnd + 1;
     }
+    return false;
+};
 
-    var idListEnd = list.length;
-    var idBeg = 0, idEnd;
-    while ( idBeg < idListEnd ) {
-        idEnd = list.indexOf(' ', idBeg);
-        if ( idEnd < 0 ) {
-            idEnd = idListEnd;
-        }
-        f = filterDict[list.slice(idBeg, idEnd)];
-        idBeg = idEnd + 1;
-        if ( s.lastIndexOf(f.prefix, tokenBeg) !== (tokenBeg - f.prefix.length) ) {
-            continue;
-        }
-        if ( s.indexOf(f.suffix, tokenEnd) !== tokenEnd ) {
-            continue;
-        }
-        // console.log('HTTPBA.filters.matchFromIdList(): "%s" matches "%s"', f.prefix + f.token + f.suffix, s);
-        return true;
+/******************************************************************************/
+
+var matchFromSomething = function(s, tokenBeg, tokenEnd, something) {
+    if ( something === undefined ) {
+        return false;
+    }
+    if ( typeof something === 'number') {
+        return filterDict[something].matchString(s, tokenBeg, tokenEnd);
+    }
+    if ( typeof something === 'string') {
+        return matchFromFilterIndices(s, tokenBeg, tokenEnd, something);
+    }
+    if ( something instanceof FilterEntry ) {
+        return something.matchString(s, tokenBeg, tokenEnd);
     }
     return false;
 };
@@ -372,20 +381,20 @@ var matchString = function(s) {
         tokenBeg = matches.index;
         tokenEnd = reToken.lastIndex;
         if ( typeof tokenEntry !== 'object' ) {
-            if ( matchFromIdList(s, tokenBeg, tokenEnd, tokenEntry) ) {
+            if ( matchFromSomething(s, tokenBeg, tokenEnd, tokenEntry) ) {
                 return true;
             }
             continue;
         }
         prefixKey = tokenBeg > 0 ? s.charAt(matches.index-1) : '0';
         suffixKey = tokenEnd < s.length ? s.charAt(tokenEnd) : '0';
-        if ( matchFromIdList(s, tokenBeg, tokenEnd, tokenEntry[prefixKey + suffixKey]) ) {
+        if ( matchFromSomething(s, tokenBeg, tokenEnd, tokenEntry[prefixKey + suffixKey]) ) {
             return true;
         }
-        if ( matchFromIdList(s, tokenBeg, tokenEnd, tokenEntry[prefixKey + '0']) ) {
+        if ( matchFromSomething(s, tokenBeg, tokenEnd, tokenEntry[prefixKey + '0']) ) {
             return true;
         }
-        if ( matchFromIdList(s, tokenBeg, tokenEnd, tokenEntry['0' + suffixKey]) ) {
+        if ( matchFromSomething(s, tokenBeg, tokenEnd, tokenEntry['0' + suffixKey]) ) {
             return true;
         }
     }

js/profiler.js

@@ -25,7 +25,7 @@ function Profiler() {
     this.time = 0;
     this.count = -3;
     this._start = 0;
-    this._lastlog = 0;
+    this._lastlog = Date.now();
 }
 
 Profiler.prototype.reset = function() {

js/traffic.js

@@ -157,17 +157,16 @@ function onBeforeRequestHandler(details) {
         return;
     }
 
-    // quickProfiler.start();
-
     var httpsb = HTTPSB;
 
     // Don't block chrome extensions
     if ( requestURL.indexOf(httpsb.chromeExtensionURLPrefix) === 0 ) {
         onBeforeChromeExtensionRequestHandler(details);
-        // quickProfiler.stop('onBeforeRequestHandler');
         return;
     }
 
+    // quickProfiler.start();
+
     var canEvaluate = true;
     var tabId = details.tabId;