Relintai/thread_pool
1
0
Fork 0
mirror of https://github.com/Relintai/thread_pool.git synced 2024-11-12 10:25:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work on fixing compile.

Browse Source
This commit is contained in:
Relintai 2023-01-09 14:10:42 +01:00
parent 652dbff8bf
commit 499cde11d2
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
thread_pool_execute_job.cpp
View File

@ -59,17 +59,19 @@ void ThreadPoolExecuteJob::_execute() {
_object->call(_method, const_cast<const Variant **>(&_argptr), _argcount, error);
}
void ThreadPoolExecuteJob::setup(const Variant &obj, const StringName &p_method, VARIANT_ARG_DECLARE) {
void ThreadPoolExecuteJob::_setup(const Variant &obj, const StringName &p_method, const Variant **p_arg, int p_argcount) {
set_complete(false);
set_cancelled(false);
_object = obj;
_method = p_method;
_argptr[0] = p_arg1;
_argptr[1] = p_arg2;
_argptr[2] = p_arg3;
_argptr[3] = p_arg4;
_argptr[4] = p_arg5;
for (int i = 0; i < 5; ++i) {
if (i < p_argcount) {
_argptr[i] = *p_arg[i];
} else {
_argptr[i] = Variant();
}
}
for (int i = 4; i >= 0; --i) {
if (_argptr[i].get_type() != Variant::NIL) {
@ -134,27 +136,27 @@ Variant ThreadPoolExecuteJob::_setup_bind(const Variant **p_args, int p_argcount
if (p_argcount > 2) {
_argcount = 1;
_argptr[0] = p_args[2];
_argptr[0] = *p_args[2];
}
if (p_argcount > 3) {
_argcount = 2;
_argptr[1] = p_args[3];
_argptr[1] = *p_args[3];
}
if (p_argcount > 4) {
_argcount = 3;
_argptr[2] = p_args[4];
_argptr[2] = *p_args[4];
}
if (p_argcount > 5) {
_argcount = 4;
_argptr[3] = p_args[5];
_argptr[3] = *p_args[5];
}
if (p_argcount > 6) {
_argcount = 5;
_argptr[4] = p_args[6];
_argptr[4] = *p_args[6];
}
if (!_object || !_object->has_method(_method)) {

13
thread_pool_execute_job.h
View File

@ -36,7 +36,18 @@ public:
void set_method(const StringName &value);
void _execute();
void setup(const Variant &obj, const StringName &p_method, VARIANT_ARG_LIST);
template <typename... VarArgs>
void setup(int p_peer_id, const StringName &p_method, VarArgs... p_args) {
Variant args[sizeof...(p_args) + 1] = { p_args..., Variant() }; // +1 makes sure zero sized arrays are also supported.
const Variant *argptrs[sizeof...(p_args) + 1];
for (uint32_t i = 0; i < sizeof...(p_args); i++) {
argptrs[i] = &args[i];
}
_setup(p_peer_id, p_method, sizeof...(p_args) == 0 ? nullptr : (const Variant **)argptrs, sizeof...(p_args));
}
void _setup(const Variant &obj, const StringName &p_method, const Variant **p_arg, int p_argcount);
#if VERSION_MAJOR < 4
Variant _setup_bind(const Variant **p_args, int p_argcount, Variant::CallError &r_error);
#else

2
thread_pool_job.cpp
View File

@ -201,7 +201,7 @@ void ThreadPoolJob::_bind_methods() {
ClassDB::bind_method(D_METHOD("should_return"), &ThreadPoolJob::should_return);
#if VERSION_MAJOR < 4
BIND_VMETHOD(MethodInfo("_execute"));
//BIND_VMETHOD(MethodInfo("_execute"));
#else
GDVIRTUAL_BIND(_execute);
#endif