summaryrefslogtreecommitdiff
path: root/apps/plugin.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 /apps/plugin.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 'apps/plugin.h')
-rw-r--r--apps/plugin.h45
1 files changed, 23 insertions, 22 deletions
diff --git a/apps/plugin.h b/apps/plugin.h
index 8b8481b6ac..e55dcf13cb 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -75,7 +75,7 @@ void* plugin_get_buffer(size_t *buffer_size);
75#include "profile.h" 75#include "profile.h"
76#endif 76#endif
77#include "misc.h" 77#include "misc.h"
78#include "filefuncs.h" 78#include "pathfuncs.h"
79#if (CONFIG_CODEC == SWCODEC) 79#if (CONFIG_CODEC == SWCODEC)
80#include "pcm_mixer.h" 80#include "pcm_mixer.h"
81#include "dsp-util.h" 81#include "dsp-util.h"
@@ -160,12 +160,12 @@ void* plugin_get_buffer(size_t *buffer_size);
160#define PLUGIN_MAGIC 0x526F634B /* RocK */ 160#define PLUGIN_MAGIC 0x526F634B /* RocK */
161 161
162/* increase this every time the api struct changes */ 162/* increase this every time the api struct changes */
163#define PLUGIN_API_VERSION 231 163#define PLUGIN_API_VERSION 232
164 164
165/* update this to latest version if a change to the api struct breaks 165/* update this to latest version if a change to the api struct breaks
166 backwards compatibility (and please take the opportunity to sort in any 166 backwards compatibility (and please take the opportunity to sort in any
167 new function which are "waiting" at the end of the function table) */ 167 new function which are "waiting" at the end of the function table) */
168#define PLUGIN_MIN_API_VERSION 231 168#define PLUGIN_MIN_API_VERSION 232
169 169
170/* plugin return codes */ 170/* plugin return codes */
171/* internal returns start at 0x100 to make exit(1..255) work */ 171/* internal returns start at 0x100 to make exit(1..255) work */
@@ -433,17 +433,17 @@ struct plugin_api {
433 433
434 /* file */ 434 /* file */
435 int (*open_utf8)(const char* pathname, int flags); 435 int (*open_utf8)(const char* pathname, int flags);
436 int (*open)(const char* pathname, int flags, ...); 436 int (*open)(const char *path, int oflag, ...);
437 int (*close)(int fd); 437 int (*creat)(const char *path, mode_t mode);
438 ssize_t (*read)(int fd, void* buf, size_t count); 438 int (*close)(int fildes);
439 off_t (*lseek)(int fd, off_t offset, int whence); 439 ssize_t (*read)(int fildes, void *buf, size_t nbyte);
440 int (*creat)(const char *pathname, mode_t mode); 440 off_t (*lseek)(int fildes, off_t offset, int whence);
441 ssize_t (*write)(int fd, const void* buf, size_t count); 441 ssize_t (*write)(int fildes, const void *buf, size_t nbyte);
442 int (*remove)(const char* pathname); 442 int (*remove)(const char *path);
443 int (*rename)(const char* path, const char* newname); 443 int (*rename)(const char *old, const char *new);
444 int (*ftruncate)(int fd, off_t length); 444 int (*ftruncate)(int fildes, off_t length);
445 off_t (*filesize)(int fd); 445 off_t (*filesize)(int fildes);
446 int (*fdprintf)(int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); 446 int (*fdprintf)(int fildes, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
447 int (*read_line)(int fd, char* buffer, int buffer_size); 447 int (*read_line)(int fd, char* buffer, int buffer_size);
448 bool (*settings_parseline)(char* line, char** name, char** value); 448 bool (*settings_parseline)(char* line, char** name, char** value);
449 void (*storage_sleep)(void); 449 void (*storage_sleep)(void);
@@ -457,7 +457,7 @@ struct plugin_api {
457 char *(*create_numbered_filename)(char *buffer, const char *path, 457 char *(*create_numbered_filename)(char *buffer, const char *path,
458 const char *prefix, const char *suffix, 458 const char *prefix, const char *suffix,
459 int numberlen IF_CNFN_NUM_(, int *num)); 459 int numberlen IF_CNFN_NUM_(, int *num));
460 bool (*file_exists)(const char *file); 460 bool (*file_exists)(const char *path);
461 char* (*strip_extension)(char* buffer, int buffer_size, const char *filename); 461 char* (*strip_extension)(char* buffer, int buffer_size, const char *filename);
462 uint32_t (*crc_32)(const void *src, uint32_t len, uint32_t crc32); 462 uint32_t (*crc_32)(const void *src, uint32_t len, uint32_t crc32);
463 463
@@ -466,13 +466,13 @@ struct plugin_api {
466 466
467 467
468 /* dir */ 468 /* dir */
469 DIR* (*opendir)(const char* name); 469 DIR * (*opendir)(const char *dirname);
470 int (*closedir)(DIR* dir); 470 int (*closedir)(DIR *dirp);
471 struct dirent* (*readdir)(DIR* dir); 471 struct dirent * (*readdir)(DIR *dirp);
472 int (*mkdir)(const char *name); 472 int (*mkdir)(const char *path);
473 int (*rmdir)(const char *name); 473 int (*rmdir)(const char *path);
474 bool (*dir_exists)(const char *path); 474 bool (*dir_exists)(const char *dirname);
475 struct dirinfo (*dir_get_info)(DIR* parent, struct dirent *entry); 475 struct dirinfo (*dir_get_info)(DIR *dirp, struct dirent *entry);
476 476
477 /* browsing */ 477 /* browsing */
478 void (*browse_context_init)(struct browse_context *browse, 478 void (*browse_context_init)(struct browse_context *browse,
@@ -838,6 +838,7 @@ struct plugin_api {
838 int (*kbd_input)(char* buffer, int buflen); 838 int (*kbd_input)(char* buffer, int buflen);
839 struct tm* (*get_time)(void); 839 struct tm* (*get_time)(void);
840 int (*set_time)(const struct tm *tm); 840 int (*set_time)(const struct tm *tm);
841 struct tm * (*gmtime_r)(const time_t *timep, struct tm *tm);
841#if CONFIG_RTC 842#if CONFIG_RTC
842 time_t (*mktime)(struct tm *t); 843 time_t (*mktime)(struct tm *t);
843#endif 844#endif