Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #36752 from RandomShaper/rework_semaphore

Browse source 
Drop old semaphore implementation
This commit is contained in:
Rémi Verschelde 2020-03-05 16:33:45 +01:00 • committed by GitHub
commit 42595085a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 79 additions and 803 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/bind/core_bind.cpp
View file

@ -2576,32 +2576,28 @@ void _Marshalls::_bind_methods() {
////////////////
Error _Semaphore::wait() {
void _Semaphore::wait() {
return semaphore->wait();
semaphore.wait();
}
Error _Semaphore::post() {
Error _Semaphore::try_wait() {
return semaphore->post();
return semaphore.try_wait() ? OK : ERR_BUSY;
}
void _Semaphore::post() {
semaphore.post();
}
void _Semaphore::_bind_methods() {
ClassDB::bind_method(D_METHOD("wait"), &_Semaphore::wait);
ClassDB::bind_method(D_METHOD("try_wait"), &_Semaphore::try_wait);
ClassDB::bind_method(D_METHOD("post"), &_Semaphore::post);
}
_Semaphore::_Semaphore() {
semaphore = SemaphoreOld::create();
}
_Semaphore::~_Semaphore() {
memdelete(semaphore);
}
///////////////
void _Mutex::lock() {

10
core/bind/core_bind.h
View file

@ -635,16 +635,14 @@ public:
class _Semaphore : public Reference {
GDCLASS(_Semaphore, Reference);
SemaphoreOld *semaphore;
Semaphore semaphore;
static void _bind_methods();
public:
Error wait();
Error post();
_Semaphore();
~_Semaphore();
void wait();
Error try_wait();
void post();
};
class _Thread : public Reference {