oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Remove Thread::kill() and related unittest (#10317)

Browse source 
Closes: #6065
This commit is contained in:
Sebastien Marie 2020-09-10 12:19:18 +02:00 • committed by GitHub
parent 0683bea283
commit 3fb1f45301
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/threading/thread.cpp
View file

@ -73,7 +73,28 @@ Thread::Thread(const std::string &name) :
Thread::~Thread()
{
kill();
// kill the thread if running
if (!m_running) {
wait();
} else {
m_running = false;
#if defined(_WIN32)
// See https://msdn.microsoft.com/en-us/library/hh920601.aspx#thread__native_handle_method
TerminateThread((HANDLE) m_thread_obj->native_handle(), 0);
CloseHandle((HANDLE) m_thread_obj->native_handle());
#else
// We need to pthread_kill instead on Android since NDKv5's pthread
// implementation is incomplete.
# ifdef __ANDROID__
pthread_kill(getThreadHandle(), SIGKILL);
# else
pthread_cancel(getThreadHandle());
# endif
wait();
#endif
}
// Make sure start finished mutex is unlocked before it's destroyed
if (m_start_finished_mutex.try_lock())
@ -138,37 +159,6 @@ bool Thread::wait()
}
bool Thread::kill()
{
if (!m_running) {
wait();
return false;
}
m_running = false;
#if defined(_WIN32)
// See https://msdn.microsoft.com/en-us/library/hh920601.aspx#thread__native_handle_method
TerminateThread((HANDLE) m_thread_obj->native_handle(), 0);
CloseHandle((HANDLE) m_thread_obj->native_handle());
#else
// We need to pthread_kill instead on Android since NDKv5's pthread
// implementation is incomplete.
# ifdef __ANDROID__
pthread_kill(getThreadHandle(), SIGKILL);
# else
pthread_cancel(getThreadHandle());
# endif
wait();
#endif
m_retval = nullptr;
m_joinable = false;
m_request_stop = false;
return true;
}
bool Thread::getReturnValue(void **ret)
{