Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix thread ID formatting in log messages.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2010-06-24 10:33:57 +00:00
parent 72e7920f2d
commit 35e9c131e2
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/unix/threadpsx.cpp
View File

@@ -60,11 +60,8 @@
#include <sys/resource.h> // for setpriority() #include <sys/resource.h> // for setpriority()
#endif #endif
#ifdef __VMS #define THR_ID_CAST(id) (reinterpret_cast<void*>(id))
#define THR_ID(thr) ((long long)(thr)->GetId()) #define THR_ID(thr) THR_ID_CAST((thr)->GetId())
#else
#define THR_ID(thr) ((long)(thr)->GetId())
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
@@ -593,14 +590,14 @@ wxSemaError wxSemaphoreInternal::Wait()
{ {
wxLogTrace(TRACE_SEMA, wxLogTrace(TRACE_SEMA,
wxT("Thread %p waiting for semaphore to become signalled"), wxT("Thread %p waiting for semaphore to become signalled"),
wxThread::GetCurrentId()); THR_ID_CAST(wxThread::GetCurrentId()));
if ( m_cond.Wait() != wxCOND_NO_ERROR ) if ( m_cond.Wait() != wxCOND_NO_ERROR )
return wxSEMA_MISC_ERROR; return wxSEMA_MISC_ERROR;
wxLogTrace(TRACE_SEMA, wxLogTrace(TRACE_SEMA,
wxT("Thread %p finished waiting for semaphore, count = %lu"), wxT("Thread %p finished waiting for semaphore, count = %lu"),
wxThread::GetCurrentId(), (unsigned long)m_count); THR_ID_CAST(wxThread::GetCurrentId()), (unsigned long)m_count);
} }
m_count--; m_count--;
@@ -667,7 +664,7 @@ wxSemaError wxSemaphoreInternal::Post()
wxLogTrace(TRACE_SEMA, wxLogTrace(TRACE_SEMA,
wxT("Thread %p about to signal semaphore, count = %lu"), wxT("Thread %p about to signal semaphore, count = %lu"),
wxThread::GetCurrentId(), (unsigned long)m_count); THR_ID_CAST(wxThread::GetCurrentId()), (unsigned long)m_count);
return m_cond.Signal() == wxCOND_NO_ERROR ? wxSEMA_NO_ERROR return m_cond.Signal() == wxCOND_NO_ERROR ? wxSEMA_NO_ERROR
: wxSEMA_MISC_ERROR; : wxSEMA_MISC_ERROR;
@@ -733,7 +730,7 @@ public:
}; };
wxLogTrace(TRACE_THREADS, wxT("Thread %p: %s => %s."), wxLogTrace(TRACE_THREADS, wxT("Thread %p: %s => %s."),
GetId(), stateNames[m_state], stateNames[state]); THR_ID(this), stateNames[m_state], stateNames[state]);
#endif // wxUSE_LOG_TRACE #endif // wxUSE_LOG_TRACE
m_state = state; m_state = state;
@@ -1392,7 +1389,7 @@ wxThreadError wxThread::Resume()
{ {
case STATE_PAUSED: case STATE_PAUSED:
wxLogTrace(TRACE_THREADS, wxT("Thread %p suspended, resuming."), wxLogTrace(TRACE_THREADS, wxT("Thread %p suspended, resuming."),
GetId()); THR_ID(this));
m_internal->Resume(); m_internal->Resume();
@@ -1400,7 +1397,7 @@ wxThreadError wxThread::Resume()
case STATE_EXITED: case STATE_EXITED:
wxLogTrace(TRACE_THREADS, wxT("Thread %p exited, won't resume."), wxLogTrace(TRACE_THREADS, wxT("Thread %p exited, won't resume."),
GetId()); THR_ID(this));
return wxTHREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
default: default:
@@ -1621,8 +1618,8 @@ wxThread::~wxThread()
if ( m_internal->GetState() != STATE_EXITED && if ( m_internal->GetState() != STATE_EXITED &&
m_internal->GetState() != STATE_NEW ) m_internal->GetState() != STATE_NEW )
{ {
wxLogDebug(wxT("The thread %ld is being destroyed although it is still running! The application may crash."), wxLogDebug(wxT("The thread %p is being destroyed although it is still running! The application may crash."),
(long)GetId()); THR_ID(this));
} }
m_critsect.Leave(); m_critsect.Leave();
@@ -1782,7 +1779,7 @@ static void ScheduleThreadForDeletion()
static void DeleteThread(wxThread *This) static void DeleteThread(wxThread *This)
{ {
wxLogTrace(TRACE_THREADS, wxT("Thread %p auto deletes."), This->GetId()); wxLogTrace(TRACE_THREADS, wxT("Thread %p auto deletes."), THR_ID(This));
delete This; delete This;