Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/f3brew.c
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ static void print_fix_cmd(const char *filename,
}

/* XXX Properly handle return errors. */
static void test_read_blocks(struct device *dev,
static int test_read_blocks(struct device *dev,
uint64_t first_block, uint64_t last_block,
long max_read_rate, int show_progress, bool fix_cmd)
{
Expand All @@ -544,6 +544,10 @@ static void test_read_blocks(struct device *dev,

if (fix_cmd)
print_fix_cmd(dev_get_filename(dev), &good_range);

if (stats.bad || stats.changed || stats.overwritten)
return 1;
return 0;
}

int main(int argc, char **argv)
Expand Down Expand Up @@ -572,6 +576,7 @@ int main(int argc, char **argv)
struct device *dev;
unsigned int block_order;
uint64_t very_last_block;
int ret = 0;

/* Read parameters. */
argp_parse(&argp, argc, argv, 0, NULL, &args);
Expand Down Expand Up @@ -612,9 +617,9 @@ int main(int argc, char **argv)
}

if (args.test_read)
test_read_blocks(dev, args.first_block, args.last_block,
ret = test_read_blocks(dev, args.first_block, args.last_block,
args.max_read_rate, args.show_progress, args.fix_cmd);

free_device(dev);
return 0;
return ret;
}
8 changes: 5 additions & 3 deletions src/f3read.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ static uint64_t get_total_blocks(const char *path, const uint64_t *files,
return total_blocks;
}

static void iterate_files(const char *path, const uint64_t *files,
static int iterate_files(const char *path, const uint64_t *files,
uint64_t start_at, uint64_t end_at, uint64_t max_read_rate,
int progress)
{
Expand Down Expand Up @@ -421,11 +421,13 @@ static void iterate_files(const char *path, const uint64_t *files,
print_avg_seq_speed(&fw, "read", true);

dbuf_free(&dbuf);
return !!((uint64_t)tot_stats.bad + tot_stats.changed + tot_stats.overwritten) || !and_read_all;
}

int main(int argc, char **argv)
{
const uint64_t *files;
int ret = 0;

struct args args = {
/* Defaults. */
Expand All @@ -444,8 +446,8 @@ int main(int argc, char **argv)

files = ls_my_files(args.dev_path, args.start_at, args.end_at);

iterate_files(args.dev_path, files, args.start_at, args.end_at,
ret = iterate_files(args.dev_path, files, args.start_at, args.end_at,
args.max_read_rate, args.show_progress);
free((void *)files);
return 0;
return ret;
}