TheCloud/f3
1
0
Fork 0
mirror of https://github.com/AltraMayor/f3.git synced 2025-08-04 02:55:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

f3probe: use unit blocks instead of sectors

Browse Source 
f3proble is block aware, so there's no reason to use sectors.
Moreover, thanks to the last-good-sector field,
sector numbers are no longer useful.
This commit is contained in:
Michel Machado 2014-12-17 09:54:24 -05:00
parent d603f2e90a
commit 95c3f8110d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
f3probe.c
View File

@ -323,20 +323,19 @@ static int unit_test(const char *filename)
return 0; return 0;
} }
static void report_size(const char *prefix, uint64_t bytes) static void report_size(const char *prefix, uint64_t bytes, int block_order)
{ {
double f = bytes; double f = bytes;
const char *unit = adjust_unit(&f); const char *unit = adjust_unit(&f);
assert(bytes % SECTOR_SIZE == 0); printf("%s %.2f %s (%" PRIu64 " blocks)\n", prefix, f, unit,
printf("%s %.2f %s (%" PRIu64 " sector)\n", prefix, f, unit, bytes >> block_order);
bytes / SECTOR_SIZE);
} }
static void report_order(const char *prefix, int order) static void report_order(const char *prefix, int order)
{ {
double f = (1ULL << order); double f = (1ULL << order);
const char *unit = adjust_unit(&f); const char *unit = adjust_unit(&f);
printf("%s %.2f %s (2^%i Byte)\n", prefix, f, unit, order); printf("%s %.2f %s (2^%i Bytes)\n", prefix, f, unit, order);
} }
static void report_sector(const char *prefix, uint64_t sector) static void report_sector(const char *prefix, uint64_t sector)
@ -451,8 +450,8 @@ static int test_device(struct args *args)
time_s = (t2.tv_sec - t1.tv_sec) + (t2.tv_usec - t1.tv_usec)/1000000.; time_s = (t2.tv_sec - t1.tv_sec) + (t2.tv_usec - t1.tv_usec)/1000000.;
printf("\nDevice geometry:\n"); printf("\nDevice geometry:\n");
report_size("\t *Real* size:", real_size_byte); report_size("\t *Real* size:", real_size_byte, block_order);
report_size("\t Announced size:", announced_size_byte); report_size("\t Announced size:", announced_size_byte, block_order);
report_order("\t Module:", wrap); report_order("\t Module:", wrap);
report_order("\t Block size:", block_order); report_order("\t Block size:", block_order);
assert(block_order >= 9); assert(block_order >= 9);