rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prints time stat also in dry.

Browse source
This commit is contained in:
Andrea Mazzoleni 2014-09-08 21:24:11 +02:00
parent 4adcf7c5cc
commit 3db0c5e967
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cmdline/dry.c
View file

@ -47,7 +47,9 @@ static int state_dry_process(struct snapraid_state* state, struct snapraid_parit
error = 0;
/* dry all the blocks in files */
/* drop until now */
state_usage_waste(state);
countmax = blockmax - blockstart;
countsize = 0;
countpos = 0;
@ -57,15 +59,19 @@ static int state_dry_process(struct snapraid_state* state, struct snapraid_parit
for(j=0;j<diskmax;++j) {
int read_size;
struct snapraid_block* block = BLOCK_EMPTY;
struct snapraid_disk* disk = handle[j].disk;
if (handle[j].disk)
block = disk_block_get(handle[j].disk, i);
if (disk)
block = disk_block_get(disk, i);
if (!block_has_file(block)) {
/* if no file, nothing to do */
continue;
}
/* until now is CPU */
state_usage_cpu(state);
/* if the file is closed or different than the current one */
if (handle[j].file == 0 || handle[j].file != block_file_get(block)) {
/* close the old one, if any */
@ -94,22 +100,31 @@ static int state_dry_process(struct snapraid_state* state, struct snapraid_parit
/* read from the file */
read_size = handle_read(&handle[j], block, buffer_aligned, state->block_size, stdlog);
if (read_size == -1) {
fprintf(stdlog, "error:%u:%s:%s: Read error at position %u\n", i, handle[j].disk->name, block_file_get(block)->sub, block_file_pos(block));
fprintf(stdlog, "error:%u:%s:%s: Read error at position %u\n", i, disk->name, block_file_get(block)->sub, block_file_pos(block));
++error;
continue;
}
/* until now is disk */
state_usage_disk(state, disk);
countsize += read_size;
}
/* read the parity */
for(l=0;l<state->level;++l) {
if (parity[l]) {
/* until now is CPU */
state_usage_cpu(state);
ret = parity_read(parity[l], i, buffer_aligned, state->block_size, stdlog);
if (ret == -1) {
fprintf(stdlog, "parity_error:%u:%s: Read error\n", i, lev_config_name(l));
++error;
}
/* until now is parity */
state_usage_parity(state, l);
}
}
@ -126,6 +141,8 @@ static int state_dry_process(struct snapraid_state* state, struct snapraid_parit
state_progress_end(state, countpos, countmax, countsize);
state_usage_print(state);
bail:
/* close all the files left open */
for(j=0;j<diskmax;++j) {