Skip to content

C
core
Kaydet (Commit) d6dd2093 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Let's use log tags starting with "sal" here in sal 

Change-Id: I89e71e03ede5175fabe1df949b8d3200f64757a0
üst dd6424c9
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
sal/osl/unx/conditn.cxx
Dosyayı görüntüle @ d6dd2093
...@@ -53,7 +53,7 @@ oslCondition SAL_CALL osl_createCondition() ...@@ -53,7 +53,7 @@ oslCondition SAL_CALL osl_createCondition()
nRet = pthread_cond_init(&pCond->m_Condition, PTHREAD_CONDATTR_DEFAULT); nRet = pthread_cond_init(&pCond->m_Condition, PTHREAD_CONDATTR_DEFAULT);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "pthread_cond_init failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "pthread_cond_init failed: " << strerror(nRet) );
free(pCond); free(pCond);
return 0; return 0;
...@@ -62,16 +62,16 @@ oslCondition SAL_CALL osl_createCondition() ...@@ -62,16 +62,16 @@ oslCondition SAL_CALL osl_createCondition()
nRet = pthread_mutex_init(&pCond->m_Lock, PTHREAD_MUTEXATTR_DEFAULT); nRet = pthread_mutex_init(&pCond->m_Lock, PTHREAD_MUTEXATTR_DEFAULT);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "pthread_mutex_init failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "pthread_mutex_init failed: " << strerror(nRet) );
nRet = pthread_cond_destroy(&pCond->m_Condition); nRet = pthread_cond_destroy(&pCond->m_Condition);
SAL_WARN_IF( nRet != 0, "osl.condition", "pthread_cond_destroy failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "pthread_cond_destroy failed: " << strerror(nRet) );
free(pCond); free(pCond);
pCond = 0; pCond = 0;
} }
SAL_INFO( "osl.condition", "osl_createCondition(): " << pCond ); SAL_INFO( "sal.osl.condition", "osl_createCondition(): " << pCond );
return (oslCondition)pCond; return (oslCondition)pCond;
} }
...@@ -82,14 +82,14 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition) ...@@ -82,14 +82,14 @@ void SAL_CALL osl_destroyCondition(oslCondition Condition)
pCond = (oslConditionImpl*)Condition; pCond = (oslConditionImpl*)Condition;
SAL_INFO( "osl.condition", "osl_destroyCondition(" << pCond << ")" ); SAL_INFO( "sal.osl.condition", "osl_destroyCondition(" << pCond << ")" );
if ( pCond ) if ( pCond )
{ {
int nRet = pthread_cond_destroy(&pCond->m_Condition); int nRet = pthread_cond_destroy(&pCond->m_Condition);
SAL_WARN_IF( nRet != 0, "osl.condition", "pthread_cond_destroy failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "pthread_cond_destroy failed: " << strerror(nRet) );
nRet = pthread_mutex_destroy(&pCond->m_Lock); nRet = pthread_mutex_destroy(&pCond->m_Lock);
SAL_WARN_IF( nRet != 0, "osl.condition", "pthread_mutex_destroy failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "pthread_mutex_destroy failed: " << strerror(nRet) );
free(Condition); free(Condition);
} }
...@@ -113,7 +113,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) ...@@ -113,7 +113,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
nRet = pthread_mutex_lock(&pCond->m_Lock); nRet = pthread_mutex_lock(&pCond->m_Lock);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "osl_setCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "osl_setCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) );
return sal_False; return sal_False;
} }
...@@ -121,7 +121,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) ...@@ -121,7 +121,7 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
nRet = pthread_cond_broadcast(&pCond->m_Condition); nRet = pthread_cond_broadcast(&pCond->m_Condition);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "osl_setCondition(" << pCond << "): pthread_cond_broadcast failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "osl_setCondition(" << pCond << "): pthread_cond_broadcast failed: " << strerror(nRet) );
// try to unlock the mutex // try to unlock the mutex
pthread_mutex_unlock(&pCond->m_Lock); pthread_mutex_unlock(&pCond->m_Lock);
return sal_False; return sal_False;
...@@ -130,11 +130,11 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition) ...@@ -130,11 +130,11 @@ sal_Bool SAL_CALL osl_setCondition(oslCondition Condition)
nRet = pthread_mutex_unlock(&pCond->m_Lock); nRet = pthread_mutex_unlock(&pCond->m_Lock);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "osl_setCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "osl_setCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) );
return sal_False; return sal_False;
} }
SAL_INFO( "osl.condition", "osl_setCondition(" << pCond << ")" ); SAL_INFO( "sal.osl.condition", "osl_setCondition(" << pCond << ")" );
return sal_True; return sal_True;
...@@ -157,7 +157,7 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition) ...@@ -157,7 +157,7 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
nRet = pthread_mutex_lock(&pCond->m_Lock); nRet = pthread_mutex_lock(&pCond->m_Lock);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "osl_resetCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "osl_resetCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) );
return sal_False; return sal_False;
} }
...@@ -166,11 +166,11 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition) ...@@ -166,11 +166,11 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition)
nRet = pthread_mutex_unlock(&pCond->m_Lock); nRet = pthread_mutex_unlock(&pCond->m_Lock);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "osl_resetCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "osl_resetCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) );
return sal_False; return sal_False;
} }
SAL_INFO( "osl.condition", "osl_resetCondition(" << pCond << ")" ); SAL_INFO( "sal.osl.condition", "osl_resetCondition(" << pCond << ")" );
return sal_True; return sal_True;
} }
...@@ -184,7 +184,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time ...@@ -184,7 +184,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
assert(Condition); assert(Condition);
pCond = (oslConditionImpl*)Condition; pCond = (oslConditionImpl*)Condition;
SAL_INFO( "osl.condition", "osl_waitCondition(" << pCond << ")" ); SAL_INFO( "sal.osl.condition", "osl_waitCondition(" << pCond << ")" );
if ( pCond == 0 ) if ( pCond == 0 )
{ {
...@@ -194,7 +194,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time ...@@ -194,7 +194,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
nRet = pthread_mutex_lock(&pCond->m_Lock); nRet = pthread_mutex_lock(&pCond->m_Lock);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) );
return osl_cond_result_error; return osl_cond_result_error;
} }
...@@ -220,7 +220,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time ...@@ -220,7 +220,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
{ {
Result = osl_cond_result_timeout; Result = osl_cond_result_timeout;
nRet = pthread_mutex_unlock(&pCond->m_Lock); nRet = pthread_mutex_unlock(&pCond->m_Lock);
SAL_WARN_IF( nRet != 0, "osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) );
return Result; return Result;
} }
...@@ -228,7 +228,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time ...@@ -228,7 +228,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
{ {
Result = osl_cond_result_error; Result = osl_cond_result_error;
nRet = pthread_mutex_unlock(&pCond->m_Lock); nRet = pthread_mutex_unlock(&pCond->m_Lock);
SAL_WARN_IF( nRet != 0, "osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) );
return Result; return Result;
} }
} }
...@@ -243,10 +243,10 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time ...@@ -243,10 +243,10 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
nRet = pthread_cond_wait(&pCond->m_Condition, &pCond->m_Lock); nRet = pthread_cond_wait(&pCond->m_Condition, &pCond->m_Lock);
if ( nRet != 0 ) if ( nRet != 0 )
{ {
SAL_WARN( "osl.condition", "osl_waitCondition(" << pCond << "): pthread_cond_wait failed: " << strerror(nRet) ); SAL_WARN( "sal.osl.condition", "osl_waitCondition(" << pCond << "): pthread_cond_wait failed: " << strerror(nRet) );
Result = osl_cond_result_error; Result = osl_cond_result_error;
nRet = pthread_mutex_unlock(&pCond->m_Lock); nRet = pthread_mutex_unlock(&pCond->m_Lock);
SAL_WARN_IF( nRet != 0, "osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) );
return Result; return Result;
} }
...@@ -254,9 +254,9 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time ...@@ -254,9 +254,9 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time
} }
nRet = pthread_mutex_unlock(&pCond->m_Lock); nRet = pthread_mutex_unlock(&pCond->m_Lock);
SAL_WARN_IF( nRet != 0, "osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_waitCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) );
SAL_INFO( "osl.condition", "osl_waitCondition(" << pCond << "): " << (Result == osl_cond_result_ok ? "OK" : "ERROR") ); SAL_INFO( "sal.osl.condition", "osl_waitCondition(" << pCond << "): " << (Result == osl_cond_result_ok ? "OK" : "ERROR") );
return Result; return Result;
} }
...@@ -276,14 +276,14 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition) ...@@ -276,14 +276,14 @@ sal_Bool SAL_CALL osl_checkCondition(oslCondition Condition)
} }
nRet = pthread_mutex_lock(&pCond->m_Lock); nRet = pthread_mutex_lock(&pCond->m_Lock);
SAL_WARN_IF( nRet != 0, "osl.condition", "osl_checkCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_checkCondition(" << pCond << "): pthread_mutex_lock failed: " << strerror(nRet) );
State = pCond->m_State; State = pCond->m_State;
nRet = pthread_mutex_unlock(&pCond->m_Lock); nRet = pthread_mutex_unlock(&pCond->m_Lock);
SAL_WARN_IF( nRet != 0, "osl.condition", "osl_checkCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) ); SAL_WARN_IF( nRet != 0, "sal.osl.condition", "osl_checkCondition(" << pCond << "): pthread_mutex_unlock failed: " << strerror(nRet) );
SAL_INFO( "osl.condition", "osl_checkCondition(" << pCond << "): " << (State ? "YES" : "NO") ); SAL_INFO( "sal.osl.condition", "osl_checkCondition(" << pCond << "): " << (State ? "YES" : "NO") );
return State; return State;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment