mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Log entry max to 2k, remove logging in hot codepaths (#1459)

Browse source 
On a recent trip through a CPU profile taken while Signal Desktop
churned through a large backlog of messages, it was clear that
console.log was a major source of time spent, primarily the sort
operation required after every new entry is added to the Backbone
collection. So, three different techniques to combat this:

1) Reduce the maximum number of entries in the collection from 5k to 2k
2) No more logging of add/update/remove queue in MessageReceiver
3) No more log entries in Message.handleDataMessage main codepath

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-09-12 09:34:49 -07:00 committed by GitHub
parent 69af8d2651
commit 1e694fe8d7
4 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/debugLog.js
View file

@ -40,7 +40,7 @@
} }
}); });
var MAX_MESSAGES = 5000; var MAX_MESSAGES = 2000;
var PHONE_REGEX = /\+\d{7,12}(\d{3})/g; var PHONE_REGEX = /\+\d{7,12}(\d{3})/g;
var log = new DebugLog(); var log = new DebugLog();
if (window.console) { if (window.console) {

3
js/libtextsecure.js
View file

@ -38487,7 +38487,6 @@ MessageReceiver.prototype.extend({
}, },
addToCache: function(envelope, plaintext) { addToCache: function(envelope, plaintext) {
var id = this.getEnvelopeId(envelope); var id = this.getEnvelopeId(envelope);
console.log('addToCache', id);
var data = { var data = {
id: id, id: id,
envelope: plaintext, envelope: plaintext,
@ -38498,7 +38497,6 @@ MessageReceiver.prototype.extend({
}, },
updateCache: function(envelope, plaintext) { updateCache: function(envelope, plaintext) {
var id = this.getEnvelopeId(envelope); var id = this.getEnvelopeId(envelope);
console.log('updateCache', id);
var data = { var data = {
decrypted: plaintext decrypted: plaintext
}; };
@ -38506,7 +38504,6 @@ MessageReceiver.prototype.extend({
}, },
removeFromCache: function(envelope) { removeFromCache: function(envelope) {
var id = this.getEnvelopeId(envelope); var id = this.getEnvelopeId(envelope);
console.log('removeFromCache', id);
return textsecure.storage.unprocessed.remove(id); return textsecure.storage.unprocessed.remove(id);
}, },
queueDecryptedEnvelope: function(envelope, plaintext) { queueDecryptedEnvelope: function(envelope, plaintext) {

7
js/models/messages.js
View file

@ -343,13 +343,10 @@
if (dataMessage.group) { if (dataMessage.group) {
conversationId = dataMessage.group.id; conversationId = dataMessage.group.id;
} }
console.log('queuing handleDataMessage', message.idForLogging());
var conversation = ConversationController.get(conversationId); var conversation = ConversationController.get(conversationId);
return conversation.queueJob(function() { return conversation.queueJob(function() {
return new Promise(function(resolve) { return new Promise(function(resolve) {
console.log('starting handleDataMessage', message.idForLogging());
var now = new Date().getTime(); var now = new Date().getTime();
var attributes = { type: 'private' }; var attributes = { type: 'private' };
if (dataMessage.group) { if (dataMessage.group) {
@ -459,8 +456,6 @@
}); });
} }
console.log('beginning saves in handleDataMessage', message.idForLogging());
var handleError = function(error) { var handleError = function(error) {
error = error && error.stack ? error.stack : error; error = error && error.stack ? error.stack : error;
console.log('handleDataMessage', message.idForLogging(), 'error:', error); console.log('handleDataMessage', message.idForLogging(), 'error:', error);
@ -492,8 +487,6 @@
conversation.notify(message); conversation.notify(message);
} }
console.log('done with handleDataMessage', message.idForLogging());
confirm(); confirm();
return resolve(); return resolve();
} }

3
libtextsecure/message_receiver.js
View file

@ -236,7 +236,6 @@ MessageReceiver.prototype.extend({
}, },
addToCache: function(envelope, plaintext) { addToCache: function(envelope, plaintext) {
var id = this.getEnvelopeId(envelope); var id = this.getEnvelopeId(envelope);
console.log('addToCache', id);
var data = { var data = {
id: id, id: id,
envelope: plaintext, envelope: plaintext,
@ -247,7 +246,6 @@ MessageReceiver.prototype.extend({
}, },
updateCache: function(envelope, plaintext) { updateCache: function(envelope, plaintext) {
var id = this.getEnvelopeId(envelope); var id = this.getEnvelopeId(envelope);
console.log('updateCache', id);
var data = { var data = {
decrypted: plaintext decrypted: plaintext
}; };
@ -255,7 +253,6 @@ MessageReceiver.prototype.extend({
}, },
removeFromCache: function(envelope) { removeFromCache: function(envelope) {
var id = this.getEnvelopeId(envelope); var id = this.getEnvelopeId(envelope);
console.log('removeFromCache', id);
return textsecure.storage.unprocessed.remove(id); return textsecure.storage.unprocessed.remove(id);
}, },
queueDecryptedEnvelope: function(envelope, plaintext) { queueDecryptedEnvelope: function(envelope, plaintext) {