summaryrefslogtreecommitdiff
path: root/apps/debug_menu.c
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/debug_menu.c
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/debug_menu.c')
-rw-r--r--apps/debug_menu.c86
1 files changed, 63 insertions, 23 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 61698f5025..75e23b3945 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -528,14 +528,19 @@ static const char* dbg_partitions_getname(int selected_item, void *data,
528{ 528{
529 (void)data; 529 (void)data;
530 int partition = selected_item/2; 530 int partition = selected_item/2;
531 struct partinfo* p = disk_partinfo(partition); 531
532 struct partinfo p;
533 if (!disk_partinfo(partition, &p))
534 return buffer;
535
532 if (selected_item%2) 536 if (selected_item%2)
533 { 537 {
534 snprintf(buffer, buffer_len, " T:%x %ld MB", p->type, p->size / ( 2048 / ( SECTOR_SIZE / 512 ))); 538 snprintf(buffer, buffer_len, " T:%x %ld MB", p.type,
539 p.size / ( 2048 / ( SECTOR_SIZE / 512 )));
535 } 540 }
536 else 541 else
537 { 542 {
538 snprintf(buffer, buffer_len, "P%d: S:%lx", partition, p->start); 543 snprintf(buffer, buffer_len, "P%d: S:%lx", partition, p.start);
539 } 544 }
540 return buffer; 545 return buffer;
541} 546}
@@ -1377,7 +1382,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
1377 simplelist_addline( 1382 simplelist_addline(
1378 "Size: %s", buf); 1383 "Size: %s", buf);
1379 unsigned long free; 1384 unsigned long free;
1380 fat_size( IF_MV(0,) NULL, &free ); 1385 volume_size( IF_MV(0,) NULL, &free );
1381 simplelist_addline( 1386 simplelist_addline(
1382 "Free: %ld MB", free / 1024); 1387 "Free: %ld MB", free / 1024);
1383 simplelist_addline( 1388 simplelist_addline(
@@ -1469,7 +1474,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
1469 "No timing info"); 1474 "No timing info");
1470 } 1475 }
1471 simplelist_addline( 1476 simplelist_addline(
1472 "Cluster size: %d bytes", fat_get_cluster_size(IF_MV(0))); 1477 "Cluster size: %d bytes", volume_get_cluster_size(IF_MV(0)));
1473#ifdef HAVE_ATA_DMA 1478#ifdef HAVE_ATA_DMA
1474 i = ata_get_dma_mode(); 1479 i = ata_get_dma_mode();
1475 if (i == 0) { 1480 if (i == 0) {
@@ -1496,11 +1501,11 @@ static int disk_callback(int btn, struct gui_synclist *lists)
1496 simplelist_addline( 1501 simplelist_addline(
1497 "Size: %ld MB", info.num_sectors*(info.sector_size/512)/2024); 1502 "Size: %ld MB", info.num_sectors*(info.sector_size/512)/2024);
1498 unsigned long free; 1503 unsigned long free;
1499 fat_size( IF_MV(0,) NULL, &free ); 1504 volume_size( IF_MV(0,) NULL, &free );
1500 simplelist_addline( 1505 simplelist_addline(
1501 "Free: %ld MB", free / 1024); 1506 "Free: %ld MB", free / 1024);
1502 simplelist_addline( 1507 simplelist_addline(
1503 "Cluster size: %d bytes", fat_get_cluster_size(IF_MV(0))); 1508 "Cluster size: %d bytes", volume_get_cluster_size(IF_MV(0)));
1504 return btn; 1509 return btn;
1505} 1510}
1506#endif 1511#endif
@@ -1542,29 +1547,64 @@ static bool dbg_disk_info(void)
1542#ifdef HAVE_DIRCACHE 1547#ifdef HAVE_DIRCACHE
1543static int dircache_callback(int btn, struct gui_synclist *lists) 1548static int dircache_callback(int btn, struct gui_synclist *lists)
1544{ 1549{
1545 (void)lists; 1550 struct dircache_info info;
1551 dircache_get_info(&info);
1552
1553 if (global_settings.dircache)
1554 {
1555 switch (btn)
1556 {
1557 case ACTION_STD_CONTEXT:
1558 splash(HZ/2, "Rebuilding cache");
1559 dircache_suspend();
1560 *(int *)lists->data = dircache_resume();
1561 case ACTION_UNKNOWN:
1562 btn = ACTION_NONE;
1563 break;
1564 #ifdef DIRCACHE_DUMPSTER
1565 case ACTION_STD_OK:
1566 splash(0, "Dumping cache");
1567 dircache_dump();
1568 btn = ACTION_NONE;
1569 break;
1570 #endif /* DIRCACHE_DUMPSTER */
1571 case ACTION_STD_CANCEL:
1572 if (*(int *)lists->data > 0 && info.status == DIRCACHE_SCANNING)
1573 {
1574 splash(HZ, str(LANG_SCANNING_DISK));
1575 btn = ACTION_NONE;
1576 }
1577 break;
1578 }
1579 }
1580
1546 simplelist_set_line_count(0); 1581 simplelist_set_line_count(0);
1547 simplelist_addline("Cache initialized: %s", 1582
1548 dircache_is_enabled() ? "Yes" : "No"); 1583 simplelist_addline("Cache status: %s", info.statusdesc);
1549 simplelist_addline("Cache size: %d B", 1584 simplelist_addline("Last size: %lu B", info.last_size);
1550 dircache_get_cache_size()); 1585 simplelist_addline("Size: %lu B", info.size);
1551 simplelist_addline("Last size: %d B", 1586 unsigned int utilized = info.size ? 1000ull*info.sizeused / info.size : 0;
1552 global_status.dircache_size); 1587 simplelist_addline("Used: %lu B (%u.%u%%)", info.sizeused,
1553 simplelist_addline("Limit: %d B", 1588 utilized / 10, utilized % 10);
1554 DIRCACHE_LIMIT); 1589 simplelist_addline("Limit: %lu B", info.size_limit);
1555 simplelist_addline("Reserve: %d/%d B", 1590 simplelist_addline("Reserve: %lu/%lu B", info.reserve_used, info.reserve);
1556 dircache_get_reserve_used(), DIRCACHE_RESERVE); 1591 long ticks = ALIGN_UP(info.build_ticks, HZ / 10);
1557 simplelist_addline("Scanning took: %d s", 1592 simplelist_addline("Scanning took: %ld.%ld s",
1558 dircache_get_build_ticks() / HZ); 1593 ticks / HZ, (ticks*10 / HZ) % 10);
1559 simplelist_addline("Entry count: %d", 1594 simplelist_addline("Entry count: %u", info.entry_count);
1560 dircache_get_entry_count()); 1595
1596 if (btn == ACTION_NONE)
1597 btn = ACTION_REDRAW;
1598
1561 return btn; 1599 return btn;
1600 (void)lists;
1562} 1601}
1563 1602
1564static bool dbg_dircache_info(void) 1603static bool dbg_dircache_info(void)
1565{ 1604{
1566 struct simplelist_info info; 1605 struct simplelist_info info;
1567 simplelist_info_init(&info, "Dircache Info", 7, NULL); 1606 int syncbuild = 0;
1607 simplelist_info_init(&info, "Dircache Info", 8, &syncbuild);
1568 info.action_callback = dircache_callback; 1608 info.action_callback = dircache_callback;
1569 info.hide_selection = true; 1609 info.hide_selection = true;
1570 info.scroll_all = true; 1610 info.scroll_all = true;