domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fritz-tools: fritz_tffs_nand: cache already read sector ids

Browse Source 
This speeds up the tool significantly, especially when using the "-a"
argument.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider
2021-12-15 12:48:26 +01:00
committed by David Bauer
parent 902378dc87
commit 8138d66fcc
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package/utils/fritz-tools/src/fritz_tffs_nand_read.c
View File

@@ -75,6 +75,7 @@ static uint32_t blocksize;
static int mtdfd; static int mtdfd;
static uint32_t num_sectors; static uint32_t num_sectors;
static uint8_t *sectors; static uint8_t *sectors;
static uint32_t *sector_ids;
static inline void sector_mark_bad(int num) static inline void sector_mark_bad(int num)
{ {
@@ -135,6 +136,8 @@ static int read_sector(off_t pos)
return -1; return -1;
} }
sector_ids[pos / TFFS_SECTOR_SIZE] = read_uint32(readbuf, 0x00);
return 0; return 0;
} }
@@ -178,6 +181,17 @@ static int find_entry(uint32_t id, struct tffs_entry *entry)
block_end = 0; block_end = 0;
} }
} else if (sector_get_good(sector)) { } else if (sector_get_good(sector)) {
if (sector_ids[sector]) {
if (sector_ids[sector] == TFFS_ID_END) {
/* no more entries in this block */
block_end = 1;
continue;
}
if (sector_ids[sector] != id)
continue;
}
if (read_sectoroob(pos) || read_sector(pos)) { if (read_sectoroob(pos) || read_sector(pos)) {
fprintf(stderr, "ERROR: sector isn't readable, but has been previously!\n"); fprintf(stderr, "ERROR: sector isn't readable, but has been previously!\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -415,7 +429,8 @@ static int scan_mtd(void)
num_sectors = info.size / TFFS_SECTOR_SIZE; num_sectors = info.size / TFFS_SECTOR_SIZE;
sectors = malloc((num_sectors + 7) / 8); sectors = malloc((num_sectors + 7) / 8);
if (sectors == NULL) { sector_ids = calloc(num_sectors, sizeof(uint32_t));
if (!sectors || !sector_ids) {
fprintf(stderr, "ERROR: memory allocation failed!\n"); fprintf(stderr, "ERROR: memory allocation failed!\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@@ -563,6 +578,7 @@ int main(int argc, char *argv[])
out_free_entry: out_free_entry:
free(name_table.val); free(name_table.val);
out_free_sectors: out_free_sectors:
free(sector_ids);
free(sectors); free(sectors);
out_close: out_close:
close(mtdfd); close(mtdfd);