Tidyng and optimising the timer class a bit
This commit is contained in:
underscorediscovery
373
haxe/Timer.hx
373
haxe/Timer.hx
@@ -1,243 +1,188 @@
|
||||
package haxe;
|
||||
#if (macro || (!neko && !cpp))
|
||||
|
||||
#if lime_native
|
||||
|
||||
// Original haxe.Timer class
|
||||
|
||||
class Timer {
|
||||
#if (neko || php || cpp)
|
||||
#else
|
||||
|
||||
private var id : Null<Int>;
|
||||
|
||||
/**
|
||||
Create a new timer that will run every [time_ms] (in milliseconds).
|
||||
**/
|
||||
public function new( time_ms : Int ){
|
||||
#if flash9
|
||||
var me = this;
|
||||
id = untyped __global__["flash.utils.setInterval"](function() { me.run(); },time_ms);
|
||||
#elseif flash
|
||||
var me = this;
|
||||
id = untyped _global["setInterval"](function() { me.run(); },time_ms);
|
||||
#elseif js
|
||||
var me = this;
|
||||
id = untyped window.setInterval(function() me.run(),time_ms);
|
||||
#end
|
||||
}
|
||||
|
||||
/**
|
||||
Stop the timer definitely.
|
||||
**/
|
||||
public function stop() {
|
||||
if( id == null )
|
||||
return;
|
||||
#if flash9
|
||||
untyped __global__["flash.utils.clearInterval"](id);
|
||||
#elseif flash
|
||||
untyped _global["clearInterval"](id);
|
||||
#elseif js
|
||||
untyped window.clearInterval(id);
|
||||
#end
|
||||
id = null;
|
||||
}
|
||||
|
||||
/**
|
||||
This is the [run()] method that is called when the Timer executes. It can be either overriden in subclasses or directly rebinded with another function-value.
|
||||
**/
|
||||
public dynamic function run() {
|
||||
}
|
||||
|
||||
/**
|
||||
This will delay the call to [f] for the given time. [f] will only be called once.
|
||||
**/
|
||||
public static function delay( f : Void -> Void, time_ms : Int ) {
|
||||
var t = new haxe.Timer(time_ms);
|
||||
t.run = function() {
|
||||
t.stop();
|
||||
f();
|
||||
};
|
||||
return t;
|
||||
}
|
||||
|
||||
#end
|
||||
|
||||
/**
|
||||
Measure the time it takes to execute the function [f] and trace it. Returns the value returned by [f].
|
||||
**/
|
||||
public static function measure<T>( f : Void -> T, ?pos : PosInfos ) : T {
|
||||
var t0 = stamp();
|
||||
var r = f();
|
||||
Log.trace((stamp() - t0) + "s", pos);
|
||||
return r;
|
||||
}
|
||||
|
||||
/**
|
||||
Returns the most precise timestamp, in seconds. The value itself might differ depending on platforms, only differences between two values make sense.
|
||||
**/
|
||||
public static function stamp() : Float {
|
||||
#if flash
|
||||
return flash.Lib.getTimer() / 1000;
|
||||
#elseif (neko || php)
|
||||
return Sys.time();
|
||||
#elseif js
|
||||
return Date.now().getTime() / 1000;
|
||||
#elseif cpp
|
||||
return untyped __global__.__time_stamp();
|
||||
#else
|
||||
return 0;
|
||||
#end
|
||||
}
|
||||
|
||||
}
|
||||
#else
|
||||
|
||||
|
||||
|
||||
|
||||
// Custom haxe.Timer implementation for C++ and Neko
|
||||
|
||||
typedef TimerList = Array <Timer>;
|
||||
|
||||
|
||||
class Timer {
|
||||
|
||||
|
||||
static var sRunningTimers:TimerList = [];
|
||||
|
||||
var mTime:Float;
|
||||
var mFireAt:Float;
|
||||
var mRunning:Bool;
|
||||
|
||||
|
||||
public function new (time:Float) {
|
||||
class Timer {
|
||||
|
||||
mTime = time;
|
||||
sRunningTimers.push (this);
|
||||
mFireAt = GetMS () + mTime;
|
||||
mRunning = true;
|
||||
static var sRunningTimers:Array<Timer> = [];
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static function measure<T>( f : Void -> T, ?pos : PosInfos ) : T {
|
||||
var t0 = stamp();
|
||||
var r = f();
|
||||
Log.trace((stamp() - t0) + "s", pos);
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
// Set this with "run=..."
|
||||
dynamic public function run () {
|
||||
@:noCompletion public var time:Float;
|
||||
@:noCompletion public var fire_at:Float;
|
||||
@:noCompletion public var running:Bool;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function stop ():Void {
|
||||
|
||||
if (mRunning) {
|
||||
public function new(_time:Float) {
|
||||
|
||||
mRunning = false;
|
||||
sRunningTimers.remove (this);
|
||||
time = _time;
|
||||
sRunningTimers.push (this);
|
||||
fire_at = GetMS () + time;
|
||||
running = true;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
@:noCompletion static public function __nextWake (limit:Float):Float {
|
||||
public static function measure<T>( f : Void -> T, ?pos : PosInfos ) : T {
|
||||
var t0 = stamp();
|
||||
var r = f();
|
||||
Log.trace((stamp() - t0) + "s", pos);
|
||||
return r;
|
||||
}
|
||||
|
||||
var now = nme_time_stamp () * 1000.0;
|
||||
var sleep;
|
||||
// Set this with "run=..."
|
||||
dynamic public function run () { }
|
||||
|
||||
for (timer in sRunningTimers) {
|
||||
public function stop ():Void {
|
||||
|
||||
sleep = timer.mFireAt - now;
|
||||
|
||||
if (sleep < limit) {
|
||||
|
||||
limit = sleep;
|
||||
|
||||
if (limit < 0) {
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
if (running) {
|
||||
running = false;
|
||||
sRunningTimers.remove (this);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return limit * 0.001;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@:noCompletion function __check (inTime:Float) {
|
||||
|
||||
if (inTime >= mFireAt) {
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
@:noCompletion static public function __nextWake( limit:Float ):Float {
|
||||
|
||||
mFireAt += mTime;
|
||||
run ();
|
||||
var now = nme_time_stamp () * 1000.0;
|
||||
var sleep;
|
||||
|
||||
for (timer in sRunningTimers) {
|
||||
|
||||
sleep = timer.fire_at - now;
|
||||
|
||||
if (sleep < limit) {
|
||||
limit = sleep;
|
||||
if (limit < 0) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
} //for each timer
|
||||
|
||||
return limit * 0.001;
|
||||
|
||||
} //__nextWake
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
@:noCompletion public static function __checkTimers () {
|
||||
|
||||
var now = GetMS ();
|
||||
|
||||
for (timer in sRunningTimers) {
|
||||
if(timer.running) {
|
||||
if(now >= timer.fire_at) {
|
||||
timer.fire_at += timer.time;
|
||||
timer.run();
|
||||
} //now
|
||||
}
|
||||
} //all timers
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
@:noCompletion public static function __checkTimers () {
|
||||
|
||||
var now = GetMS ();
|
||||
|
||||
for (timer in sRunningTimers) {
|
||||
|
||||
timer.__check (now);
|
||||
|
||||
static function GetMS ():Float {
|
||||
return stamp () * 1000.0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
static function GetMS ():Float {
|
||||
|
||||
return stamp () * 1000.0;
|
||||
|
||||
}
|
||||
|
||||
|
||||
// From std/haxe/Timer.hx
|
||||
public static function delay (f:Void -> Void, time:Int) {
|
||||
// From std/haxe/Timer.hx
|
||||
public static function delay( _f:Void -> Void, _time:Int ) {
|
||||
|
||||
var t = new Timer (_time);
|
||||
t.run = function() {
|
||||
t.stop();
|
||||
_f();
|
||||
};
|
||||
|
||||
return t;
|
||||
|
||||
} //delay
|
||||
|
||||
var t = new Timer (time);
|
||||
|
||||
t.run = function () {
|
||||
t.stop ();
|
||||
f ();
|
||||
};
|
||||
|
||||
return t;
|
||||
|
||||
}
|
||||
|
||||
|
||||
static public function stamp ():Float {
|
||||
|
||||
return nme_time_stamp ();
|
||||
|
||||
}
|
||||
|
||||
static public function stamp ():Float {
|
||||
return nme_time_stamp ();
|
||||
}
|
||||
|
||||
static var nme_time_stamp = lime.utils.Libs.load ("nme","nme_time_stamp", 0);
|
||||
|
||||
|
||||
}
|
||||
#end
|
||||
static var nme_time_stamp = lime.utils.Libs.load ("nme","nme_time_stamp", 0);
|
||||
|
||||
} //Timer
|
||||
|
||||
#else //lime_native
|
||||
|
||||
class Timer {
|
||||
|
||||
private var id : Null<Int>;
|
||||
|
||||
// Create a new timer that will run every [time_ms] (in milliseconds).
|
||||
public function new( time_ms : Int ){
|
||||
#if flash9
|
||||
var me = this;
|
||||
id = untyped __global__["flash.utils.setInterval"](function() { me.run(); },time_ms);
|
||||
#elseif flash
|
||||
var me = this;
|
||||
id = untyped _global["setInterval"](function() { me.run(); },time_ms);
|
||||
#elseif js
|
||||
var me = this;
|
||||
id = untyped window.setInterval(function() me.run(),time_ms);
|
||||
#end
|
||||
}
|
||||
|
||||
// Stop the timer definitely.
|
||||
public function stop() {
|
||||
if( id == null )
|
||||
return;
|
||||
#if flash9
|
||||
untyped __global__["flash.utils.clearInterval"](id);
|
||||
#elseif flash
|
||||
untyped _global["clearInterval"](id);
|
||||
#elseif js
|
||||
untyped window.clearInterval(id);
|
||||
#end
|
||||
id = null;
|
||||
}
|
||||
|
||||
// This is the [run()] method that is called when the Timer executes. It can be either overriden in subclasses or directly rebinded with another function-value.
|
||||
public dynamic function run() {
|
||||
}
|
||||
|
||||
|
||||
// This will delay the call to [f] for the given time. [f] will only be called once.
|
||||
public static function delay( f : Void -> Void, time_ms : Int ) {
|
||||
var t = new haxe.Timer(time_ms);
|
||||
t.run = function() {
|
||||
t.stop();
|
||||
f();
|
||||
};
|
||||
return t;
|
||||
}
|
||||
|
||||
|
||||
//Measure the time it takes to execute the function [f] and trace it. Returns the value returned by [f].
|
||||
public static function measure<T>( f : Void -> T, ?pos : PosInfos ) : T {
|
||||
var t0 = stamp();
|
||||
var r = f();
|
||||
Log.trace((stamp() - t0) + "s", pos);
|
||||
return r;
|
||||
}
|
||||
|
||||
// Returns the most precise timestamp, in seconds. The value itself might differ depending on platforms, only differences between two values make sense.
|
||||
public static function stamp() : Float {
|
||||
#if flash
|
||||
return flash.Lib.getTimer() / 1000;
|
||||
#elseif (neko || php)
|
||||
return Sys.time();
|
||||
#elseif js
|
||||
return Date.now().getTime() / 1000;
|
||||
#elseif cpp
|
||||
return untyped __global__.__time_stamp();
|
||||
#else
|
||||
return 0;
|
||||
#end
|
||||
} //stamp
|
||||
|
||||
} //Timer
|
||||
|
||||
#end //!native
|
||||
|
||||
Reference in New Issue
Block a user