devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Database: find_entry_ram: Avoid dircache use if it's not ready

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30254 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Hohmuth 2011-08-04 23:03:27 +00:00
parent 32dfc0cdc1
commit fa81cdc61a
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/tagcache.c
View file

@ -392,7 +392,7 @@ static long find_entry_ram(const char *filename, int dc)
int i; int i;
/* Check if tagcache is loaded into ram. */ /* Check if tagcache is loaded into ram. */
if (!tc_stat.ramcache) if (!tc_stat.ramcache || !is_dircache_intact())
return -1; return -1;
if (dc < 0) if (dc < 0)
@ -540,7 +540,6 @@ static int find_index(const char *filename)
long idx_id = -1; long idx_id = -1;
#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
if (tc_stat.ramcache && is_dircache_intact())
idx_id = find_entry_ram(filename, -1); idx_id = find_entry_ram(filename, -1);
#endif #endif
@ -1799,10 +1798,7 @@ static void __attribute__ ((noinline)) add_tagcache(char *path,
/* Check if the file is already cached. */ /* Check if the file is already cached. */
#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
if (tc_stat.ramcache && is_dircache_intact())
{
idx_id = find_entry_ram(path, dc); idx_id = find_entry_ram(path, dc);
}
#endif #endif
/* Be sure the entry doesn't exist. */ /* Be sure the entry doesn't exist. */