X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=54af136ad789314b88392658077fa88c926d766f;hp=8a54554f076118746bc6544d2ed51623fee38f67;hb=d7f4bb3a1d9c435765d7d3ef8c589de22fb021ac;hpb=3bca56b2cf5c373febb7e75967a239df146ef017

diff --git a/adu.c b/adu.c
index 8a54554..54af136 100644
--- a/adu.c
+++ b/adu.c
@@ -31,6 +31,13 @@ struct user_info {
 	struct osl_table_description *desc;
 };
 
+/** The decimal representation of an uint64_t never exceeds that size. */
+#define FORMATED_VALUE_SIZE 25
+
+#define FOR_EACH_USER(ui) for (ui = uid_hash_table; ui && ui < uid_hash_table \
+		+ uid_hash_table_size; ui++)
+
+
 /**
  * Contains info for each user that owns at least one regular file.
  *
@@ -40,6 +47,9 @@ struct user_info {
  */
 static struct user_info *uid_hash_table;
 
+/* these get filled in by the select command. */
+static char count_unit_buf[4] = "( )", size_unit_buf[4] = "( )";
+
 static inline int ui_used(struct user_info *ui)
 {
 	return ui->flags & UI_FL_SLOT_USED;
@@ -112,7 +122,6 @@ out:
 	return ret;
 }
 
-
 /** evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y */
 #define NUM_COMPARE(x, y) ((int)((x) < (y)) - (int)((x) > (y)))
 
@@ -370,6 +379,79 @@ static int create_tables(void)
 	return 1;
 }
 
+static void close_dir_table(void)
+{
+	int ret;
+
+	if (!dir_table)
+		return;
+	ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
+	if (ret < 0)
+		ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret));
+	free((char *)dir_table_desc.dir);
+	dir_table = NULL;
+}
+
+static void close_user_table(struct user_info *ui)
+{
+	int ret;
+
+	if (!ui || !ui_used(ui) || !ui_admissible(ui))
+		return;
+	ret = osl(osl_close_table(ui->table, OSL_MARK_CLEAN));
+	if (ret < 0)
+		ERROR_LOG("failed to close user table %u: %s\n",
+			(unsigned) ui->uid, adu_strerror(-ret));
+	free((char *)ui->desc->name);
+	ui->desc->name = NULL;
+	free((char *)ui->desc->dir);
+	ui->desc->dir = NULL;
+	free(ui->desc);
+	ui->desc = NULL;
+	ui->table = NULL;
+	ui->flags = 0;
+}
+
+static void close_user_tables(void)
+{
+	struct user_info *ui;
+
+	FOR_EACH_USER(ui)
+		close_user_table(ui);
+}
+
+static void close_all_tables(void)
+{
+	close_dir_table();
+	close_user_tables();
+	free_hash_table();
+}
+
+static int signum;
+
+static void signal_handler(int s)
+{
+	signum = s;
+}
+
+static void check_signals(void)
+{
+	if (likely(!signum))
+		return;
+	EMERG_LOG("caught signal %d\n", signum);
+	close_all_tables();
+	exit(EXIT_FAILURE);
+}
+
+static int init_signals(void)
+{
+	if (signal(SIGINT, &signal_handler) == SIG_ERR)
+		return -E_SIGNAL_SIG_ERR;
+	if (signal(SIGTERM, &signal_handler) == SIG_ERR)
+		return -E_SIGNAL_SIG_ERR;
+	return 1;
+}
+
 /*
  * We use a hash table of size s=2^uid_hash_bits to map the uids into the
  * interval [0..s]. Hash collisions are treated by open addressing, i.e.
@@ -392,9 +474,6 @@ static uint32_t double_hash(uint32_t uid, uint32_t probe_num)
 		% uid_hash_table_size;
 }
 
-#define FOR_EACH_USER(ui) for (ui = uid_hash_table; ui && ui < uid_hash_table \
-		+ uid_hash_table_size; ui++)
-
 enum search_uid_flags {
 	OPEN_USER_TABLE = 1,
 	CREATE_USER_TABLE = 2,
@@ -505,6 +584,7 @@ int scan_dir(char *dirname, uint64_t *parent_dir_num)
 	uint64_t dir_size = 0, dir_files = 0;
 	uint64_t this_dir_num = ++num_dirs;
 
+	check_signals();
 	DEBUG_LOG("----------------- %llu: %s\n", (long long unsigned)num_dirs, dirname);
 	ret = para_opendir(dirname, &dir, &cwd_fd);
 	if (ret < 0) {
@@ -648,22 +728,40 @@ const uint64_t count_unit_divisors[] = {
 };
 
 const char size_unit_abbrevs[] = " BKMGT";
-const char count_unit_abbrevs[] = "  KMGT";
+const char count_unit_abbrevs[] = "  kmgt";
 
-static void format_size_value(enum enum_size_unit unit, uint64_t value, char *result)
+static enum enum_size_unit format_size_value(enum enum_size_unit unit,
+		uint64_t value, int print_unit, char *result)
 {
+	enum enum_size_unit u = unit;
+	char unit_buf[2] = "\0\0";
+
 	if (unit == size_unit_arg_h) /* human readable */
-		for (unit = size_unit_arg_b; unit < size_unit_arg_t && value > size_unit_divisors[unit + 1]; unit++)
-				; /* nothing */
-	sprintf(result, "%llu%c", (long long unsigned)value / size_unit_divisors[unit], size_unit_abbrevs[unit]);
+		for (u = size_unit_arg_b; u < size_unit_arg_t &&
+				value > size_unit_divisors[u + 1]; u++)
+			; /* nothing */
+	if (print_unit)
+		unit_buf[0] = size_unit_abbrevs[u];
+	sprintf(result, "%llu%s",
+		(long long unsigned)value / size_unit_divisors[u], unit_buf);
+	return u;
 }
 
-static void format_count_value(enum enum_count_unit unit, uint64_t value, char *result)
+static enum enum_count_unit format_count_value(enum enum_count_unit unit,
+		uint64_t value, int print_unit, char *result)
 {
+	enum enum_count_unit u = unit;
+	char unit_buf[2] = "\0\0";
+
 	if (unit == count_unit_arg_h) /* human readable */
-		for (unit = count_unit_arg_n; unit < count_unit_arg_t && value > count_unit_divisors[unit + 1]; unit++)
-				; /* nothing */
-	sprintf(result, "%llu%c", (long long unsigned)value / count_unit_divisors[unit], count_unit_abbrevs[unit]);
+		for (u = count_unit_arg_n; u < count_unit_arg_t &&
+				value > count_unit_divisors[u + 1]; u++)
+			; /* nothing */
+	if (print_unit)
+		unit_buf[0] = count_unit_abbrevs[u];
+	sprintf(result, "%llu%s",
+		(long long unsigned)value / count_unit_divisors[u], unit_buf);
+	return u;
 }
 
 enum global_stats_flags {
@@ -684,22 +782,14 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
 {
 	struct global_stats_info *gsi = data;
 	struct osl_object obj;
-	char *dirname, formated_value[25];
+	char *dirname, formated_value[FORMATED_VALUE_SIZE];
 	int ret, summary = gsi->flags & GSF_COMPUTE_SUMMARY;
 
+	check_signals();
 	if (!gsi->count && !summary) {
 		ret = -E_LOOP_COMPLETE;
 		goto err;
 	}
-	if (gsi->count && (gsi->flags & GSF_PRINT_DIRNAME)) {
-		ret = get_dir_name_of_row(row, &dirname);
-		if (ret < 0)
-			goto err;
-		printf("%s%s", dirname,
-			(gsi->flags & (GSF_PRINT_FILES | GSF_PRINT_BYTES))?
-				"\t" : "\n"
-		);
-	}
 	if (summary || (gsi->count && (gsi->flags & GSF_PRINT_FILES))) {
 		uint64_t files;
 		ret = osl(osl_get_object(dir_table, row, DT_FILES, &obj));
@@ -707,10 +797,12 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
 			goto err;
 		files = *(uint64_t *)obj.data;
 		if (gsi->count && (gsi->flags & GSF_PRINT_FILES)) {
-			format_size_value(conf.size_unit_arg, files,
+			format_count_value(conf.count_unit_arg, files,
+				conf.count_unit_arg == count_unit_arg_h,
 				formated_value);
-			printf("%s%s", formated_value,
-				(gsi->flags & GSF_PRINT_BYTES)? "\t" : "\n");
+			printf("\t%s%s", formated_value,
+				(gsi->flags & (GSF_PRINT_BYTES | GSF_PRINT_DIRNAME))?
+				"\t" : "\n");
 		}
 		if (summary)
 			num_files += files;
@@ -723,14 +815,28 @@ static int global_stats_loop_function(struct osl_row *row, void *data)
 		bytes = *(uint64_t *)obj.data;
 		if (gsi->count && (gsi->flags & GSF_PRINT_BYTES)) {
 			format_size_value(conf.size_unit_arg, bytes,
+				conf.size_unit_arg == size_unit_arg_h,
 				formated_value);
-			printf("%s\n", formated_value);
+			printf("%s%s%s",
+				(gsi->flags & GSF_PRINT_FILES)? "" : "\t",
+				formated_value,
+				(gsi->flags & GSF_PRINT_DIRNAME)? "\t" : "\n"
+			);
 		}
 		if (summary) {
 			num_bytes += bytes;
 			num_dirs++;
 		}
 	}
+	if (gsi->count && (gsi->flags & GSF_PRINT_DIRNAME)) {
+		ret = get_dir_name_of_row(row, &dirname);
+		if (ret < 0)
+			goto err;
+		printf("%s%s\n",
+			(gsi->flags & (GSF_PRINT_BYTES | GSF_PRINT_FILES))? "" : "\t",
+			dirname);
+		free(dirname);
+	}
 	if (gsi->count > 0)
 		gsi->count--;
 	return 1;
@@ -744,19 +850,25 @@ static void print_id_stats(void)
 {
 	struct user_info *ui;
 
-	printf("--------------------- user summary (uid/dirs/files/bytes):\n");
+	printf("User summary "
+		"(uid/dirs%s/files%s/size%s):\n",
+		count_unit_buf, count_unit_buf, size_unit_buf);
 	FOR_EACH_USER(ui) {
-		char formated_dir_count[25], formated_file_count[25],
-			formated_bytes[25];
+		char formated_dir_count[FORMATED_VALUE_SIZE],
+			formated_file_count[FORMATED_VALUE_SIZE],
+			formated_bytes[FORMATED_VALUE_SIZE ];
 		if (!ui_used(ui) || !ui_admissible(ui))
 			continue;
 		format_count_value(conf.count_unit_arg, ui->dirs,
+			conf.count_unit_arg == count_unit_arg_h,
 			formated_dir_count);
 		format_count_value(conf.count_unit_arg, ui->files,
+			conf.count_unit_arg == count_unit_arg_h,
 			formated_file_count);
 		format_size_value(conf.size_unit_arg, ui->bytes,
+			conf.size_unit_arg == size_unit_arg_h,
 			formated_bytes);
-		printf("%u\t%s\t%s\t%s\n", (unsigned)ui->uid,
+		printf("\t%u\t%s\t%s\t%s\n", (unsigned)ui->uid,
 			formated_dir_count,
 			formated_file_count,
 			formated_bytes
@@ -784,26 +896,13 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
 	struct user_stats_info *usi = data;
 	struct osl_object obj;
 	int ret, summary = usi->flags & GSF_COMPUTE_SUMMARY;
-	char formated_value[25];
+	char formated_value[FORMATED_VALUE_SIZE];
 
+	check_signals();
 	if (!usi->count && !summary) {
 		ret = -E_LOOP_COMPLETE;
 		goto err;
 	}
-	if (usi->count && (usi->flags & USF_PRINT_DIRNAME)) {
-		char *dirname;
-		ret = osl(osl_get_object(usi->ui->table, row, UT_DIR_NUM, &obj));
-		if (ret < 0)
-			goto err;
-		ret = get_dir_name_by_number((uint64_t *)obj.data, &dirname);
-		if (ret < 0)
-			goto err;
-		printf("%s%s",
-			dirname,
-			(usi->flags & (USF_PRINT_FILES | USF_PRINT_BYTES))?
-				"\t" : "\n"
-		);
-	}
 	if (summary || (usi->count && (usi->flags & USF_PRINT_FILES))) {
 		uint64_t files;
 		ret = osl(osl_get_object(usi->ui->table, row, UT_FILES, &obj));
@@ -811,10 +910,12 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
 			goto err;
 		files = *(uint64_t *)obj.data;
 		if (usi->count && (usi->flags & USF_PRINT_FILES)) {
-			format_size_value(conf.size_unit_arg, files,
+			format_count_value(conf.count_unit_arg, files,
+				conf.count_unit_arg == count_unit_arg_h,
 				formated_value);
-			printf("%s%s", formated_value,
-				(usi->flags & USF_PRINT_BYTES)? "\t" : "\n"
+			printf("\t%s%s", formated_value,
+				(usi->flags & (USF_PRINT_BYTES | USF_PRINT_DIRNAME))?
+					"\t" : "\n"
 			);
 		}
 		if (summary)
@@ -828,8 +929,13 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
 		bytes = *(uint64_t *)obj.data;
 		if (usi->count && (usi->flags & USF_PRINT_BYTES)) {
 			format_size_value(conf.size_unit_arg, bytes,
+				conf.size_unit_arg == size_unit_arg_h,
 				formated_value);
-			printf("%s\n", formated_value);
+			printf("%s%s%s",
+				(usi->flags & USF_PRINT_FILES)? "" : "\t",
+				formated_value,
+				usi->flags & USF_PRINT_DIRNAME?  "\t" : "\n"
+			);
 		}
 		if (summary) {
 			usi->ui->bytes += bytes;
@@ -837,6 +943,19 @@ static int user_stats_loop_function(struct osl_row *row, void *data)
 		}
 
 	}
+	if (usi->count && (usi->flags & USF_PRINT_DIRNAME)) {
+		char *dirname;
+		ret = osl(osl_get_object(usi->ui->table, row, UT_DIR_NUM, &obj));
+		if (ret < 0)
+			goto err;
+		ret = get_dir_name_by_number((uint64_t *)obj.data, &dirname);
+		if (ret < 0)
+			goto err;
+		printf("%s%s\n",
+			(usi->flags & (USF_PRINT_BYTES | USF_PRINT_FILES))? "" : "\t",
+			dirname);
+		free(dirname);
+	}
 	if (usi->count > 0)
 		usi->count--;
 	return 1;
@@ -884,24 +1003,47 @@ static int print_user_stats(void)
 		if (!ui_used(ui) || !ui_admissible(ui))
 			continue;
 		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_BYTES | USF_COMPUTE_SUMMARY;
-		printf("************************************************ uid %u\n",
-			(unsigned) ui->uid);
-		printf("----------------- Largest dirs -------------------\n");
+		printf("uid %u, by size%s:\n",
+			(unsigned) ui->uid, size_unit_buf);
 		ret = adu_loop_reverse(ui->table, UT_BYTES, &usi, user_stats_loop_function,
 			&usi.ret, &usi.osl_errno);
 		if (ret < 0)
 			return ret;
-		printf("---------- dirs containing most files ------------\n");
+		printf("\nuid %u, by file count%s:\n",
+			(unsigned) ui->uid, count_unit_buf);
 		usi.count = conf.limit_arg,
 		usi.flags = USF_PRINT_DIRNAME | USF_PRINT_FILES;
 		ret = adu_loop_reverse(ui->table, UT_FILES, &usi, user_stats_loop_function,
 			&usi.ret, &usi.osl_errno);
 		if (ret < 0)
 			return ret;
+		printf("\n");
 	}
 	return 1;
 }
 
+static void print_global_summary(void)
+{
+	char d[FORMATED_VALUE_SIZE], f[FORMATED_VALUE_SIZE],
+		s[FORMATED_VALUE_SIZE];
+	enum enum_count_unit ud, uf;
+	enum enum_size_unit us;
+
+	ud = format_count_value(conf.count_unit_arg, num_dirs, 0, d);
+	uf = format_count_value(conf.count_unit_arg, num_files, 0, f);
+	us = format_size_value(conf.size_unit_arg, num_bytes, 0, s);
+
+	printf("Global summary "
+		"(dirs(%c)/files(%c)/size(%c))\n"
+		"\t%s\t%s\t%s\n\n",
+		count_unit_abbrevs[ud],
+		count_unit_abbrevs[uf],
+		size_unit_abbrevs[us],
+		d, f, s
+	);
+
+}
+
 static int print_statistics(void)
 {
 	int ret;
@@ -910,23 +1052,24 @@ static int print_statistics(void)
 		.flags = GSF_PRINT_DIRNAME | GSF_PRINT_BYTES | GSF_COMPUTE_SUMMARY
 	};
 
-	printf("----------------- Largest dirs -------------------\n");
+	printf("By size%s:\n",
+		size_unit_buf);
 	ret = adu_loop_reverse(dir_table, DT_BYTES, &gsi,
 		global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
 	if (ret < 0)
 		return ret;
-	gsi.count = conf.limit_arg;
+	printf("\n");
 
+	gsi.count = conf.limit_arg;
 	gsi.flags = GSF_PRINT_DIRNAME | GSF_PRINT_FILES;
-	printf("---------- dirs containing most files ------------\n");
+	printf("By file count%s:\n",
+		count_unit_buf);
 	ret = adu_loop_reverse(dir_table, DT_FILES, &gsi,
 		global_stats_loop_function, &gsi.ret, &gsi.osl_errno);
 	if (ret < 0)
 		return ret;
-	printf("------------------ Global summary (dirs/files/bytes)\n"
-		"%llu\t%llu\t%llu\n",
-		(long long unsigned)num_dirs, (long long unsigned)num_files,
-		(long long unsigned)num_bytes);
+	printf("\n");
+	print_global_summary();
 	print_user_stats();
 	print_id_stats();
 	return 1;
@@ -967,55 +1110,6 @@ static int open_dir_table(void)
 		dir_table_desc.dir = para_strdup(conf.database_dir_arg);
 	return osl(osl_open_table(&dir_table_desc, &dir_table));
 }
-
-static void close_dir_table(void)
-{
-	int ret;
-
-	if (!dir_table)
-		return;
-	ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
-	if (ret < 0)
-		ERROR_LOG("failed to close dir table: %s\n", adu_strerror(-ret));
-	free((char *)dir_table_desc.dir);
-	dir_table = NULL;
-}
-
-static void close_user_table(struct user_info *ui)
-{
-	int ret;
-
-	if (!ui || !ui_used(ui) || !ui_admissible(ui))
-		return;
-	ret = osl(osl_close_table(ui->table, OSL_MARK_CLEAN));
-	if (ret < 0)
-		ERROR_LOG("failed to close user table %u: %s\n",
-			(unsigned) ui->uid, adu_strerror(-ret));
-	free((char *)ui->desc->name);
-	ui->desc->name = NULL;
-	free((char *)ui->desc->dir);
-	ui->desc->dir = NULL;
-	free(ui->desc);
-	ui->desc = NULL;
-	ui->table = NULL;
-	ui->flags = 0;
-}
-
-static void close_user_tables(void)
-{
-	struct user_info *ui;
-
-	FOR_EACH_USER(ui)
-		close_user_table(ui);
-}
-
-static void close_all_tables(void)
-{
-	close_dir_table();
-	close_user_tables();
-	free_hash_table();
-}
-
 static int com_create()
 {
 	uint64_t zero = 0ULL;
@@ -1023,9 +1117,11 @@ static int com_create()
 
 	if (ret < 0)
 		return ret;
+	check_signals();
 	ret = open_dir_table();
 	if (ret < 0)
 		return ret;
+	check_signals();
 	ret = scan_dir(conf.base_dir_arg, &zero);
 	if (ret < 0)
 		goto out;
@@ -1070,12 +1166,23 @@ static int com_select(void)
 {
 	int ret;
 
+	if (conf.count_unit_arg != count_unit_arg_h)
+		count_unit_buf[1] = count_unit_abbrevs[conf.count_unit_arg];
+	else
+		count_unit_buf[0] = '\0';
+	if (conf.size_unit_arg != size_unit_arg_h)
+		size_unit_buf[1] = size_unit_abbrevs[conf.size_unit_arg];
+	else
+		size_unit_buf[0] = '\0';
+
 	ret = open_dir_table();
 	if (ret < 0)
 		return ret;
+	check_signals();
 	ret = read_uid_file();
 	if (ret < 0)
 		return ret;
+	check_signals();
 	ret = print_statistics();
 	close_all_tables();
 	return ret;
@@ -1125,6 +1232,9 @@ int main(int argc, char **argv)
 	};
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
+	ret = init_signals();
+	if (ret < 0)
+		goto out;
 	ret = check_args();
 	if (ret < 0)
 		goto out;