kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ThreadPool to limit simultaenous native file/URL requests

Browse Source
This commit is contained in:
Joshua Granick
2017-03-20 18:03:15 -07:00
parent 3a5ab4c472
commit ece2acbebb
1 changed files with 92 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
lime/_backend/native/NativeHTTPRequest.hx
View File

@@ -10,7 +10,7 @@ import lime.net.curl.CURLEasy;
import lime.net.curl.CURL;
import lime.net.HTTPRequest;
import lime.net.HTTPRequestMethod;
import lime.system.BackgroundWorker;
import lime.system.ThreadPool;
#if sys
import sys.FileSystem;
@@ -25,6 +25,8 @@ import sys.FileSystem;
class NativeHTTPRequest {
private static var threadPool:ThreadPool;
private var bytes:Bytes;
private var bytesLoaded:Int;
private var bytesTotal:Int;
@@ -62,16 +64,35 @@ class NativeHTTPRequest {
public function loadData (uri:String, binary:Bool = true):Future<Bytes> {
if (uri.indexOf ("http://") == -1 && uri.indexOf ("https://") == -1) {
if (threadPool == null) {
loadFile (uri);
CURL.globalInit (CURL.GLOBAL_ALL);
} else {
loadURL (uri, binary);
threadPool = new ThreadPool (1, 5);
threadPool.doWork.add (threadPool_doWork);
threadPool.onComplete.add (threadPool_onComplete);
threadPool.onError.add (threadPool_onError);
}
if (parent.timeout > 0) {
Timer.delay (function () {
if (bytesLoaded == 0 && bytesTotal == 0 && !promise.isComplete && !promise.isError) {
//cancel ();
promise.error (CURLCode.OPERATION_TIMEDOUT);
}
}, parent.timeout);
}
threadPool.queue ({ instance: this, uri: uri, binary: binary });
return promise.future;
}
@@ -79,57 +100,41 @@ class NativeHTTPRequest {
private function loadFile (path:String):Void {
var worker = new BackgroundWorker ();
worker.doWork.add (function (_) {
var index = path.indexOf ("?");
if (index > -1) {
var index = path.indexOf ("?");
path = path.substring (0, index);
if (index > -1) {
path = path.substring (0, index);
}
}
#if (sys && !windows)
if (StringTools.startsWith (path, "~/")) {
#if (sys && !windows)
if (StringTools.startsWith (path, "~/")) {
path = Sys.getEnv ("HOME") + "/" + path.substr (2);
}
#end
path = Sys.getEnv ("HOME") + "/" + path.substr (2);
if (path == null #if (sys && !android) || !FileSystem.exists (path) #end) {
}
#end
if (path == null #if (sys && !android) || !FileSystem.exists (path) #end) {
threadPool.sendError ({ promise: promise, error: "Cannot load file: " + path });
} else {
bytes = lime.utils.Bytes.fromFile (path);
if (bytes != null) {
worker.sendError ("Cannot load file: " + path);
threadPool.sendComplete ({ promise: promise, result: bytes });
} else {
bytes = lime.utils.Bytes.fromFile (path);
if (bytes != null) {
worker.sendComplete (bytes);
} else {
worker.sendError ("Cannot load file: " + path);
}
threadPool.sendError ({ promise: promise, error: "Cannot load file: " + path });
}
});
worker.onComplete.add (function (result) {
promise.complete (result);
});
worker.onError.add (function (message) {
promise.error (message);
});
worker.run ();
}
}
@@ -289,45 +294,16 @@ class NativeHTTPRequest {
CURLEasy.setopt (curl, TRANSFERTEXT, !binary);
var worker = new BackgroundWorker ();
worker.doWork.add (function (_) {
var result = CURLEasy.perform (curl);
worker.sendComplete (result);
});
worker.onComplete.add (function (result) {
parent.responseStatus = CURLEasy.getinfo (curl, RESPONSE_CODE);
if (result == CURLCode.OK) {
promise.complete (bytes);
} else {
promise.error (result);
}
});
worker.run ();
var result = CURLEasy.perform (curl);
parent.responseStatus = CURLEasy.getinfo (curl, RESPONSE_CODE);
if (parent.timeout > 0) {
if (result == CURLCode.OK) {
Timer.delay (function () {
if (bytesLoaded == 0 && bytesTotal == 0 && !worker.completed) {
worker.cancel ();
cancel ();
promise.error (CURLCode.OPERATION_TIMEDOUT);
}
}, parent.timeout);
threadPool.sendComplete ({ promise: promise, result: bytes });
} else {
threadPool.sendError ({ promise: promise, error: result });
}
@@ -389,4 +365,37 @@ class NativeHTTPRequest {
}
private static function threadPool_doWork (state:Dynamic):Void {
var instance:NativeHTTPRequest = state.instance;
var uri:String = state.uri;
var binary:Bool = state.binary;
if (uri.indexOf ("http://") == -1 && uri.indexOf ("https://") == -1) {
instance.loadFile (uri);
} else {
instance.loadURL (uri, binary);
}
}
private static function threadPool_onComplete (state:Dynamic):Void {
state.promise.complete (state.result);
}
private static function threadPool_onError (state:Dynamic):Void {
state.promise.error (state.error);
}
}