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

warning-- for eina locks 

SVN revision: 59102
This commit is contained in:
Carsten Haitzler 2011-05-02 08:24:27 +00:00
parent 651cff4602
commit a05d575f0a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/evas/src/lib/cache/evas_cache_image.c vendored
View File

@ -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;

2
legacy/evas/src/lib/cache/evas_preload.c vendored
View File

@ -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)

6
legacy/evas/src/lib/engines/common/evas_image_scalecache.c
View File

@ -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);
} }