enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

eina: Fix _timedwait to handle the given timeout on top of the absolute time 

The pthread man page clearly states that pthread_cond_timedwait() takes an
absolute time parameter. So far we always passed it epoch plus timeout in
seconds. This would never trigger the timeout.

Making sure we fill out timespec struct with the current time before adding
the timeout as offset now. Also handling the t < 0 error case.

Various version worked up together with Jean-Philippe Andre <jp.andre@samsung.com>

Fixes T1701
This commit is contained in:
Stefan Schmidt 2014-10-22 15:36:57 +02:00
parent fb8087b0a7
commit f0a02a92be
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/eina/eina_inline_lock_posix.x
View File

@ -58,6 +58,8 @@ typedef void (*Eina_Lock_Bt_Func) ();
#include "eina_inlist.h"
#endif
#include "eina_inline_private.h"
typedef struct _Eina_Lock Eina_Lock;
typedef struct _Eina_RWLock Eina_RWLock;
typedef struct _Eina_Condition Eina_Condition;
@ -376,6 +378,14 @@ eina_condition_timedwait(Eina_Condition *cond, double t)
{
struct timespec tv;
Eina_Bool r;
time_t sec;
long nsec;
if (t < 0)
{
errno = EINVAL;
return EINA_FALSE;
}
#ifdef EINA_HAVE_DEBUG_THREADS
assert(_eina_threads_activated);
@ -387,8 +397,16 @@ eina_condition_timedwait(Eina_Condition *cond, double t)
pthread_mutex_unlock(&_eina_tracking_lock);
#endif
tv.tv_sec = t;
tv.tv_nsec = (t - (double) tv.tv_sec) * 1000000000;
_eina_time_get(&tv);
sec = (time_t)t;
nsec = (t - (double) sec) * 1000000000L;
tv.tv_sec += sec;
tv.tv_nsec += nsec;
if (tv.tv_nsec > 1000000000L)
{
tv.tv_sec++;
tv.tv_nsec -= 1000000000L;
}
r = pthread_cond_timedwait(&(cond->condition),
&(cond->lock->mutex),