Showing the changes to src/core/util_thread.cpp (1 of 1 file). Show all
Unified · Split
| @@ -81,11 +81,11 @@ XThread::~XThread( ) · 80 unmodified lines | |||
| 81 | // TODO: find an alternative for Android? | 81 | // TODO: find an alternative for Android? |
| 82 | #if defined(__PLATFORM_MACOSX__) || ( defined(__PLATFORM_LINUX__) && !defined(__ANDROID__) ) || defined(__WINDOWS_PTHREAD__) | 82 | #if defined(__PLATFORM_MACOSX__) || ( defined(__PLATFORM_LINUX__) && !defined(__ANDROID__) ) || defined(__WINDOWS_PTHREAD__) |
| 83 | // log | 83 | // log |
| 84 | EM_log( CK_LOG_FINEST, "cancelling XThread: %d on thread: %d", (t_CKUINT)thread, (t_CKUINT)pthread_self() ); | 84 | EM_log( CK_LOG_FINER, "cancelling XThread: %u on thread: %u", (t_CKUINT)thread, (t_CKUINT)pthread_self() ); |
| 85 | pthread_cancel(thread); | 85 | pthread_cancel(thread); |
| 86 | pthread_join(thread, NULL); | 86 | pthread_join(thread, NULL); |
| 87 | // log | 87 | // log |
| 88 | EM_log( CK_LOG_FINEST, "joined with XThread: %d on thread: %d", (t_CKUINT)thread, (t_CKUINT)pthread_self() ); | 88 | EM_log( CK_LOG_FINER, "joined with XThread: %u on thread: %u", (t_CKUINT)thread, (t_CKUINT)pthread_self() ); |
| 89 | #elif defined(__PLATFORM_WIN32__) | 89 | #elif defined(__PLATFORM_WIN32__) |
| 90 | TerminateThread((HANDLE)thread, 0); | 90 | TerminateThread((HANDLE)thread, 0); |
| 91 | #endif | 91 | #endif |
| @@ -295,11 +295,11 @@ void XWriteThread::shutdown() · 203 unmodified lines | |||
| 295 | SmartPushLog logPush; | 295 | SmartPushLog logPush; |
| 296 | 296 | ||
| 297 | // log | 297 | // log |
| 298 | EM_log( CK_LOG_FINEST, "waiting on write thread: %d", (t_CKUINT)m_thread.getThread() ); | 298 | EM_log( CK_LOG_FINER, "waiting on write thread: %u", (t_CKUINT)m_thread.getThread() ); |
| 299 | // wait on the thread | 299 | // wait on the thread |
| 300 | m_thread.wait( -1, false ); | 300 | m_thread.wait( -1, false ); |
| 301 | // log | 301 | // log |
| 302 | EM_log( CK_LOG_FINEST, "done waiting for thread: %d", (t_CKUINT)m_thread.getThread() ); | 302 | EM_log( CK_LOG_FINER, "done waiting for thread: %u", (t_CKUINT)m_thread.getThread() ); |
| 303 | } | 303 | } |
| 304 | 304 | ||
| 305 | 305 | ||