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

Merge branch 'master' of github.com:gorhill/uBlock into inspector

This commit is contained in:
gorhill 2015-06-28 17:43:15 -04:00
parent 39b0d719c0 e5d6acd712
commit 957dea5289
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/logger.js
View File

@ -101,6 +101,14 @@ LogBuffer.prototype.dispose = function() {
/******************************************************************************/ /******************************************************************************/
LogBuffer.prototype.clearBuffer = function(beg, end) {
for ( var i = beg; i < end; i++ ) {
this.buffer[i] = null;
}
};
/******************************************************************************/
LogBuffer.prototype.writeOne = function(args) { 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];
@ -116,6 +124,13 @@ LogBuffer.prototype.writeOne = function(args) {
// Grow the buffer between 1.5x-2x the current size // Grow the buffer between 1.5x-2x the current size
if ( this.writePtr === this.readPtr ) { if ( this.writePtr === this.readPtr ) {
var toMove = this.buffer.slice(0, this.writePtr); var toMove = this.buffer.slice(0, this.writePtr);
// https://github.com/gorhill/uBlock/issues/391
// "The slice() method returns a shallow copy of a portion of an
// "array into a new array object."
// "shallow" => since we reuse entries, we need to remove the copied
// entries to prevent single instance of LogEntry being used in
// more than one slot.
this.clearBuffer(0, this.writePtr);
var minSize = Math.ceil(this.size * 1.5); var minSize = Math.ceil(this.size * 1.5);
this.size += toMove.length; this.size += toMove.length;
if ( this.size < minSize ) { if ( this.size < minSize ) {