Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-04 08:37:11 +02:00
Code Issues Releases Wiki Activity

code review: do not hold onto log entries when logger become unused

Browse Source
This commit is contained in:
gorhill 2016-03-30 08:37:41 -04:00
parent cf47bdc4c8
commit 1794c25145
1 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/js/logger.js
View File

@ -37,19 +37,6 @@ var LogEntry = function(args) {
/******************************************************************************/ /******************************************************************************/
var logEntryFactory = function(args) {
var entry = logEntryJunkyard.pop();
if ( entry ) {
return entry.init(args);
}
return new LogEntry(args);
};
var logEntryJunkyard = [];
var logEntryJunkyardMax = 100;
/******************************************************************************/
LogEntry.prototype.init = function(args) { LogEntry.prototype.init = function(args) {
this.tstamp = Date.now(); this.tstamp = Date.now();
this.tab = args[0] || ''; this.tab = args[0] || '';
@ -59,18 +46,6 @@ LogEntry.prototype.init = function(args) {
this.d2 = args[4]; this.d2 = args[4];
this.d3 = args[5]; this.d3 = args[5];
this.d4 = args[6]; this.d4 = args[6];
return this;
};
/******************************************************************************/
LogEntry.prototype.dispose = function() {
this.tstamp = 0;
this.tab = this.cat = '';
this.d0 = this.d1 = this.d2 = this.d3 = this.d4 = undefined;
if ( logEntryJunkyard.length < logEntryJunkyardMax ) {
logEntryJunkyard.push(this);
}
}; };
/******************************************************************************/ /******************************************************************************/
@ -86,21 +61,6 @@ var LogBuffer = function() {
/******************************************************************************/ /******************************************************************************/
LogBuffer.prototype.dispose = function() {
var entry;
var i = this.buffer.length;
while ( i-- ) {
entry = this.buffer[i];
if ( entry instanceof LogEntry ) {
entry.dispose();
}
}
this.buffer = null;
return null;
};
/******************************************************************************/
LogBuffer.prototype.clearBuffer = function(beg, end) { LogBuffer.prototype.clearBuffer = function(beg, end) {
for ( var i = beg; i < end; i++ ) { for ( var i = beg; i < end; i++ ) {
this.buffer[i] = null; this.buffer[i] = null;
@ -113,7 +73,7 @@ LogBuffer.prototype.writeOne = function(args) {
// Reusing log entry = less memory churning // Reusing log entry = less memory churning
var entry = this.buffer[this.writePtr]; var entry = this.buffer[this.writePtr];
if ( entry instanceof LogEntry === false ) { if ( entry instanceof LogEntry === false ) {
this.buffer[this.writePtr] = logEntryFactory(args); this.buffer[this.writePtr] = new LogEntry(args);
} else { } else {
entry.init(args); entry.init(args);
} }
@ -178,7 +138,7 @@ var janitor = function() {
logBuffer.lastReadTime < (Date.now() - logBufferObsoleteAfter) logBuffer.lastReadTime < (Date.now() - logBufferObsoleteAfter)
) { ) {
api.writeOne = writeOneNoop; api.writeOne = writeOneNoop;
logBuffer = logBuffer.dispose(); logBuffer = null;
} }
if ( logBuffer !== null ) { if ( logBuffer !== null ) {
vAPI.setTimeout(janitor, logBufferObsoleteAfter); vAPI.setTimeout(janitor, logBufferObsoleteAfter);