forked from enlightenment/efl
parent
651cff4602
commit
a05d575f0a
|
@ -31,8 +31,8 @@ struct _Evas_Cache_Preload
|
||||||
Image_Entry *ie;
|
Image_Entry *ie;
|
||||||
};
|
};
|
||||||
|
|
||||||
static LK(engine_lock) = PTHREAD_MUTEX_INITIALIZER;
|
static LK(engine_lock) = EINA_LOCK_INITIALIZER;
|
||||||
static LK(wakeup) = PTHREAD_MUTEX_INITIALIZER;
|
static LK(wakeup) = EINA_LOCK_INITIALIZER;
|
||||||
|
|
||||||
static pthread_cond_t cond_wakeup = PTHREAD_COND_INITIALIZER;
|
static pthread_cond_t cond_wakeup = PTHREAD_COND_INITIALIZER;
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ struct _Evas_Preload_Pthread_Data
|
||||||
static int _threads_count = 0;
|
static int _threads_count = 0;
|
||||||
static Evas_Preload_Pthread_Worker *_workers = NULL;
|
static Evas_Preload_Pthread_Worker *_workers = NULL;
|
||||||
|
|
||||||
static LK(_mutex) = PTHREAD_MUTEX_INITIALIZER;
|
static LK(_mutex) = EINA_LOCK_INITIALIZER;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_evas_preload_thread_end(void *data)
|
_evas_preload_thread_end(void *data)
|
||||||
|
|
|
@ -399,7 +399,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNU
|
||||||
{
|
{
|
||||||
#ifdef SCALECACHE
|
#ifdef SCALECACHE
|
||||||
int locked = 0;
|
int locked = 0;
|
||||||
Eina_Bool ret;
|
Eina_Lock_Result ret;
|
||||||
RGBA_Image *im = (RGBA_Image *)ie;
|
RGBA_Image *im = (RGBA_Image *)ie;
|
||||||
Scaleitem *sci;
|
Scaleitem *sci;
|
||||||
if (!im->image.data) return;
|
if (!im->image.data) return;
|
||||||
|
@ -420,7 +420,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNU
|
||||||
slpt += slp;
|
slpt += slp;
|
||||||
slp++;
|
slp++;
|
||||||
ret = LKT(im->cache.lock);
|
ret = LKT(im->cache.lock);
|
||||||
if (ret == 2) // MAGIC for now
|
if (ret == EINA_LOCK_DEADLOCK)
|
||||||
{
|
{
|
||||||
printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file);
|
printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file);
|
||||||
}
|
}
|
||||||
|
@ -437,7 +437,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst __UNU
|
||||||
LKDBG(im->cache.lock);
|
LKDBG(im->cache.lock);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (ret == 2) // MAGIC for now
|
else if (ret == EINA_LOCK_DEADLOCK)
|
||||||
{
|
{
|
||||||
printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file);
|
printf("WARNING: DEADLOCK on image %p (%s)\n", im, ie->file);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue