Adds dry command for speed measurement.

HISTORY

@@ -1,6 +1,10 @@
 SnapRAID HISTORY
 ================
 
+0.4 2011/4
+==========
+* Added hidden 'dry' command mainly for speed measurement.
+
 0.3 2011/4
 ==========
 * Added --filter option to select a subset of file in check and fix.

Makefile.am

@@ -10,6 +10,7 @@ snapraid_SOURCES = \
 	scan.c \
 	sync.c \
 	check.c \
+	dry.c \
 	parity.c \
 	handle.c \
 	fnmatch.c
@@ -75,6 +76,8 @@ check-local:
 	$(TESTENV) ./mktest$(EXEEXT) generate 2 3 1000 4000
 	$(TESTENV) ./snapraid$(EXEEXT) -v -c $(srcdir)/test.conf sync
 	$(TESTENV) ./snapraid$(EXEEXT) -c $(srcdir)/test.conf check
+	echo --- Dry
+	$(TESTENV) ./snapraid$(EXEEXT) -c $(srcdir)/test.conf dry
 	echo --- Delete some files and create some new, sync and check
 	rm test/disk1/1*
 	rm test/disk2/2*

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.65])
-AC_INIT([snapraid], [0.3], [], [], [http://snapraid.sourceforge.net])
+AC_INIT([snapraid], [0.4], [], [], [http://snapraid.sourceforge.net])
 AM_INIT_AUTOMAKE([foreign no-dependencies -Wall])
 AC_CONFIG_SRCDIR([snapraid.c])
 AC_CONFIG_HEADER([config.h])

dry.c

@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2011 Andrea Mazzoleni
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "portable.h"
+
+#include "util.h"
+#include "elem.h"
+#include "state.h"
+#include "parity.h"
+#include "handle.h"
+
+/****************************************************************************/
+/* dry */
+
+static int state_dry_process(struct snapraid_state* state, int parity_f, block_off_t blockstart, block_off_t blockmax)
+{
+	struct snapraid_handle* handle;
+	unsigned diskmax = tommy_array_size(&state->diskarr);
+	block_off_t i;
+	unsigned j;
+	unsigned char* block_buffer;
+	int ret;
+	data_off_t countsize;
+	block_off_t countpos;
+	block_off_t countmax;
+	time_t start;
+	time_t last;
+	unsigned error;
+
+	block_buffer = malloc_nofail(state->block_size);
+
+	handle = malloc_nofail(diskmax * sizeof(struct snapraid_handle));
+	for(i=0;i<diskmax;++i) {
+		handle[i].disk = tommy_array_get(&state->diskarr, i);
+		handle[i].file = 0;
+		handle[i].f = -1;
+	}
+	error = 0;
+
+	countmax = blockmax - blockstart;
+	countsize = 0;
+	countpos = 0;
+	start = time(0);
+	last = start;
+	for(i=blockstart;i<blockmax;++i) {
+		/* for each disk, process the block */
+		for(j=0;j<diskmax;++j) {
+			int read_size;
+			struct snapraid_block* block;
+
+			block = disk_block_get(handle[j].disk, i);
+			if (!block)
+				continue;
+
+			ret = handle_close_if_different(&handle[j], block->file);
+			if (ret == -1) {
+				fprintf(stderr, "Stopping at block %u\n", i);
+				++error;
+				goto bail;
+			}
+
+			/* open the file for reading */
+			ret = handle_open(&handle[j], block->file);
+			if (ret == -1) {
+				fprintf(stderr, "%u: Open error for file %s at position %u\n", i, block->file->sub, block_file_pos(block));
+				++error;
+				continue;
+			}
+
+			read_size = handle_read(&handle[j], block, block_buffer, state->block_size);
+			if (read_size == -1) {
+				fprintf(stderr, "%u: Read error for file %s at position %u\n", i, block->file->sub, block_file_pos(block));
+				++error;
+				continue;
+			}
+
+			countsize += read_size;
+		}
+
+		/* read the parity */
+		ret = parity_read(state->parity, parity_f, i, block_buffer, state->block_size);
+		if (ret == -1) {
+			fprintf(stderr, "%u: Parity read error\n", i);
+			++error;
+		}
+
+		/* count the number of processed block */
+		++countpos;
+
+		/* progress */
+		if (state_progress(&start, &last, countpos, countmax, countsize)) {
+			printf("Stopping for interruption at block %u\n", i);
+			break;
+		}
+	}
+
+	if (countmax)
+		printf("%u%% completed, %u MiB processed\n", countpos * 100 / countmax, (unsigned)(countsize / (1024*1024)));
+	else
+		printf("Nothing to do\n");
+
+bail:
+	for(j=0;j<diskmax;++j) {
+		ret = handle_close(&handle[j]);
+		if (ret == -1) {
+			++error;
+		}
+	}
+
+	if (error) {
+		if (error)
+			printf("%u read errors\n", error);
+		else
+			printf("No read errors\n");
+	} else {
+		printf("No error\n");
+	}
+
+	free(handle);
+	free(block_buffer);
+
+	if (error != 0)
+		return -1;
+	return 0;
+}
+
+void state_dry(struct snapraid_state* state, block_off_t blockstart, block_off_t blockcount)
+{
+	char path[PATH_MAX];
+	block_off_t blockmax;
+	data_off_t size;
+	int ret;
+	int f;
+	unsigned unrecoverable_error;
+
+	printf("Drying...\n");
+
+	blockmax = parity_resize(state);
+	size = blockmax * (data_off_t)state->block_size;
+
+	if (blockstart > blockmax) {
+		fprintf(stderr, "Error in the specified starting block %u. It's bigger than the parity size %u.\n", blockstart, blockmax);
+		exit(EXIT_FAILURE);
+	}
+
+	/* adjust the number of block to process */
+	if (blockcount != 0 && blockstart + blockcount < blockmax) {
+		blockmax = blockstart + blockcount;
+	}
+
+	pathcpy(path, sizeof(path), state->parity);
+	/* if drying, open the file for reading */
+	/* it may fail if the file doesn't exist, in this case we continue to dry the files */
+	f = parity_open(path);
+	if (f == -1) {
+		printf("No accessible parity file.\n");
+		/* continue anyway */
+	}
+
+	unrecoverable_error = 0;
+
+	/* skip degenerated cases of empty parity, or skipping all */
+	if (blockstart < blockmax) {
+		ret = state_dry_process(state, f, blockstart, blockmax);
+		if (ret == -1) {
+			++unrecoverable_error;
+			/* continue, as we are already exiting */
+		}
+	}
+
+	/* try to close only if opened */
+	if (f != -1) {
+		ret = parity_close(path, f);
+		if (ret == -1) {
+			++unrecoverable_error;
+			/* continue, as we are already exiting */
+		}
+	}
+
+	/* abort if required */
+	if (unrecoverable_error != 0)
+		exit(EXIT_FAILURE);
+}
+

snapraid.c

@@ -166,6 +166,7 @@ void signal_handler(int signal)
 #define OPERATION_SYNC 0
 #define OPERATION_CHECK 1
 #define OPERATION_FIX 2
+#define OPERATION_DRY 3
 
 int main(int argc, char* argv[])
 {
@@ -257,6 +258,8 @@ int main(int argc, char* argv[])
 		operation = OPERATION_CHECK;
 	} else  if (strcmp(argv[optind], "fix") == 0) {
 		operation = OPERATION_FIX;
+	} else  if (strcmp(argv[optind], "dry") == 0) {
+		operation = OPERATION_DRY;
 	} else {
 		fprintf(stderr, "Unknown command '%s'\n", argv[optind]);
 		exit(EXIT_FAILURE);
@@ -269,7 +272,6 @@ int main(int argc, char* argv[])
 	state_config(&state, conf, verbose, force_zero, force_empty);
 
 	if (operation == OPERATION_SYNC) {
-
 		if (!tommy_list_empty(&filterlist)) {
 			fprintf(stderr, "You cannot filter with the sync command\n");
 			exit(EXIT_FAILURE);
@@ -291,6 +293,15 @@ int main(int argc, char* argv[])
 		/* abort if required by the sync command */
 		if (ret == -1)
 			exit(EXIT_FAILURE);
+	} else if (operation == OPERATION_DRY) {
+		state_read(&state);
+
+		state_filter(&state, &filterlist);
+
+		/* intercept Ctrl+C */
+		signal(SIGINT, &signal_handler);
+
+		state_dry(&state, blockstart, blockcount);
 	} else {
 		state_read(&state);
 

state.h

@@ -78,6 +78,11 @@ int state_sync(struct snapraid_state* state, block_off_t blockstart, block_off_t
  */
 void state_check(struct snapraid_state* state, int fix, block_off_t blockstart, block_off_t blockcount);
 
+/**
+ * Read the files.
+ */
+void state_dry(struct snapraid_state* state, block_off_t blockstart, block_off_t blockcount);
+
 /**
  * Filter files.
  */