From e707b7a2ea1e3040ec236e62a7907da228570633 Mon Sep 17 00:00:00 2001 From: Deve Date: Fri, 11 Nov 2016 14:11:27 +0100 Subject: [PATCH] Remove pthread_setcancelstate functions. This function is not available on android and it is default on other platforms anyway. It makes easier to port changes from master to android branch. --- src/addons/news_manager.cpp | 3 --- src/audio/sfx_manager.cpp | 5 ----- src/network/network_console.cpp | 2 ++ src/online/request_manager.cpp | 6 ------ 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/addons/news_manager.cpp b/src/addons/news_manager.cpp index 53d793d19..ad2376912 100644 --- a/src/addons/news_manager.cpp +++ b/src/addons/news_manager.cpp @@ -75,9 +75,6 @@ void NewsManager::init(bool force_refresh) pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - // Should be the default, but just in case: - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - //pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); pthread_t thread_id; int error = pthread_create(&thread_id, &attr, &NewsManager::downloadNews, this); diff --git a/src/audio/sfx_manager.cpp b/src/audio/sfx_manager.cpp index 13cb7c92a..e5c1013da 100644 --- a/src/audio/sfx_manager.cpp +++ b/src/audio/sfx_manager.cpp @@ -91,9 +91,6 @@ SFXManager::SFXManager() pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); - // Should be the default, but just in case: - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - m_thread_id.setAtomic(new pthread_t()); // The thread is created even if there atm sfx are disabled // (since the user might enable it later). @@ -299,8 +296,6 @@ void* SFXManager::mainLoop(void *obj) VS::setThreadName("SFXManager"); SFXManager *me = (SFXManager*)obj; - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - me->m_sfx_commands.lock(); // Wait till we have an empty sfx in the queue diff --git a/src/network/network_console.cpp b/src/network/network_console.cpp index 45df23848..b83729ec3 100644 --- a/src/network/network_console.cpp +++ b/src/network/network_console.cpp @@ -43,8 +43,10 @@ NetworkConsole::NetworkConsole() // ---------------------------------------------------------------------------- NetworkConsole::~NetworkConsole() { +#ifndef ANDROID if (m_thread_keyboard) pthread_cancel(*m_thread_keyboard);//, SIGKILL); +#endif } // ---------------------------------------------------------------------------- diff --git a/src/online/request_manager.cpp b/src/online/request_manager.cpp index 71b0b9a71..b59221890 100644 --- a/src/online/request_manager.cpp +++ b/src/online/request_manager.cpp @@ -104,10 +104,6 @@ namespace Online pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); - // Should be the default, but just in case: - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - //pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); - m_thread_id.setAtomic(new pthread_t()); int error = pthread_create(m_thread_id.getData(), &attr, &RequestManager::mainLoop, this); @@ -189,8 +185,6 @@ namespace Online VS::setThreadName("RequestManager"); RequestManager *me = (RequestManager*) obj; - pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - me->m_current_request = NULL; me->m_request_queue.lock(); while (me->m_request_queue.getData().empty() ||