jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build encoding stats array dynamically 

Avoids having to hard code which encodings we might see.
This commit is contained in:
Pierre Ossman 2017-09-07 16:48:29 +02:00
parent f8ec2df2bb
commit c338622719
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/rfb.js
View File

@ -183,7 +183,6 @@ export default function RFB(defaults) {
// Create lookup tables based on encoding number // Create lookup tables based on encoding number
for (var i = 0; i < this._encodings.length; i++) { for (var i = 0; i < this._encodings.length; i++) {
this._encHandlers[this._encodings[i][1]] = this._encHandlers[this._encodings[i][0]]; this._encHandlers[this._encodings[i][1]] = this._encHandlers[this._encodings[i][0]];
this._encStats[this._encodings[i][1]] = [0, 0];
} }
// NB: nothing that needs explicit teardown should be done // NB: nothing that needs explicit teardown should be done
@ -428,31 +427,33 @@ RFB.prototype = {
this._rfb_tightvnc = false; this._rfb_tightvnc = false;
// Clear the per connection encoding stats // Clear the per connection encoding stats
var i; var stats = this._encStats;
for (i = 0; i < this._encodings.length; i++) { Object.keys(stats).forEach(function (key) {
this._encStats[this._encodings[i][1]][0] = 0; stats[key][0] = 0;
} });
var i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
this._FBU.zlibs[i] = new Inflator(); this._FBU.zlibs[i] = new Inflator();
} }
}, },
_print_stats: function () { _print_stats: function () {
var stats = this._encStats;
Log.Info("Encoding stats for this connection:"); Log.Info("Encoding stats for this connection:");
var i, s; Object.keys(stats).forEach(function (key) {
for (i = 0; i < this._encodings.length; i++) { var s = stats[key];
s = this._encStats[this._encodings[i][1]];
if (s[0] + s[1] > 0) { if (s[0] + s[1] > 0) {
Log.Info(" " + encodingName(this._encodings[i][1]) + ": " + s[0] + " rects"); Log.Info(" " + encodingName(key) + ": " + s[0] + " rects");
} }
} });
Log.Info("Encoding stats since page load:"); Log.Info("Encoding stats since page load:");
for (i = 0; i < this._encodings.length; i++) { Object.keys(stats).forEach(function (key) {
s = this._encStats[this._encodings[i][1]]; var s = stats[key];
Log.Info(" " + encodingName(this._encodings[i][1]) + ": " + s[1] + " rects"); Log.Info(" " + encodingName(key) + ": " + s[1] + " rects");
} });
}, },
_cleanup: function () { _cleanup: function () {
@ -1366,6 +1367,9 @@ RFB.prototype = {
this._timing.cur_fbu += (now - this._timing.last_fbu); this._timing.cur_fbu += (now - this._timing.last_fbu);
if (ret) { if (ret) {
if (!(this._FBU.encoding in this._encStats)) {
this._encStats[this._FBU.encoding] = [0, 0];
}
this._encStats[this._FBU.encoding][0]++; this._encStats[this._FBU.encoding][0]++;
this._encStats[this._FBU.encoding][1]++; this._encStats[this._FBU.encoding][1]++;
this._timing.pixels += this._FBU.width * this._FBU.height; this._timing.pixels += this._FBU.width * this._FBU.height;