summaryrefslogtreecommitdiff
path: root/firmware/include/dircache_redirect.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/dircache_redirect.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/dircache_redirect.h')
-rw-r--r--firmware/include/dircache_redirect.h198
1 files changed, 198 insertions, 0 deletions
diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h
new file mode 100644
index 0000000000..15fb4bc38d
--- /dev/null
+++ b/firmware/include/dircache_redirect.h
@@ -0,0 +1,198 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2014 by Michael Sevakis
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21#ifndef _DIRCACHE_REDIRECT_H_
22
23#include "dir.h"
24
25/***
26 ** Internal redirects that depend upon whether or not dircache is made
27 **/
28
29/** File binding **/
30
31static inline void get_rootinfo_internal(struct file_base_info *infop)
32{
33#ifdef HAVE_DIRCACHE
34 dircache_get_rootinfo(infop);
35#else
36 (void)infop;
37#endif
38}
39
40static inline void fileobj_bind_file(struct file_base_binding *bindp)
41{
42#ifdef HAVE_DIRCACHE
43 dircache_bind_file(bindp);
44#else
45 file_binding_insert_last(bindp);
46#endif
47}
48
49static inline void fileobj_unbind_file(struct file_base_binding *bindp)
50{
51#ifdef HAVE_DIRCACHE
52 dircache_unbind_file(bindp);
53#else
54 file_binding_remove(bindp);
55#endif
56}
57
58
59/** File event handlers **/
60
61static inline void fileop_onopen_internal(struct filestr_base *stream,
62 struct file_base_info *srcinfop,
63 unsigned int callflags)
64{
65 fileobj_fileop_open(stream, srcinfop, callflags);
66}
67
68static inline void fileop_onclose_internal(struct filestr_base *stream)
69{
70 fileobj_fileop_close(stream);
71}
72
73static inline void fileop_oncreate_internal(struct filestr_base *stream,
74 struct file_base_info *srcinfop,
75 unsigned int callflags,
76 struct file_base_info *dirinfop,
77 const char *basename)
78{
79#ifdef HAVE_DIRCACHE
80 dircache_dcfile_init(&srcinfop->dcfile);
81#endif
82 fileobj_fileop_create(stream, srcinfop, callflags);
83#ifdef HAVE_DIRCACHE
84 struct dirinfo_native din;
85 fill_dirinfo_native(&din);
86 dircache_fileop_create(dirinfop, stream->bindp, basename, &din);
87#endif
88 (void)dirinfop; (void)basename;
89}
90
91static inline void fileop_onremove_internal(struct filestr_base *stream,
92 struct file_base_info *oldinfop)
93{
94 fileobj_fileop_remove(stream, oldinfop);
95#ifdef HAVE_DIRCACHE
96 dircache_fileop_remove(stream->bindp);
97#endif
98}
99
100static inline void fileop_onrename_internal(struct filestr_base *stream,
101 struct file_base_info *oldinfop,
102 struct file_base_info *dirinfop,
103 const char *basename)
104{
105 fileobj_fileop_rename(stream, oldinfop);
106#ifdef HAVE_DIRCACHE
107 dircache_fileop_rename(dirinfop, stream->bindp, basename);
108#endif
109 (void)dirinfop; (void)basename;
110}
111
112static inline void fileop_onsync_internal(struct filestr_base *stream)
113{
114 fileobj_fileop_sync(stream);
115#ifdef HAVE_DIRCACHE
116 struct dirinfo_native din;
117 fill_dirinfo_native(&din);
118 dircache_fileop_sync(stream->bindp, &din);
119#endif
120}
121
122static inline void fileop_ontruncate_internal(struct filestr_base *stream)
123{
124 fileobj_fileop_truncate(stream);
125}
126
127static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
128{
129#ifdef HAVE_DIRCACHE
130 dircache_mount();
131#endif
132 IF_MV( (void)volume; )
133}
134
135static inline void volume_onunmount_internal(IF_MV_NONVOID(int volume))
136{
137 fileobj_mgr_unmount(IF_MV(volume));
138#ifdef HAVE_DIRCACHE
139 dircache_unmount(IF_MV(volume));
140#endif
141}
142
143
144/** Directory reading **/
145
146static inline int readdir_dirent(struct filestr_base *stream,
147 struct dirscan_info *scanp,
148 struct dirent *entry)
149{
150#ifdef HAVE_DIRCACHE
151 return dircache_readdir_dirent(stream, scanp, entry);
152#else
153 return uncached_readdir_dirent(stream, scanp, entry);
154#endif
155}
156
157static inline void rewinddir_dirent(struct dirscan_info *scanp)
158{
159#ifdef HAVE_DIRCACHE
160 dircache_rewinddir_dirent(scanp);
161#else
162 uncached_rewinddir_dirent(scanp);
163#endif
164}
165
166static inline int readdir_internal(struct filestr_base *stream,
167 struct file_base_info *infop,
168 struct fat_direntry *fatent)
169{
170#ifdef HAVE_DIRCACHE
171 return dircache_readdir_internal(stream, infop, fatent);
172#else
173 return uncached_readdir_internal(stream, infop, fatent);
174#endif
175}
176
177static inline void rewinddir_internal(struct file_base_info *infop)
178{
179#ifdef HAVE_DIRCACHE
180 dircache_rewinddir_internal(infop);
181#else
182 uncached_rewinddir_internal(infop);
183#endif
184}
185
186
187/** Misc. stuff **/
188
189static inline struct fat_direntry *get_dir_fatent_dircache(void)
190{
191#ifdef HAVE_DIRCACHE
192 return get_dir_fatent();
193#else
194 return NULL;
195#endif
196}
197
198#endif /* _DIRCACHE_REDIRECT_H_ */