kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

also return deadlock from normal lock (not try only) 

SVN revision: 59103
This commit is contained in:
Carsten Haitzler 2011-05-02 08:34:22 +00:00
parent a05d575f0a
commit 5061598e12
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/eina/src/include/eina_inline_lock_posix.x
View File

@ -110,7 +110,9 @@ eina_lock_free(Eina_Lock *mutex)
static inline Eina_Lock_Result
eina_lock_take(Eina_Lock *mutex)
{
Eina_Bool ret;
Eina_Bool ret = EINA_FALSE;
int ok;
#ifdef EINA_HAVE_DEBUG_THREADS
if (_eina_threads_debug)
{
@ -131,8 +133,13 @@ eina_lock_take(Eina_Lock *mutex)
if (dt > _eina_threads_debug) abort();
}
#endif
ret = (pthread_mutex_lock(&(mutex->mutex)) == 0) ?
EINA_TRUE : EINA_FALSE;
ok = pthread_mutex_lock(&(mutex->mutex));
if (ok == 0) ret = EINA_TRUE;
else if (ok == EDEADLK)
{
printf("ERROR ERROR: DEADLOCK on lock %p\n", mutex);
ret = EINA_LOCK_DEADLOCK; // magic
}
#ifdef EINA_LOCK_DEBUG
mutex->locked = 1;
mutex->lock_thread_id = pthread_self();
@ -151,7 +158,7 @@ eina_lock_take_try(Eina_Lock *mutex)
if (ok == 0) ret = EINA_TRUE;
else if (ok == EDEADLK)
{
printf("ERROR ERROR: DEADLOCK on lock %p\n", mutex);
printf("ERROR ERROR: DEADLOCK on trylock %p\n", mutex);
ret = EINA_LOCK_DEADLOCK; // magic
}
#ifdef EINA_LOCK_DEBUG