bfg-common 1.4.367 → 1.4.368

package/public/spice-console/lib/GenericObjectPool.js

@@ -1,152 +1,152 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
-Generic Object Pooling from:
-https://github.com/miohtama/objectpool.js/
-MIT License
-
-Copyright (C) 2013 Mikko Ohtamaa
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Version: 65c7399c30a3f6f3593bb4bfca3d9cde65675b84 (git commit)
- */
-
-
-wdi.GenericObjectPool = $.spcExtend(wdi.EventObject.prototype, {
-
-    /** How fast we grow */
-    expandFactor : 0.2,
-
-    /** Minimum number of items we grow */
-    expandMinUnits : 16,
-
-    elems : null,
-
-    /** List of discarded element indexes in our this.elems pool */
-    freeElems : null,
-
-    allocator: null,
-    resetor: null,
-
-    /**
-     * Generic object pool for Javascript.
-     *
-     * @param {Function} allocator return new empty elements
-     *
-     * @param {Function} resetor resetor(obj, index) is called on all new elements when they are (re)allocated from pool.
-     *                   This is mostly useful for making object to track its own pool index.
-     */
-    init : function(params) {
-        var allocator = params[0];
-        var resetor = params[1];
-        // Start with one element
-        this.allocator = allocator;
-        this.resetor = resetor;
-        // Set initial state of 1 object
-        this.elems = [this.allocator()];
-        this.freeElems = [0];
-    },
-
-    dispose: function () {
-        this.elems = null;
-        this.freeElems = null;
-        this.allocator = null;
-        this.resetor = null;
-    },
-
-    /**
-     * @return {[type]} [description]
-     */
-    create : function() {
-
-        if(!this.freeElems.length) {
-            this.expand();
-        }
-
-        // See if we have any allocated elements to reuse
-        var index = this.freeElems.pop();
-        var elem = this.elems[index];
-        this.resetor(elem, index);
-        return elem;
-
-    },
-
-    /**
-     * How many allocated units we have
-     *
-     * @type {Number}
-     */
-    length : function() {
-        return this.elems.length - this.freeElems.length;
-    },
-
-    /**
-     * Make pool bigger by the default growth parameters.
-     *
-     */
-    expand : function() {
-
-        var oldSize = this.elems.length;
-
-        var growth = Math.ceil(this.elems.length * this.expandFactor);
-
-        if(growth < this.expandMinUnits) {
-            growth = this.expandMinUnits;
-        }
-
-        this.elems.length = this.elems.length + growth;
-
-        for(var i=oldSize; i<this.elems.length; i++) {
-            this.elems[i] = this.allocator();
-            this.freeElems.push(i);
-        }
-    },
-
-    /**
-     * Deallocate object at index n
-     *
-     * @param  {Number} n
-     * @return {Object} discarded object
-     */
-    discard : function(n) {
-
-        // Cannot double deallocate
-        if(this.freeElems.indexOf(n) >= 0) {
-            throw "GeneircObjectPool: Double-free for element index: "+n;
-        }
-
-        if(this.elems[n].keepAlive) {
-            return false;
-        }
-
-        this.freeElems.push(n);
-        return true;
-    },
-
-    /**
-     * Return object at pool index n
-     */
-    get : function(n) {
-        return this.elems[n];
-    }
-});
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*
+Generic Object Pooling from:
+https://github.com/miohtama/objectpool.js/
+MIT License
+
+Copyright (C) 2013 Mikko Ohtamaa
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Version: 65c7399c30a3f6f3593bb4bfca3d9cde65675b84 (git commit)
+ */
+
+
+wdi.GenericObjectPool = $.spcExtend(wdi.EventObject.prototype, {
+
+    /** How fast we grow */
+    expandFactor : 0.2,
+
+    /** Minimum number of items we grow */
+    expandMinUnits : 16,
+
+    elems : null,
+
+    /** List of discarded element indexes in our this.elems pool */
+    freeElems : null,
+
+    allocator: null,
+    resetor: null,
+
+    /**
+     * Generic object pool for Javascript.
+     *
+     * @param {Function} allocator return new empty elements
+     *
+     * @param {Function} resetor resetor(obj, index) is called on all new elements when they are (re)allocated from pool.
+     *                   This is mostly useful for making object to track its own pool index.
+     */
+    init : function(params) {
+        var allocator = params[0];
+        var resetor = params[1];
+        // Start with one element
+        this.allocator = allocator;
+        this.resetor = resetor;
+        // Set initial state of 1 object
+        this.elems = [this.allocator()];
+        this.freeElems = [0];
+    },
+
+    dispose: function () {
+        this.elems = null;
+        this.freeElems = null;
+        this.allocator = null;
+        this.resetor = null;
+    },
+
+    /**
+     * @return {[type]} [description]
+     */
+    create : function() {
+
+        if(!this.freeElems.length) {
+            this.expand();
+        }
+
+        // See if we have any allocated elements to reuse
+        var index = this.freeElems.pop();
+        var elem = this.elems[index];
+        this.resetor(elem, index);
+        return elem;
+
+    },
+
+    /**
+     * How many allocated units we have
+     *
+     * @type {Number}
+     */
+    length : function() {
+        return this.elems.length - this.freeElems.length;
+    },
+
+    /**
+     * Make pool bigger by the default growth parameters.
+     *
+     */
+    expand : function() {
+
+        var oldSize = this.elems.length;
+
+        var growth = Math.ceil(this.elems.length * this.expandFactor);
+
+        if(growth < this.expandMinUnits) {
+            growth = this.expandMinUnits;
+        }
+
+        this.elems.length = this.elems.length + growth;
+
+        for(var i=oldSize; i<this.elems.length; i++) {
+            this.elems[i] = this.allocator();
+            this.freeElems.push(i);
+        }
+    },
+
+    /**
+     * Deallocate object at index n
+     *
+     * @param  {Number} n
+     * @return {Object} discarded object
+     */
+    discard : function(n) {
+
+        // Cannot double deallocate
+        if(this.freeElems.indexOf(n) >= 0) {
+            throw "GeneircObjectPool: Double-free for element index: "+n;
+        }
+
+        if(this.elems[n].keepAlive) {
+            return false;
+        }
+
+        this.freeElems.push(n);
+        return true;
+    },
+
+    /**
+     * Return object at pool index n
+     */
+    get : function(n) {
+        return this.elems[n];
+    }
+});

