summaryrefslogtreecommitdiff
path: root/firmware/include/file.h
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-08-05 22:02:45 -0400
committerMichael Sevakis <jethead71@rockbox.org>2014-08-30 03:48:23 +0200
commit7d1a47cf13726c95ac46027156cc12dd9da5b855 (patch)
treeeb20d07656806479a8e1fea25887a490ea30d1d8 /firmware/include/file.h
parent95a4c3afcd53a1f8b835dec33de51f9c304de4d9 (diff)
downloadrockbox-7d1a47cf13726c95ac46027156cc12dd9da5b855.tar.gz
rockbox-7d1a47cf13726c95ac46027156cc12dd9da5b855.zip
Rewrite filesystem code (WIP)
This patch redoes the filesystem code from the FAT driver up to the clipboard code in onplay.c. Not every aspect of this is finished therefore it is still "WIP". I don't wish to do too much at once (haha!). What is left to do is get dircache back in the sim and find an implementation for the dircache indicies in the tagcache and playlist code or do something else that has the same benefit. Leaving these out for now does not make anything unusable. All the basics are done. Phone app code should probably get vetted (and app path handling just plain rewritten as environment expansions); the SDL app and Android run well. Main things addressed: 1) Thread safety: There is none right now in the trunk code. Most of what currently works is luck when multiple threads are involved or multiple descriptors to the same file are open. 2) POSIX compliance: Many of the functions behave nothing like their counterparts on a host system. This leads to inconsistent code or very different behavior from native to hosted. One huge offender was rename(). Going point by point would fill a book. 3) Actual running RAM usage: Many targets will use less RAM and less stack space (some more RAM because I upped the number of cache buffers for large memory). There's very little memory lying fallow in rarely-used areas (see 'Key core changes' below). Also, all targets may open the same number of directory streams whereas before those with less than 8MB RAM were limited to 8, not 12 implying those targets will save slightly less. 4) Performance: The test_disk plugin shows markedly improved performance, particularly in the area of (uncached) directory scanning, due partly to more optimal directory reading and to a better sector cache algorithm. Uncached times tend to be better while there is a bit of a slowdown in dircache due to it being a bit heavier of an implementation. It's not noticeable by a human as far as I can say. Key core changes: 1) Files and directories share core code and data structures. 2) The filesystem code knows which descriptors refer to same file. This ensures that changes from one stream are appropriately reflected in every open descriptor for that file (fileobj_mgr.c). 3) File and directory cache buffers are borrowed from the main sector cache. This means that when they are not in use by a file, they are not wasted, but used for the cache. Most of the time, only a few of them are needed. It also means that adding more file and directory handles is less expensive. All one must do in ensure a large enough cache to borrow from. 4) Relative path components are supported and the namespace is unified. It does not support full relative paths to an implied current directory; what is does support is use of "." and "..". Adding the former would not be very difficult. The namespace is unified in the sense that volumes may be specified several times along with relative parts, e.g.: "/<0>/foo/../../<1>/bar" :<=> "/<1>/bar". 5) Stack usage is down due to sharing of data, static allocation and less duplication of strings on the stack. This requires more serialization than I would like but since the number of threads is limited to a low number, the tradoff in favor of the stack seems reasonable. 6) Separates and heirarchicalizes (sic) the SIM and APP filesystem code. SIM path and volume handling is just like the target. Some aspects of the APP file code get more straightforward (e.g. no path hashing is needed). Dircache: Deserves its own section. Dircache is new but pays homage to the old. The old one was not compatible and so it, since it got redone, does all the stuff it always should have done such as: 1) It may be update and used at any time during the build process. No longer has one to wait for it to finish building to do basic file management (create, remove, rename, etc.). 2) It does not need to be either fully scanned or completely disabled; it can be incomplete (i.e. overfilled, missing paths), still be of benefit and be correct. 3) Handles mounting and dismounting of individual volumes which means a full rebuild is not needed just because you pop a new SD card in the slot. Now, because it reuses its freed entry data, may rebuild only that volume. 4) Much more fundamental to the file code. When it is built, it is the keeper of the master file list whether enabled or not ("disabled" is just a state of the cache). Its must always to ready to be started and bind all streams opened prior to being enabled. 5) Maintains any short filenames in OEM format which means that it does not need to be rebuilt when changing the default codepage. Miscellaneous Compatibility: 1) Update any other code that would otherwise not work such as the hotswap mounting code in various card drivers. 2) File management: Clipboard needed updating because of the behavioral changes. Still needs a little more work on some finer points. 3) Remove now-obsolete functionality such as the mutex's "no preempt" flag (which was only for the prior FAT driver). 4) struct dirinfo uses time_t rather than raw FAT directory entry time fields. I plan to follow up on genericizing everything there (i.e. no FAT attributes). 5) unicode.c needed some redoing so that the file code does not try try to load codepages during a scan, which is actually a problem with the current code. The default codepage, if any is required, is now kept in RAM separarately (bufalloced) from codepages specified to iso_decode() (which must not be bufalloced because the conversion may be done by playback threads). Brings with it some additional reusable core code: 1) Revised file functions: Reusable code that does things such as safe path concatenation and parsing without buffer limitations or data duplication. Variants that copy or alter the input path may be based off these. To do: 1) Put dircache functionality back in the sim. Treating it internally as a different kind of file system seems the best approach at this time. 2) Restore use of dircache indexes in the playlist and database or something effectively the same. Since the cache doesn't have to be complete in order to be used, not getting a hit on the cache doesn't unambiguously say if the path exists or not. Change-Id: Ia30f3082a136253e3a0eae0784e3091d138915c8 Reviewed-on: http://gerrit.rockbox.org/566 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'firmware/include/file.h')
-rw-r--r--firmware/include/file.h125
1 files changed, 66 insertions, 59 deletions
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 77930864c7..8e5bacec0e 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -18,81 +18,88 @@
18 * KIND, either express or implied. 18 * KIND, either express or implied.
19 * 19 *
20 ****************************************************************************/ 20 ****************************************************************************/
21
22#ifndef _FILE_H_ 21#ifndef _FILE_H_
23#define _FILE_H_ 22#define _FILE_H_
24 23
25#include <sys/types.h> 24#include <sys/types.h>
26#include "config.h" 25#include <stdbool.h>
27#include "gcc_extensions.h"
28#include <fcntl.h> 26#include <fcntl.h>
29#ifdef WIN32 27#ifdef WIN32
30/* this has SEEK_SET et al */ 28/* this has SEEK_SET et al */
31#include <stdio.h> 29#include <stdio.h>
32#endif 30#endif
33 31#include "config.h"
32#include "gcc_extensions.h"
34 33
35#undef MAX_PATH /* this avoids problems when building simulator */ 34#undef MAX_PATH /* this avoids problems when building simulator */
36#define MAX_PATH 260 35#define MAX_PATH 260
37#define MAX_OPEN_FILES 11
38 36
39#if !defined(PLUGIN) && !defined(CODEC) 37enum relate_result
40#if defined(APPLICATION) && !defined(__PCTOOL__) 38{
41#include "rbpaths.h" 39 /* < 0 == failure */
42# define open(x, ...) app_open(x, __VA_ARGS__) 40 RELATE_DIFFERENT = 0, /* the two paths are different objects */
43# define creat(x,m) app_creat(x, m) 41 RELATE_SAME, /* the two paths are the same object */
44# define remove(x) app_remove(x) 42 RELATE_PREFIX, /* the path2 contains path1 as a prefix */
45# define rename(x,y) app_rename(x,y) 43};
46# define readlink(x,y,z) app_readlink(x,y,z)
47# if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
48/* SDL overrides a few more */
49# define read(x,y,z) sim_read(x,y,z)
50# define write(x,y,z) sim_write(x,y,z)
51# endif
52#elif defined(SIMULATOR) || defined(DBTOOL)
53# define open(x, ...) sim_open(x, __VA_ARGS__)
54# define creat(x,m) sim_creat(x,m)
55# define remove(x) sim_remove(x)
56# define rename(x,y) sim_rename(x,y)
57# define fsync(x) sim_fsync(x)
58# define ftruncate(x,y) sim_ftruncate(x,y)
59# define lseek(x,y,z) sim_lseek(x,y,z)
60# define read(x,y,z) sim_read(x,y,z)
61# define write(x,y,z) sim_write(x,y,z)
62# define close(x) sim_close(x)
63/* readlink() not used in the sim yet */
64extern int sim_open(const char *name, int o, ...);
65extern int sim_creat(const char *name, mode_t mode);
66#endif
67 44
68typedef int (*open_func)(const char* pathname, int flags, ...); 45#if defined(APPLICATION)
69typedef ssize_t (*read_func)(int fd, void *buf, size_t count); 46#include "filesystem-app.h"
70typedef int (*creat_func)(const char *pathname, mode_t mode); 47#elif defined(SIMULATOR) || defined(__PCTOOL__)
71typedef ssize_t (*write_func)(int fd, const void *buf, size_t count); 48#include "../../uisimulator/common/filesystem-sim.h"
72typedef void (*qsort_func)(void *base, size_t nmemb, size_t size, 49#else
73 int(*_compar)(const void *, const void *)); 50#include "filesystem-native.h"
51#endif
74 52
75extern int file_open(const char* pathname, int flags); 53#ifndef FILEFUNCTIONS_DECLARED
76extern int close(int fd); 54int fdprintf(int fildes, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
77extern int fsync(int fd); 55#endif /* FILEFUNCTIONS_DECLARED */
78extern ssize_t read(int fd, void *buf, size_t count);
79extern off_t lseek(int fildes, off_t offset, int whence);
80extern int file_creat(const char *pathname);
81#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(__PCTOOL__)) || \
82 defined(TEST_FAT)
83#define creat(x, y) file_creat(x)
84 56
85#if !defined(CODEC) && !defined(PLUGIN) 57#ifndef FILEFUNCTIONS_DEFINED
86#define open(x, y, ...) file_open(x,y) 58#ifndef open
59#define open FS_PREFIX(open)
87#endif 60#endif
61#ifndef creat
62#define creat FS_PREFIX(creat)
88#endif 63#endif
89 64#ifndef close
90extern ssize_t write(int fd, const void *buf, size_t count); 65#define close FS_PREFIX(close)
91extern int remove(const char* pathname); 66#endif
92extern int rename(const char* path, const char* newname); 67#ifndef ftruncate
93extern int ftruncate(int fd, off_t length); 68#define ftruncate FS_PREFIX(ftruncate)
94extern off_t filesize(int fd); 69#endif
95extern int release_files(int volume); 70#ifndef fsync
96int fdprintf (int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); 71#define fsync FS_PREFIX(fsync)
97#endif /* !CODEC && !PLUGIN */
98#endif 72#endif
73#ifndef lseek
74#define lseek FS_PREFIX(lseek)
75#endif
76#ifndef read
77#define read FS_PREFIX(read)
78#endif
79#ifndef write
80#define write FS_PREFIX(write)
81#endif
82#ifndef remove
83#define remove FS_PREFIX(remove)
84#endif
85#ifndef rename
86#define rename FS_PREFIX(rename)
87#endif
88#ifndef filesize
89#define filesize FS_PREFIX(filesize)
90#endif
91#ifndef fsamefile
92#define fsamefile FS_PREFIX(fsamefile)
93#endif
94#ifndef file_exists
95#define file_exists FS_PREFIX(file_exists)
96#endif
97#ifndef relate
98#define relate FS_PREFIX(relate)
99#endif
100#ifndef readlink
101#define readlink FS_PREFIX(readlink)
102#endif
103#endif /* FILEFUNCTIONS_DEFINED */
104
105#endif /* _FILE_H_ */