Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-02 17:19:38 +02:00
Code Issues Releases Wiki Activity

Make loadBenchmarkDataset() compatible with more recent requests.json

Browse Source 
The format of requests.json used in latest Cliqz benchmark code
has changed from the original one -- this commit makes the
dataset load code also compatible with the new format.

More recent dataset used in Cliqz benchmark code:
- https://github.com/mjethani/scaling-palm-tree

Cliqz benchmark code:
- https://github.com/ghostery/adblocker/tree/master/packages/adblocker-benchmarks
This commit is contained in:
Raymond Hill 2021-12-18 11:44:01 -05:00
parent 7da0ccd55b
commit 7ca2c8a9a7
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/js/benchmarks.js
View File

@ -94,14 +94,30 @@ const loadBenchmarkDataset = (( ) => {
console.info(`Loading benchmark dataset...`);
datasetPromise = io.fetchText(datasetURL).then(details => {
console.info(`Parsing benchmark dataset...`);
const requests = [];
const lineIter = new LineIterator(details.content);
while ( lineIter.eot() === false ) {
let request;
let requests = [];
if ( details.content.startsWith('[') ) {
try {
request = JSON.parse(lineIter.next());
requests = JSON.parse(details.content);
} catch(ex) {
}
} else {
const lineIter = new LineIterator(details.content);
const parsed = [];
while ( lineIter.eot() === false ) {
const line = lineIter.next().trim();
if ( line === '' ) { continue; }
try {
parsed.push(JSON.parse(line));
} catch(ex) {
parsed.length = 0;
break;
}
}
requests = parsed;
}
if ( requests.length === 0 ) { return; }
const out = [];
for ( const request of requests ) {
if ( request instanceof Object === false ) { continue; }
if ( !request.frameUrl || !request.url ) { continue; }
if ( request.cpt === 'document' ) {
@ -109,9 +125,9 @@ const loadBenchmarkDataset = (( ) => {
} else if ( request.cpt === 'xhr' ) {
request.cpt = 'xmlhttprequest';
}
requests.push(request);
out.push(request);
}
return requests;
return out;
}).catch(details => {
console.info(`Not found: ${details.url}`);
datasetPromise = undefined;