Merge branch '8.2.0-Dev' into doWork_compatibility
This commit is contained in:
@@ -1,3 +1,172 @@
|
||||
package lime.system;
|
||||
|
||||
typedef BackgroundWorker = ThreadPool;
|
||||
import lime.app.Application;
|
||||
import lime.app.Event;
|
||||
#if sys
|
||||
#if haxe4
|
||||
import sys.thread.Deque;
|
||||
import sys.thread.Thread;
|
||||
#elseif cpp
|
||||
import cpp.vm.Deque;
|
||||
import cpp.vm.Thread;
|
||||
#elseif neko
|
||||
import neko.vm.Deque;
|
||||
import neko.vm.Thread;
|
||||
#end
|
||||
#end
|
||||
#if !lime_debug
|
||||
@:fileXml('tags="haxe,release"')
|
||||
@:noDebug
|
||||
#end
|
||||
@:deprecated("lime.system.BackgroundWorker is being deprecated since Lime 8.2.0, and it is recommended to use the lime.system.ThreadPool class instead.")
|
||||
|
||||
class BackgroundWorker
|
||||
{
|
||||
private static var MESSAGE_COMPLETE = "__COMPLETE__";
|
||||
private static var MESSAGE_ERROR = "__ERROR__";
|
||||
|
||||
public var canceled(default, null):Bool;
|
||||
public var completed(default, null):Bool;
|
||||
public var doWork = new Event<Dynamic->Void>();
|
||||
public var onComplete = new Event<Dynamic->Void>();
|
||||
public var onError = new Event<Dynamic->Void>();
|
||||
public var onProgress = new Event<Dynamic->Void>();
|
||||
|
||||
@:noCompletion private var __runMessage:Dynamic;
|
||||
#if (cpp || neko)
|
||||
@:noCompletion private var __messageQueue:Deque<Dynamic>;
|
||||
@:noCompletion private var __workerThread:Thread;
|
||||
#end
|
||||
|
||||
public function new() {}
|
||||
|
||||
public function cancel():Void
|
||||
{
|
||||
canceled = true;
|
||||
|
||||
#if (cpp || neko)
|
||||
__workerThread = null;
|
||||
#end
|
||||
}
|
||||
|
||||
public function run(message:Dynamic = null):Void
|
||||
{
|
||||
canceled = false;
|
||||
completed = false;
|
||||
__runMessage = message;
|
||||
|
||||
#if (cpp || neko)
|
||||
__messageQueue = new Deque<Dynamic>();
|
||||
__workerThread = Thread.create(__doWork);
|
||||
|
||||
// TODO: Better way to do this
|
||||
|
||||
if (Application.current != null)
|
||||
{
|
||||
Application.current.onUpdate.add(__update);
|
||||
}
|
||||
#else
|
||||
__doWork();
|
||||
#end
|
||||
}
|
||||
|
||||
public function sendComplete(message:Dynamic = null):Void
|
||||
{
|
||||
completed = true;
|
||||
|
||||
#if (cpp || neko)
|
||||
__messageQueue.add(MESSAGE_COMPLETE);
|
||||
__messageQueue.add(message);
|
||||
#else
|
||||
if (!canceled)
|
||||
{
|
||||
canceled = true;
|
||||
onComplete.dispatch(message);
|
||||
}
|
||||
#end
|
||||
}
|
||||
|
||||
public function sendError(message:Dynamic = null):Void
|
||||
{
|
||||
#if (cpp || neko)
|
||||
__messageQueue.add(MESSAGE_ERROR);
|
||||
__messageQueue.add(message);
|
||||
#else
|
||||
if (!canceled)
|
||||
{
|
||||
canceled = true;
|
||||
onError.dispatch(message);
|
||||
}
|
||||
#end
|
||||
}
|
||||
|
||||
public function sendProgress(message:Dynamic = null):Void
|
||||
{
|
||||
#if (cpp || neko)
|
||||
__messageQueue.add(message);
|
||||
#else
|
||||
if (!canceled)
|
||||
{
|
||||
onProgress.dispatch(message);
|
||||
}
|
||||
#end
|
||||
}
|
||||
|
||||
@:noCompletion private function __doWork():Void
|
||||
{
|
||||
doWork.dispatch(__runMessage);
|
||||
|
||||
// #if (cpp || neko)
|
||||
//
|
||||
// __messageQueue.add (MESSAGE_COMPLETE);
|
||||
//
|
||||
// #else
|
||||
//
|
||||
// if (!canceled) {
|
||||
//
|
||||
// canceled = true;
|
||||
// onComplete.dispatch (null);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// #end
|
||||
}
|
||||
|
||||
@:noCompletion private function __update(deltaTime:Int):Void
|
||||
{
|
||||
#if (cpp || neko)
|
||||
var message = __messageQueue.pop(false);
|
||||
|
||||
if (message != null)
|
||||
{
|
||||
if (message == MESSAGE_ERROR)
|
||||
{
|
||||
Application.current.onUpdate.remove(__update);
|
||||
|
||||
if (!canceled)
|
||||
{
|
||||
canceled = true;
|
||||
onError.dispatch(__messageQueue.pop(false));
|
||||
}
|
||||
}
|
||||
else if (message == MESSAGE_COMPLETE)
|
||||
{
|
||||
Application.current.onUpdate.remove(__update);
|
||||
|
||||
if (!canceled)
|
||||
{
|
||||
canceled = true;
|
||||
onComplete.dispatch(__messageQueue.pop(false));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!canceled)
|
||||
{
|
||||
onProgress.dispatch(message);
|
||||
}
|
||||
}
|
||||
}
|
||||
#end
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user