Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Now correctly interrupting the dircache rebuilding.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7645 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2005-10-20 08:33:59 +00:00
parent abd9f83e92
commit 4b2aa9830e
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/tree.c
View file

@ -1641,8 +1641,8 @@ void tree_flush(void)
if (dircache_is_enabled())
{
global_settings.dircache_size = dircache_get_cache_size();
dircache_disable();
}
dircache_disable();
}
else
{

25
firmware/common/dircache.c
View file

@ -41,6 +41,7 @@
/* Queue commands. */
#define DIRCACHE_BUILD 1
#define DIRCACHE_STOP 2
extern char *audiobuf;
@ -406,6 +407,11 @@ static void dircache_thread(void)
thread_enabled = false;
break ;
case DIRCACHE_STOP:
logf("Stopped the rebuilding.");
dircache_initialized = false;
break ;
#ifndef SIMULATOR
case SYS_USB_CONNECTED:
usb_acknowledge(SYS_USB_CONNECTED_ACK);
@ -487,13 +493,28 @@ int dircache_get_cache_size(void)
void dircache_disable(void)
{
int i;
bool cache_in_use;
if (thread_enabled)
queue_post(&dircache_queue, DIRCACHE_STOP, 0);
while (thread_enabled)
sleep(1);
dircache_initialized = false;
for (i = 0; i < MAX_OPEN_DIRS; i++)
opendirs[i].busy = false;
logf("Waiting for cached dirs to release");
do {
cache_in_use = false;
for (i = 0; i < MAX_OPEN_DIRS; i++) {
if (!opendirs[i].regulardir && opendirs[i].busy)
{
cache_in_use = true;
sleep(1);
break ;
}
}
} while (cache_in_use) ;
logf("Cache released");
}
/* --- Directory cache live updating functions --- */