mirror of
https://github.com/SukkaW/Surge.git
synced 2026-01-29 01:51:52 +08:00
Perf: improve reject set dedupe worker performance
This commit is contained in:
@@ -198,6 +198,17 @@ const threads = require('os').cpus().length - 1;
|
|||||||
workerData: [...domainSets]
|
workerData: [...domainSets]
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log(`Launching ${threads} threads...`)
|
||||||
|
|
||||||
|
const tasksArray = Array.from(domainSets)
|
||||||
|
.reduce((result, element, index) => {
|
||||||
|
const chunk = index % threads;
|
||||||
|
result[chunk] ??= [];
|
||||||
|
|
||||||
|
result[chunk].push(element);
|
||||||
|
return result;
|
||||||
|
}, []);
|
||||||
|
|
||||||
(await Promise.all(
|
(await Promise.all(
|
||||||
Array.from(domainSets)
|
Array.from(domainSets)
|
||||||
.reduce((result, element, index) => {
|
.reduce((result, element, index) => {
|
||||||
@@ -208,11 +219,15 @@ const threads = require('os').cpus().length - 1;
|
|||||||
return result;
|
return result;
|
||||||
}, [])
|
}, [])
|
||||||
.map(chunk => piscina.run(
|
.map(chunk => piscina.run(
|
||||||
{ chunk },
|
{ chunk }
|
||||||
{ name: 'dedupe' }
|
|
||||||
))
|
))
|
||||||
)).forEach(set => {
|
)).forEach((result, taskIndex) => {
|
||||||
set.forEach(i => domainSets.delete(i));
|
const chunk = tasksArray[taskIndex];
|
||||||
|
result.forEach((value, index) => {
|
||||||
|
if (value === 1) {
|
||||||
|
domainSets.delete(chunk[index])
|
||||||
|
}
|
||||||
|
})
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log(`Deduped ${previousSize - domainSets.size} rules!`);
|
console.log(`Deduped ${previousSize - domainSets.size} rules!`);
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
const { workerData } = require('piscina');
|
const { workerData, move } = require('piscina');
|
||||||
|
|
||||||
const len = workerData.length;
|
const len = workerData.length;
|
||||||
|
|
||||||
exports.dedupe = ({ chunk }) => {
|
module.exports = ({ chunk }) => {
|
||||||
const outputToBeRemoved = new Set();
|
const chunkLength = chunk.length;
|
||||||
|
const outputToBeRemoved = new Int32Array(chunkLength);
|
||||||
|
|
||||||
for (let i = 0, l = chunk.length; i < l; i++) {
|
for (let i = 0; i < chunkLength; i++) {
|
||||||
const domainFromInput = chunk[i];
|
const domainFromInput = chunk[i];
|
||||||
|
|
||||||
for (let j = 0; j < len; j++) {
|
for (let j = 0; j < len; j++) {
|
||||||
@@ -26,7 +27,7 @@ exports.dedupe = ({ chunk }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (shouldBeRemoved) {
|
if (shouldBeRemoved) {
|
||||||
outputToBeRemoved.add(domainFromInput);
|
outputToBeRemoved[i] = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -34,12 +35,12 @@ exports.dedupe = ({ chunk }) => {
|
|||||||
|
|
||||||
if (domainFromInput.length >= domainFromFullSet.length) {
|
if (domainFromInput.length >= domainFromFullSet.length) {
|
||||||
if (domainFromInput.endsWith(domainFromFullSet)) {
|
if (domainFromInput.endsWith(domainFromFullSet)) {
|
||||||
outputToBeRemoved.add(domainFromInput);
|
outputToBeRemoved[i] = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return outputToBeRemoved;
|
return move(outputToBeRemoved);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user