summaryrefslogtreecommitdiff
path: root/firmware/include/dircache.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.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.h')
-rw-r--r--firmware/include/dircache.h209
1 files changed, 140 insertions, 69 deletions
diff --git a/firmware/include/dircache.h b/firmware/include/dircache.h
index 019ccf49b7..7e8c764e7f 100644
--- a/firmware/include/dircache.h
+++ b/firmware/include/dircache.h
@@ -8,6 +8,7 @@
8 * $Id$ 8 * $Id$
9 * 9 *
10 * Copyright (C) 2005 by Miika Pekkarinen 10 * Copyright (C) 2005 by Miika Pekkarinen
11 * Copyright (C) 2014 by Michael Sevakis
11 * 12 *
12 * This program is free software; you can redistribute it and/or 13 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License 14 * modify it under the terms of the GNU General Public License
@@ -21,84 +22,154 @@
21#ifndef _DIRCACHE_H 22#ifndef _DIRCACHE_H
22#define _DIRCACHE_H 23#define _DIRCACHE_H
23 24
24#include "config.h" 25#include "mv.h"
25#include "dir_uncached.h" 26#include <string.h> /* size_t */
26#include <string.h> /* size_t */ 27#include <sys/types.h> /* ssize_t */
27 28
28#ifdef HAVE_DIRCACHE 29#ifdef HAVE_DIRCACHE
29 30
30#define DIRCACHE_RESERVE (1024*64) 31/****************************************************************************
31#define DIRCACHE_LIMIT (1024*1024*6) 32 ** Configurable values
32 33 **/
33#define DIRCACHE_APPFLAG_TAGCACHE 0x0001 34
34#define DIRCACHE_APPFLAG_PLAYLIST 0x0002 35#if 0
35 36/* enable dumping code */
36/* Internal structures. */ 37#define DIRCACHE_DUMPSTER
37struct travel_data { 38#define DIRCACHE_DUMPSTER_BIN "/dircache_dump.bin"
38 struct dircache_entry *first; 39#define DIRCACHE_DUMPSTER_CSV "/dircache_dump.csv"
39 struct dircache_entry *ce;
40 struct dircache_entry *down_entry;
41#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
42 DIR_UNCACHED *dir, *newdir;
43 struct dirent_uncached *entry;
44#else
45 struct fat_dir *dir;
46 struct fat_dir newdir;
47 struct fat_direntry entry;
48#endif 40#endif
49 int pathpos; 41
42/* dircache builds won't search below this but will work down to this point
43 while below it the cache will just pass requests through to the storage;
44 the limiting factor is the scanning thread stack size, not the
45 implementation -- tune the two together */
46#define DIRCACHE_MAX_DEPTH 15
47#define DIRCACHE_STACK_SIZE (DEFAULT_STACK_SIZE + 0x100)
48
49/* memory buffer constants that control allocation */
50#define DIRCACHE_RESERVE (1024*64) /* 64 KB - new entry slack */
51#define DIRCACHE_MIN (1024*1024*1) /* 1 MB - provision min size */
52#define DIRCACHE_LIMIT (1024*1024*6) /* 6 MB - provision max size */
53
54/* make it easy to change serialnumber size without modifying anything else;
55 32 bits allows 21845 builds before wrapping in a 6MB cache that is filled
56 exclusively with entries and nothing else (32 byte entries), making that
57 figure pessimistic */
58typedef uint32_t dc_serial_t;
59
60/**
61 ****************************************************************************/
62
63#if CONFIG_PLATFORM & PLATFORM_NATIVE
64/* native dircache is lower-level than on a hosted target */
65#define DIRCACHE_NATIVE
66#endif
67
68struct dircache_file
69{
70 int idx; /* this file's cache index */
71 dc_serial_t serialnum; /* this file's serial number */
50}; 72};
51 73
52struct dirent_cached { 74enum dircache_status
53 struct dirinfo info; 75{
54 char *d_name; 76 DIRCACHE_IDLE = 0, /* no volume is initialized */
55 long startcluster; 77 DIRCACHE_SCANNING = 1, /* dircache is scanning a volume */
78 DIRCACHE_READY = 2, /* dircache is ready to be used */
79};
80
81/** Dircache control **/
82void dircache_wait(void);
83void dircache_suspend(void);
84int dircache_resume(void);
85int dircache_enable(void);
86void dircache_disable(void);
87void dircache_free_buffer(void);
88
89/** Volume mounting **/
90void dircache_mount(void); /* always tries building everything it can */
91void dircache_unmount(IF_MV_NONVOID(int volume));
92
93
94/** File API service functions **/
95
96/* avoid forcing #include of file_internal.h, fat.h and dir.h */
97struct filestr_base;
98struct file_base_info;
99struct file_base_binding;
100struct dirent;
101struct dirscan_info;
102struct dirinfo_native;
103
104int dircache_readdir_dirent(struct filestr_base *stream,
105 struct dirscan_info *scanp,
106 struct dirent *entry);
107void dircache_rewinddir_dirent(struct dirscan_info *scanp);
108
109#ifdef DIRCACHE_NATIVE
110struct fat_direntry;
111int dircache_readdir_internal(struct filestr_base *stream,
112 struct file_base_info *infop,
113 struct fat_direntry *fatent);
114void dircache_rewinddir_internal(struct file_base_info *info);
115#endif /* DIRCACHE_NATIVE */
116
117
118/** Dircache live updating **/
119
120void dircache_get_rootinfo(struct file_base_info *infop);
121void dircache_bind_file(struct file_base_binding *bindp);
122void dircache_unbind_file(struct file_base_binding *bindp);
123void dircache_fileop_create(struct file_base_info *dirinfop,
124 struct file_base_binding *bindp,
125 const char *basename,
126 const struct dirinfo_native *dinp);
127void dircache_fileop_rename(struct file_base_info *dirinfop,
128 struct file_base_binding *bindp,
129 const char *basename);
130void dircache_fileop_remove(struct file_base_binding *bindp);
131void dircache_fileop_sync(struct file_base_binding *infop,
132 const struct dirinfo_native *dinp);
133
134
135/** Dircache paths and files **/
136ssize_t dircache_get_path(const struct dircache_file *dcfilep, char *buf,
137 size_t size);
138int dircache_get_file(const char *path, struct dircache_file *dcfilep);
139
140
141/** Debug screen/info stuff **/
142
143struct dircache_info
144{
145 enum dircache_status status; /* current composite status value */
146 const char *statusdesc; /* pointer to string describing 'status' */
147 size_t last_size; /* cache size after last build */
148 size_t size; /* total size of entries (with holes) */
149 size_t sizeused; /* bytes of 'size' actually utilized */
150 size_t size_limit; /* maximum possible size */
151 size_t reserve; /* size of reserve area */
152 size_t reserve_used; /* amount of reserve used */
153 unsigned int entry_count; /* number of cache entries */
154 long build_ticks; /* total time used to build cache */
56}; 155};
57 156
58typedef struct { 157void dircache_get_info(struct dircache_info *info);
59 bool busy; 158#ifdef DIRCACHE_DUMPSTER
60 struct dirent_cached theent; /* .attribute is set to -1 on init(opendir) */ 159void dircache_dump(void);
61 int internal_entry; /* the current entry in the directory */ 160#endif /* DIRCACHE_DUMPSTER */
62 DIR_UNCACHED *regulardir; 161
63} DIR_CACHED;
64 162
65void dircache_init(void) INIT_ATTR; 163/** Misc. stuff **/
164void dircache_dcfile_init(struct dircache_file *dcfilep);
165
166#ifdef HAVE_EEPROM_SETTINGS
66int dircache_load(void); 167int dircache_load(void);
67int dircache_save(void); 168int dircache_save(void);
68int dircache_build(int last_size); 169#endif /* HAVE_EEPROM_SETTINGS */
69void* dircache_steal_buffer(size_t *size);
70bool dircache_is_enabled(void);
71bool dircache_is_initializing(void);
72void dircache_set_appflag(long mask);
73bool dircache_get_appflag(long mask);
74int dircache_get_entry_count(void);
75int dircache_get_cache_size(void);
76int dircache_get_reserve_used(void);
77int dircache_get_build_ticks(void);
78void dircache_disable(void);
79void dircache_suspend(void);
80bool dircache_resume(void);
81int dircache_get_entry_id(const char *filename);
82size_t dircache_copy_path(int index, char *buf, size_t size);
83
84/* the next two are internal for file.c */
85long _dircache_get_entry_startcluster(int id);
86struct dirinfo* _dircache_get_entry_dirinfo(int id);
87
88void dircache_bind(int fd, const char *path);
89void dircache_update_filesize(int fd, long newsize, long startcluster);
90void dircache_update_filetime(int fd);
91void dircache_mkdir(const char *path);
92void dircache_rmdir(const char *path);
93void dircache_remove(const char *name);
94void dircache_rename(const char *oldpath, const char *newpath);
95void dircache_add_file(const char *path, long startcluster);
96
97DIR_CACHED* opendir_cached(const char* name);
98struct dirent_cached* readdir_cached(DIR_CACHED* dir);
99int closedir_cached(DIR_CACHED *dir);
100int mkdir_cached(const char *name);
101int rmdir_cached(const char* name);
102#endif /* !HAVE_DIRCACHE */
103 170
104#endif 171void dircache_init(size_t last_size) INIT_ATTR;
172
173#endif /* HAVE_DIRCACHE */
174
175#endif /* _DIRCACHE_H */