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

Do some debug and preparatory work for ramcache and playlist

Browse source 
The file system rework introduced incompatibility between dircache
and the tagcache ramcache and playlist dircache path caching. This
update makes changes to filesystem code to reintegrate all that.

It also fixes a couple bugs that were found when vetting all the
code. The filestream cache was being reset without regard to
the stream even if it was shared in write mode (made work of
.playlist_control). Better handling of unmounting gives files a
better go at force-closing them without risk to disk integrity.

Did some miscellaneous pedantic changes. Improved efficiency of
testing a file's existence (a little) since the path parser will
be shared between file code and parsing for the sake of finding
dircache references, not duplicated as before.

This commit doesn't reenable said items just for the sake of
keeping changes separate and related.

Plan for the next is to enable dircache again for the playlists
(easy peasy) and reenable tagcache ramcache but *without* the
dircache path caching because it's rather substantial to change
in itself. The ramcache will still function without dircache.

Change-Id: I7e2a9910b866251fa8333e1275f72fcfc8425d2d
This commit is contained in:
Michael Sevakis 2017-01-08 17:14:10 -05:00
parent 0056ea8a25
commit a931c76b3a
11 changed files with 440 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

48
firmware/common/file_internal.c
View file

@ -292,7 +292,7 @@ struct pathwalk_component
struct pathwalk_component *nextp; /* parent if in use else next free */
};
#define WALK_RC_NOT_FOUND 0 /* successfully not found */
#define WALK_RC_NOT_FOUND 0 /* successfully not found (aid for file creation) */
#define WALK_RC_FOUND 1 /* found and opened */
#define WALK_RC_FOUND_ROOT 2 /* found and opened sys/volume root */
#define WALK_RC_CONT_AT_ROOT 3 /* continue at root level */
@ -351,7 +351,10 @@ static int fill_path_compinfo(struct pathwalk *walkp,
compinfo->length = compp->length;
compinfo->attr = compp->attr;
compinfo->filesize = walkp->filesize;
compinfo->parentinfo = (compp->nextp ?: compp)->info;
if (!(walkp->callflags & FF_SELFINFO))
compinfo->parentinfo = (compp->nextp ?: compp)->info;
else
compinfo->info = compp->info;
}
return rc;
@ -393,7 +396,10 @@ static int walk_open_info(struct pathwalk *walkp,
else
callflags &= ~FO_DIRECTORY;
fileop_onopen_internal(stream, &compp->info, callflags);
/* make open official if not simply probing for presence */
if (!(callflags & FF_PROBE))
fileop_onopen_internal(stream, &compp->info, callflags);
return compp->nextp ? WALK_RC_FOUND : WALK_RC_FOUND_ROOT;
}
@ -511,7 +517,8 @@ walk_path(struct pathwalk *walkp, struct pathwalk_component *compp,
{
/* is ".." */
struct pathwalk_component *parentp = compp->nextp;
if (!parentp)
if (!parentp IF_MV( || parentp->attr == ATTR_SYSTEM_ROOT ))
return WALK_RC_CONT_AT_ROOT;
compp->nextp = freep;
@ -567,6 +574,9 @@ int open_stream_internal(const char *path, unsigned int callflags,
if (!compinfo)
callflags &= ~FF_CHECKPREFIX;
/* This lets it be passed quietly to directory scanning */
stream->flags = callflags & FF_MASK;
struct pathwalk walk;
walk.path = path;
walk.callflags = callflags;
@ -575,7 +585,7 @@ int open_stream_internal(const char *path, unsigned int callflags,
struct pathwalk_component *rootp = pathwalk_comp_alloc(NULL);
rootp->nextp = NULL;
rootp->attr = ATTR_DIRECTORY;
rootp->attr = ATTR_SYSTEM_ROOT;
#ifdef HAVE_MULTIVOLUME
int volume = 0, rootrc = WALK_RC_FOUND;
@ -584,7 +594,7 @@ int open_stream_internal(const char *path, unsigned int callflags,
while (1)
{
const char *pathptr = walk.path;
#ifdef HAVE_MULTIVOLUME
/* this seamlessly integrates secondary filesystems into the
root namespace (e.g. "/<0>/../../<1>/../foo/." :<=> "/foo") */
@ -596,8 +606,19 @@ int open_stream_internal(const char *path, unsigned int callflags,
FILE_ERROR(ENXIO, -2);
}
/* the root of this subpath is the system root? */
rootrc = p == pathptr ? WALK_RC_FOUND_ROOT : WALK_RC_FOUND;
if (p == pathptr)
{
/* the root of this subpath is the system root */
rootp->attr = ATTR_SYSTEM_ROOT;
rootrc = WALK_RC_FOUND_ROOT;
}
else
{
/* this subpath specifies a mount point */
rootp->attr = ATTR_MOUNT_POINT;
rootrc = WALK_RC_FOUND;
}
walk.path = p;
#endif /* HAVE_MULTIVOLUME */
@ -633,11 +654,9 @@ int open_stream_internal(const char *path, unsigned int callflags,
default: /* utter, abject failure :`( */
DEBUGF("Open failed: rc=%d, errno=%d\n", rc, errno);
filestr_base_destroy(stream);
FILE_ERROR(-rc, -2);
FILE_ERROR(-rc, -3);
}
file_cache_reset(stream->cachep);
file_error:
return rc;
}
@ -757,9 +776,10 @@ int test_stream_exists_internal(const char *path, unsigned int callflags)
{
/* only FF_* flags should be in callflags */
struct filestr_base stream;
int rc = open_stream_internal(path, callflags, &stream, NULL);
if (rc > 0)
close_stream_internal(&stream);
int rc = open_stream_internal(path, callflags | FF_PROBE, &stream, NULL);
if (rc >= 0)
filestr_base_destroy(&stream);
return rc;
}