test/call-load-test.js test/envjs-prototype.js test/rhino-call-load-test.js test/rhino-prototype.js @@ -94,4 +94,4 @@ load("build/runtest/env.js"); })(Envjs); -Envjs.wait(0); \ No newline at end of file +Envjs.wait(); \ No newline at end of file bin/jquery-1.3.2-test.js @@ -172,18 +172,26 @@ <arg value="test/test-with-envs-jar.js"/> <jvmarg value="-Dfile.encoding=utf-8"/> </java> + <java fork="true" jar="${DIST_DIR}/env-js.jar" failonerror="true"> + <arg value="test/envjs-call-load-test.js"/> + <jvmarg value="-Dfile.encoding=utf-8"/> + </java> + <java fork="true" jar="${DIST_DIR}/env-js.jar" failonerror="true"> + <arg value="test/envjs-prototype.js"/> + <jvmarg value="-Dfile.encoding=utf-8"/> + </java> <java fork="true" jar="${RHINO_JAR}" failonerror="true"> <arg value="test/test-with-rhino-jar.js"/> <jvmarg value="-Dfile.encoding=utf-8"/> </java> <java fork="true" jar="${RHINO_JAR}" failonerror="true"> - <arg value="test/envjs-call-load-test.js"/> + <arg value="test/rhino-call-load-test.js"/> <jvmarg value="-Dfile.encoding=utf-8"/> </java> <java fork="true" jar="${RHINO_JAR}" failonerror="true"> - <arg value="test/prototype.js"/> + <arg value="test/rhino-prototype.js"/> <jvmarg value="-Dfile.encoding=utf-8"/> </java> </target> - </project> +</project> build.xml dist/env-js.jar @@ -8275,7 +8275,7 @@ $w.__defineGetter__("location", function(url){ this.search + this.hash; }, get protocol(){ - return protocol.exec(this.href)[0]; + return this.href && protocol.exec(this.href)[0]; }, set protocol(_protocol){ $w.location = _protocol + this.host + this.pathname + @@ -8411,49 +8411,177 @@ $w.__defineGetter__("navigator", function(){ /* * timer.js */ - $debug("Initializing Window Timer."); //private -var $timers = []; +var $timers = $env.timers = $env.timers || []; +var $event_loop_running = false; +$timers.lock = $env.sync(function(fn){fn();}); + +var $timer = function(fn, interval){ + this.fn = fn; + this.interval = interval; + this.at = Date.now() + interval; + this.running = false; // allows for calling wait() from callbacks +}; + +$timer.prototype.start = function(){}; +$timer.prototype.stop = function(){}; + +var convert_time = function(time) { + time = time*1; + if ( isNaN(time) || time < 0 ) { + time = 0; + } + if ( $event_loop_running && time < 4 ) { + time = 4; + } + return time; +} window.setTimeout = function(fn, time){ var num; - return num = window.setInterval(function(){ - fn(); - window.clearInterval(num); - }, time); + time = convert_time(time); + $timers.lock(function(){ + num = $timers.length+1; + var tfn; + if (typeof fn == 'string') { + tfn = function() { + try { + eval(fn); + } catch (e) { + $env.error(e); + } finally { + window.clearInterval(num); + } + }; + } else { + tfn = function() { + try { + fn(); + } catch (e) { + $env.error(e); + } finally { + window.clearInterval(num); + } + }; + } + $debug("Creating timer number "+num); + $timers[num] = new $timer(tfn, time); + $timers[num].start(); + }); + return num; }; window.setInterval = function(fn, time){ - var num = $timers.length; - - if (typeof fn == 'string') { - var fnstr = fn; - fn = function() { - eval(fnstr); - }; - } - if(time===0){ - fn(); - }else{ - //$debug("Creating timer number "+num); - $timers[num] = new $env.timer(fn, time); - $timers[num].start(); - } - return num; + time = convert_time(time); + if ( time < 10 ) { + time = 10; + } + if (typeof fn == 'string') { + var fnstr = fn; + fn = function() { + eval(fnstr); + }; + } + var num; + $timers.lock(function(){ + num = $timers.length+1; + //$debug("Creating timer number "+num); + $timers[num] = new $timer(fn, time); + $timers[num].start(); + }); + return num; }; window.clearInterval = window.clearTimeout = function(num){ - //$log("clearing interval "+num); - if ( $timers[num] ) { - - $timers[num].stop(); - delete $timers[num]; - } + //$log("clearing interval "+num); + $timers.lock(function(){ + if ( $timers[num] ) { + $timers[num].stop(); + delete $timers[num]; + } + }); }; - /* + +// wait === null/undefined: execute any timers as they fire, waiting until there are none left +// wait(n) (n > 0): execute any timers as they fire until there are none left waiting at least n ms +// but no more, even if there are future events/current threads +// wait(0): execute any immediately runnable timers and return + +// FIX: make a priority queue ... + +window.$wait = $env.wait = $env.wait || function(wait) { + var start = Date.now(); + var old_loop_running = $event_loop_running; + $event_loop_running = true; + if (wait !== 0 && wait !== null && wait !== undefined){ + wait += Date.now(); + } + for (;;) { + var earliest; + $timers.lock(function(){ + earliest = undefined; + for(var i in $timers){ + if( isNaN(i*0) ) { + continue; + } + var timer = $timers[i]; + if( !timer.running && ( !earliest || timer.at < earliest.at) ) { + earliest = timer; + } + } + }); + var sleep = earliest && earliest.at - Date.now(); + if ( earliest && sleep <= 0 ) { + var f = earliest.fn; + try { + earliest.running = true; + f(); + } catch (e) { + $env.error(e); + } finally { + earliest.running = false; + } + var goal = earliest.at + earliest.interval; + var now = Date.now(); + if ( goal < now ) { + earliest.at = now; + } else { + earliest.at = goal; + } + continue; + } + + // bunch of subtle cases here ... + if ( !earliest ) { + // no events in the queue (but maybe XHR will bring in events, so ... + if ( !wait || wait < Date.now() ) { + // Loop ends if there are no events and a wait hasn't been requested or has expired + break; + } + // no events, but a wait requested: fall through to sleep + } else { + // there are events in the queue, but they aren't firable now + if ( wait === 0 || ( wait > 0 && wait < Date.now () ) ) { + // loop ends even if there are events but the user specifcally asked not to wait too long + break; + } + // there are events and the user wants to wait: fall through to sleep + } + + // Releated to ajax threads ... hopefully can go away .. + var interval = $wait.interval || 100; + if ( !sleep || sleep > interval ) { + sleep = interval; + } + java.lang.Thread.currentThread().sleep(sleep); + } + $event_loop_running = old_loop_running; +}; + +/* * event.js */ // Window Events dist/env.js @@ -99,11 +99,12 @@ var Envjs = function(){ //resolves location relative to base or window location $env.location = function(path, base){}; - - //For Java the window.timer is created using the java.lang.Thread in combination - //with the java.lang.Runnable - $env.timer = function(fn, time){}; - + + $env.sync = function(fn){ + var self = this; + return function(){ return fn.apply(self,arguments); } + } + $env.javaEnabled = false; //Used in the XMLHttpRquest implementation to run a @@ -307,6 +308,8 @@ var Envjs = function(){ return e&&e.rhinoException?e.rhinoException.lineSource():"(line ?)"; }; + $env.sync = sync; + //For Java the window.location object is a java.net.URL $env.location = function(path, base){ var protocol = new RegExp('(^file\:|^http\:|^https\:)'); @@ -317,8 +320,8 @@ var Envjs = function(){ return new java.net.URL(new java.net.URL(base), path).toString()+''; }else{ //return an absolute url from a url relative to the window location - if(window.location.href.length > 0){ base = window.location.href.substring(0, window.location.href.lastIndexOf('/')); + if(window.location.href.length > 0){ return base + '/' + path; }else{ return new java.io.File( path ).toURL().toString()+''; @@ -326,41 +329,6 @@ var Envjs = function(){ } }; - var timers = []; - - //For Java the window.timer is created using the java.lang.Thread in combination - //with the java.lang.Runnable - $env.timer = function(fn, time){ - var running = true; - - var run = sync(function(){ //while happening only thing in this timer - //$env.debug("running timed function"); - fn(); - }); - var _this = this; - var thread = new java.lang.Thread(new java.lang.Runnable({ - run: function(){ - try { - while (running){ - java.lang.Thread.currentThread().sleep(time); - run.apply(_this); - } - }catch(e){ - $env.debug("interuption running timed function"); - _this.stop(); - $env.onInterrupt(); - }; - } - })); - this.start = function(){ - thread.start(); - }; - this.stop = sync(function(num){ - running = false; - thread.interrupt(); - }) - }; - //Since we're running in rhino I guess we can safely assume //java is 'enabled'. I'm sure this requires more thought //than I've given it here @@ -379,15 +347,10 @@ var Envjs = function(){ fn(); }); - var async = (new java.lang.Thread(new java.lang.Runnable({ - run: run - }))); - try{ - async.start(); + spawn(run); }catch(e){ $env.error("error while running async", e); - async.interrupt(); $env.onInterrupt(); } }; @@ -8932,7 +8895,7 @@ $w.__defineGetter__("location", function(url){ this.search + this.hash; }, get protocol(){ - return protocol.exec(this.href)[0]; + return this.href && protocol.exec(this.href)[0]; }, set protocol(_protocol){ $w.location = _protocol + this.host + this.pathname + @@ -9068,49 +9031,177 @@ $w.__defineGetter__("navigator", function(){ /* * timer.js */ - $debug("Initializing Window Timer."); //private -var $timers = []; +var $timers = $env.timers = $env.timers || []; +var $event_loop_running = false; +$timers.lock = $env.sync(function(fn){fn();}); + +var $timer = function(fn, interval){ + this.fn = fn; + this.interval = interval; + this.at = Date.now() + interval; + this.running = false; // allows for calling wait() from callbacks +}; + +$timer.prototype.start = function(){}; +$timer.prototype.stop = function(){}; + +var convert_time = function(time) { + time = time*1; + if ( isNaN(time) || time < 0 ) { + time = 0; + } + if ( $event_loop_running && time < 4 ) { + time = 4; + } + return time; +} window.setTimeout = function(fn, time){ var num; - return num = window.setInterval(function(){ - fn(); - window.clearInterval(num); - }, time); + time = convert_time(time); + $timers.lock(function(){ + num = $timers.length+1; + var tfn; + if (typeof fn == 'string') { + tfn = function() { + try { + eval(fn); + } catch (e) { + $env.error(e); + } finally { + window.clearInterval(num); + } + }; + } else { + tfn = function() { + try { + fn(); + } catch (e) { + $env.error(e); + } finally { + window.clearInterval(num); + } + }; + } + $debug("Creating timer number "+num); + $timers[num] = new $timer(tfn, time); + $timers[num].start(); + }); + return num; }; window.setInterval = function(fn, time){ - var num = $timers.length; - - if (typeof fn == 'string') { - var fnstr = fn; - fn = function() { - eval(fnstr); - }; - } - if(time===0){ - fn(); - }else{ - //$debug("Creating timer number "+num); - $timers[num] = new $env.timer(fn, time); - $timers[num].start(); - } - return num; + time = convert_time(time); + if ( time < 10 ) { + time = 10; + } + if (typeof fn == 'string') { + var fnstr = fn; + fn = function() { + eval(fnstr); + }; + } + var num; + $timers.lock(function(){ + num = $timers.length+1; + //$debug("Creating timer number "+num); + $timers[num] = new $timer(fn, time); + $timers[num].start(); + }); + return num; }; window.clearInterval = window.clearTimeout = function(num){ - //$log("clearing interval "+num); - if ( $timers[num] ) { - - $timers[num].stop(); - delete $timers[num]; - } + //$log("clearing interval "+num); + $timers.lock(function(){ + if ( $timers[num] ) { + $timers[num].stop(); + delete $timers[num]; + } + }); }; - /* + +// wait === null/undefined: execute any timers as they fire, waiting until there are none left +// wait(n) (n > 0): execute any timers as they fire until there are none left waiting at least n ms +// but no more, even if there are future events/current threads +// wait(0): execute any immediately runnable timers and return + +// FIX: make a priority queue ... + +window.$wait = $env.wait = $env.wait || function(wait) { + var start = Date.now(); + var old_loop_running = $event_loop_running; + $event_loop_running = true; + if (wait !== 0 && wait !== null && wait !== undefined){ + wait += Date.now(); + } + for (;;) { + var earliest; + $timers.lock(function(){ + earliest = undefined; + for(var i in $timers){ + if( isNaN(i*0) ) { + continue; + } + var timer = $timers[i]; + if( !timer.running && ( !earliest || timer.at < earliest.at) ) { + earliest = timer; + } + } + }); + var sleep = earliest && earliest.at - Date.now(); + if ( earliest && sleep <= 0 ) { + var f = earliest.fn; + try { + earliest.running = true; + f(); + } catch (e) { + $env.error(e); + } finally { + earliest.running = false; + } + var goal = earliest.at + earliest.interval; + var now = Date.now(); + if ( goal < now ) { + earliest.at = now; + } else { + earliest.at = goal; + } + continue; + } + + // bunch of subtle cases here ... + if ( !earliest ) { + // no events in the queue (but maybe XHR will bring in events, so ... + if ( !wait || wait < Date.now() ) { + // Loop ends if there are no events and a wait hasn't been requested or has expired + break; + } + // no events, but a wait requested: fall through to sleep + } else { + // there are events in the queue, but they aren't firable now + if ( wait === 0 || ( wait > 0 && wait < Date.now () ) ) { + // loop ends even if there are events but the user specifcally asked not to wait too long + break; + } + // there are events and the user wants to wait: fall through to sleep + } + + // Releated to ajax threads ... hopefully can go away .. + var interval = $wait.interval || 100; + if ( !sleep || sleep > interval ) { + sleep = interval; + } + java.lang.Thread.currentThread().sleep(sleep); + } + $event_loop_running = old_loop_running; +}; + +/* * event.js */ // Window Events dist/env.rhino.js @@ -6,37 +6,56 @@ $debug("Initializing Window Timer."); //private var $timers = $env.timers = $env.timers || []; -var $lock_timers = function(fn){ - $env.sync.call($timers,fn)(); -}; +var $event_loop_running = false; +$timers.lock = $env.sync(function(fn){fn();}); var $timer = function(fn, interval){ - if ( (typeof interval) != "number" ) { - throw "bad argument to timer"; - } this.fn = fn; this.interval = interval; this.at = Date.now() + interval; + this.running = false; // allows for calling wait() from callbacks }; $timer.prototype.start = function(){}; $timer.prototype.stop = function(){}; +var convert_time = function(time) { + time = time*1; + if ( isNaN(time) || time < 0 ) { + time = 0; + } + if ( $event_loop_running && time < 4 ) { + time = 4; + } + return time; +} + window.setTimeout = function(fn, time){ var num; - $lock_timers(function(){ + time = convert_time(time); + $timers.lock(function(){ num = $timers.length+1; var tfn; if (typeof fn == 'string') { tfn = function() { - eval(fn); - window.clearInterval(num); + try { + eval(fn); + } catch (e) { + $env.error(e); + } finally { + window.clearInterval(num); + } }; } else { tfn = function() { - fn(); - window.clearInterval(num); - } + try { + fn(); + } catch (e) { + $env.error(e); + } finally { + window.clearInterval(num); + } + }; } $debug("Creating timer number "+num); $timers[num] = new $timer(tfn, time); @@ -46,14 +65,18 @@ window.setTimeout = function(fn, time){ }; window.setInterval = function(fn, time){ + time = convert_time(time); + if ( time < 10 ) { + time = 10; + } if (typeof fn == 'string') { var fnstr = fn; fn = function() { - eval(fnstr); + eval(fnstr); }; } var num; - $lock_timers(function(){ + $timers.lock(function(){ num = $timers.length+1; //$debug("Creating timer number "+num); $timers[num] = new $timer(fn, time); @@ -64,7 +87,7 @@ window.setInterval = function(fn, time){ window.clearInterval = window.clearTimeout = function(num){ //$log("clearing interval "+num); - $lock_timers(function(){ + $timers.lock(function(){ if ( $timers[num] ) { $timers[num].stop(); delete $timers[num]; @@ -72,26 +95,30 @@ window.clearInterval = window.clearTimeout = function(num){ }); }; -// wait === null: execute any immediately runnable timers and return -// wait(n) (n > 0): execute any timers as they fire but no longer than n ms -// wait(0): execute any timers as they fire, waiting until there are none left +// wait === null/undefined: execute any timers as they fire, waiting until there are none left +// wait(n) (n > 0): execute any timers as they fire until there are none left waiting at least n ms +// but no more, even if there are future events/current threads +// wait(0): execute any immediately runnable timers and return // FIX: make a priority queue ... window.$wait = $env.wait = $env.wait || function(wait) { + var start = Date.now(); + var old_loop_running = $event_loop_running; + $event_loop_running = true; if (wait !== 0 && wait !== null && wait !== undefined){ wait += Date.now(); } for (;;) { var earliest; - $lock_timers(function(){ + $timers.lock(function(){ earliest = undefined; for(var i in $timers){ - if( !$timers.hasOwnProperty(i) ) { + if( isNaN(i*0) ) { continue; } var timer = $timers[i]; - if(!earliest || timer.at < earliest.at) { + if( !timer.running && ( !earliest || timer.at < earliest.at) ) { earliest = timer; } } @@ -99,15 +126,48 @@ window.$wait = $env.wait = $env.wait || function(wait) { var sleep = earliest && earliest.at - Date.now(); if ( earliest && sleep <= 0 ) { var f = earliest.fn; - f(); - earliest.at = Date.now() + earliest.interval; + try { + earliest.running = true; + f(); + } catch (e) { + $env.error(e); + } finally { + earliest.running = false; + } + var goal = earliest.at + earliest.interval; + var now = Date.now(); + if ( goal < now ) { + earliest.at = now; + } else { + earliest.at = goal; + } continue; } - if ( !earliest || ( wait !== 0 ) && ( !wait || ( Date.now() + sleep > wait ) ) ) { - break; + + // bunch of subtle cases here ... + if ( !earliest ) { + // no events in the queue (but maybe XHR will bring in events, so ... + if ( !wait || wait < Date.now() ) { + // Loop ends if there are no events and a wait hasn't been requested or has expired + break; + } + // no events, but a wait requested: fall through to sleep + } else { + // there are events in the queue, but they aren't firable now + if ( wait === 0 || ( wait > 0 && wait < Date.now () ) ) { + // loop ends even if there are events but the user specifcally asked not to wait too long + break; + } + // there are events and the user wants to wait: fall through to sleep } - if (sleep) { - java.lang.Thread.currentThread().sleep(sleep); + + // Releated to ajax threads ... hopefully can go away .. + var interval = $wait.interval || 100; + if ( !sleep || sleep > interval ) { + sleep = interval; } + java.lang.Thread.currentThread().sleep(sleep); } + $event_loop_running = old_loop_running; }; + src/window/timer.js @@ -1,17 +1,5 @@ +whichJarFile = "envjs" +multiwindow = true; +whichInterpreter = whichJarFile + " interpreter jar"; load("dist/env.rhino.js"); -load("test/qunit.js"); -Envjs("test/index.html", {}); - -test("'index.html' loaded correctly via 'Envjs()' call", function(){ - expect(1); - try{ ok(document.getElementById('body').id == "body", - "'index.html' page content available"); - }catch(e){print(e);} -}); - -test("window.location= following Envjs() initialization flagged as error", - function(){ - expect(0); -}); - -Envjs.wait(0); \ No newline at end of file +load("test/call-load-test.js"); test/envjs-call-load-test.js @@ -27,4 +27,4 @@ window.addEventListener("load",function(){ window.location = "test/index.html"; -Envjs.wait(0); \ No newline at end of file +Envjs.wait(); \ No newline at end of file test/primaryTests.js @@ -1,7 +1,3 @@ -whichJarFile = "rhino" -whichInterpreter = whichJarFile + " interpreter jar"; -multiwindow = false; -load("dist/env.rhino.js"); load("test/qunit.js"); window.addEventListener("load",function(){ @@ -16,4 +12,4 @@ window.addEventListener("load",function(){ window.location = "test/index.html"; -Envjs.wait(0); \ No newline at end of file +Envjs.wait(); \ No newline at end of file test/prototype.js @@ -46,6 +46,69 @@ test("clearTimeout cancels execution of setTimeout callback", function() { stop(); }); +test("setTimeout callbacks that throw run once", function() { + expect(2); + stop(); + var called = 0; + var id = setTimeout(function(){ + ok( called == 0, "timeout called once" ); + called++; + throw "an expected error"; + }, 10); + setTimeout(function(){ + ok( called == 1, "called timeout once double checked" ); + clearTimeout(id); + start(); + },100); +}); + +test("setInterval callbacks that are delayed execute immediately", function() { + expect(3); + stop(); + var iteration = 0; + var last = Date.now(); + var id = setInterval(function(){ + var now = Date.now(); + var since_last = now - last; + switch(iteration) { + case 0: + ok( since_last > 60 && since_last < 140, "first interval was correct" ); + while( (Date.now() - last ) < 400 ) {} + break; + case 1: + ok( since_last < 40, "second interval was correct" ); + break; + default: + ok( since_last > 60 && since_last < 140, "third interval was correct" ); + clearInterval(id); + start(); + } + last = Date.now(); + iteration++; + }, 100); +}); + +test("wait(n) waits at least n and then continues with nothing in the future", function() { + stop(); + expect(1); + var now = Date.now(); + Envjs.wait(1000); + ok( Date.now() - now > 1000, "wait waited long enough" ); + start(); +}); + +test("wait(n) waits at least n and then continues with stuff in the future", function() { + stop(); + expect(2); + var now = Date.now(); + var t = setTimeout(function(){ + },2000); + Envjs.wait(1000); + ok( Date.now() - now > 1000, "wait waited long enough" ); + ok( Date.now() - now < 2000, "wait didn't wait too long" ); + start(); +}); + // Local Variables: // espresso-indent-level:4 // c-basic-offset:4 test/unit/timer.js 7c283f98d650bcc8dde2ef9f2b1a7380caa0372f 5d1943b240a34e83102ebf0fc90345b9c1dce3fb Steven Parkes smparkes@smparkes.net http://github.com/thatcher/env-js/commit/674673e649a2b1d8218858b340628b7ab588e066 674673e649a2b1d8218858b340628b7ab588e066 2009-10-28T18:34:31-07:00 2009-10-28T18:34:31-07:00 merge timer 238dad6e0243cb276458c0a467943689e8db1dc0 Steven Parkes smparkes@smparkes.net