package/public/spice-console/lib/GlobalPool.js

@@ -1,114 +1,114 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-wdi.GlobalPool = {
-    pools: {},
-    retained: null,
-    init: function() {
-        this.retained = {};
-        var self = this;
-        this.pools['ViewQueue'] = new wdi.GenericObjectPool([function() {
-            //factory
-            return new wdi.ViewQueue();
-        }, function(obj, index) {
-            //reset
-            obj.poolIndex = index; //update index at pool
-            obj.setData([]); //reset the object
-        }]);
-
-        this.pools['RawSpiceMessage'] = new wdi.GenericObjectPool([function() {
-            //factory
-            return new wdi.RawSpiceMessage();
-        }, function(obj, index) {
-            //reset
-            obj.poolIndex = index; //update index at pool
-            obj.set(null, null, null); //reset the object
-        }]);
-
-		this.retained['Image'] = [];
-        this.pools['Image'] = new wdi.GenericObjectPool([function() {
-            //factory
-            return new Image();
-        }, function(obj, index) {
-            //reset
-            obj.poolIndex = index;
-            obj.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==';//Blank image 1x1 pixel (avoids console error GET null image)
-            obj.onload = null;
-			obj.keepAlive = false;
-			self.retained['Image'][index] = obj;
-        }]);
-
-
-        this.retained['Canvas'] = [];
-        this.pools['Canvas'] = new wdi.GenericObjectPool([function() {
-            //factory
-            return self.createCanvas();
-        }, function(obj, index) {
-            //reset
-            obj.keepAlive = false;
-            //obj.getContext('2d').clearRect(0, 0, obj.width, obj.height);
-            obj.poolIndex = index;
-            self.retained['Canvas'][index] = obj;
-        }]);
-    },
-
-    dispose: function () {
-        var self = this;
-        Object.keys(this.retained).forEach(function (key) {
-            self.cleanPool(key);
-            self.retained[key].length = 0;
-        });
-        Object.keys(this.pools).forEach(function (key) {
-            self.pools[key].dispose();
-        });
-        this.pools = {};
-        this.retained = null;
-    },
-
-    createCanvas: function() {
-    	return $('<canvas/>')[0];
-    },
-
-    create: function(objectType) {
-        return this.pools[objectType].create();
-    },
-
-    discard: function(objectType, obj) {
-        //check if its an autorelease pool
-        if(this.retained.hasOwnProperty(objectType)) {
-            delete this.retained[objectType][obj.poolIndex];
-        }
-        return this.pools[objectType].discard(obj.poolIndex);
-    },
-
-    cleanPool: function(objectType) {
-
-        if(this.retained.hasOwnProperty(objectType)) {
-             var pool = this.pools[objectType];
-
-             for(var i in this.retained[objectType]) {
-                 if(pool.discard(this.retained[objectType][i].poolIndex)) {
-                     delete this.retained[objectType][i];
-                 }
-             }
-        } else {
-            wdi.Debug.error("GlobalPool: cleanPool called with invalid objectType: ",objectType);
-        }
-    }
-};
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+wdi.GlobalPool = {
+    pools: {},
+    retained: null,
+    init: function() {
+        this.retained = {};
+        var self = this;
+        this.pools['ViewQueue'] = new wdi.GenericObjectPool([function() {
+            //factory
+            return new wdi.ViewQueue();
+        }, function(obj, index) {
+            //reset
+            obj.poolIndex = index; //update index at pool
+            obj.setData([]); //reset the object
+        }]);
+
+        this.pools['RawSpiceMessage'] = new wdi.GenericObjectPool([function() {
+            //factory
+            return new wdi.RawSpiceMessage();
+        }, function(obj, index) {
+            //reset
+            obj.poolIndex = index; //update index at pool
+            obj.set(null, null, null); //reset the object
+        }]);
+
+		this.retained['Image'] = [];
+        this.pools['Image'] = new wdi.GenericObjectPool([function() {
+            //factory
+            return new Image();
+        }, function(obj, index) {
+            //reset
+            obj.poolIndex = index;
+            obj.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==';//Blank image 1x1 pixel (avoids console error GET null image)
+            obj.onload = null;
+			obj.keepAlive = false;
+			self.retained['Image'][index] = obj;
+        }]);
+
+
+        this.retained['Canvas'] = [];
+        this.pools['Canvas'] = new wdi.GenericObjectPool([function() {
+            //factory
+            return self.createCanvas();
+        }, function(obj, index) {
+            //reset
+            obj.keepAlive = false;
+            //obj.getContext('2d').clearRect(0, 0, obj.width, obj.height);
+            obj.poolIndex = index;
+            self.retained['Canvas'][index] = obj;
+        }]);
+    },
+
+    dispose: function () {
+        var self = this;
+        Object.keys(this.retained).forEach(function (key) {
+            self.cleanPool(key);
+            self.retained[key].length = 0;
+        });
+        Object.keys(this.pools).forEach(function (key) {
+            self.pools[key].dispose();
+        });
+        this.pools = {};
+        this.retained = null;
+    },
+
+    createCanvas: function() {
+    	return $('<canvas/>')[0];
+    },
+
+    create: function(objectType) {
+        return this.pools[objectType].create();
+    },
+
+    discard: function(objectType, obj) {
+        //check if its an autorelease pool
+        if(this.retained.hasOwnProperty(objectType)) {
+            delete this.retained[objectType][obj.poolIndex];
+        }
+        return this.pools[objectType].discard(obj.poolIndex);
+    },
+
+    cleanPool: function(objectType) {
+
+        if(this.retained.hasOwnProperty(objectType)) {
+             var pool = this.pools[objectType];
+
+             for(var i in this.retained[objectType]) {
+                 if(pool.discard(this.retained[objectType][i].poolIndex)) {
+                     delete this.retained[objectType][i];
+                 }
+             }
+        } else {
+            wdi.Debug.error("GlobalPool: cleanPool called with invalid objectType: ",objectType);
+        }
+    }
+};