X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=select.c;fp=select.c;h=e30697ee9f0dc51d629d6ccbfaa789b6428e996a;hp=44178805122bbd2afddaceb0d15de4918cb95d58;hb=bd0166ae6242deafc9b3436199965420517033b5;hpb=e302759338931fca58ee2497dbcc7c86ef6963bf

diff --git a/select.c b/select.c
index 4417880..e30697e 100644
--- a/select.c
+++ b/select.c
@@ -145,15 +145,23 @@ struct user_list_format_info {
 
 struct user_summary_info {
 	struct user_info *ui;
+	/** Total number of files owned by this user. */
+	uint64_t files;
+	/** Total number of bytes owned by this user. */
+	uint64_t bytes;
+	/** Total number of directories that contain at least one file */
+	uint64_t dirs;
 	int ret;
 	int osl_errno;
 	regex_t *preg;
 	int inverse_matching;
 };
 
-struct user_summary_line_info {
+struct user_summary_loop_data {
+	unsigned num_admissible_users;
+	struct user_summary_info *usis;
+	struct user_summary_info *current;
 	struct format_info *fi;
-	uint32_t count;
 };
 
 static FILE *output_file;
@@ -444,12 +452,12 @@ static int user_summary_loop_function(struct osl_row *row, void *data)
 	ret = get_num_user_files(row, usi->ui, &num);
 	if (ret < 0)
 		goto err;
-	usi->ui->files += num;
+	usi->files += num;
 	ret = get_num_user_bytes(row, usi->ui, &num);
 	if (ret < 0)
 		goto err;
-	usi->ui->bytes += num;
-	usi->ui->dirs++;
+	usi->bytes += num;
+	usi->dirs++;
 	return 1;
 err:
 	usi->ret = ret;
@@ -457,92 +465,106 @@ err:
 	return ret;
 }
 
-static int compute_user_summary(struct user_info *ui, __a_unused void *data)
+static int compute_user_summary(struct user_info *ui, void *data)
 {
-	struct user_summary_info usi = {.ui = ui};
-	int ret = compile_regex(&usi.preg, &usi.inverse_matching);
+	struct user_summary_loop_data *usld = data;
+	struct user_summary_info *usi = usld->current++;
+	int ret = compile_regex(&usi->preg, &usi->inverse_matching);
 
 	if (ret < 0)
 		return ret;
-	ret = adu_loop_reverse(ui->table, UT_BYTES, &usi, user_summary_loop_function,
-		&usi.ret, &usi.osl_errno);
-	free_regex(usi.preg);
+	usi->ui = ui;
+	ret = adu_loop_reverse(ui->table, UT_BYTES, usi, user_summary_loop_function,
+		&usi->ret, &usi->osl_errno);
+	free_regex(usi->preg);
 	return ret;
 }
 
-static int print_user_summary_line(struct user_info *ui, void *data)
+static int print_user_summary_line(struct user_summary_info *usi,
+		struct format_info *fi)
 {
-	struct user_summary_line_info *usli = data;
+	struct user_info *ui = usi->ui;
 	union atom_value values[] = {
 		[usa_pw_name] = {.string_value = ui->pw_name?
 			ui->pw_name : "?"},
 		[usa_uid] = {.num_value = (long long unsigned)ui->uid},
-		[usa_dirs] = {.num_value = (long long unsigned)ui->dirs},
-		[usa_files] = {.num_value = (long long unsigned)ui->files},
-		[usa_size] = {.num_value =  (long long unsigned)ui->bytes}
+		[usa_dirs] = {.num_value = (long long unsigned)usi->dirs},
+		[usa_files] = {.num_value = (long long unsigned)usi->files},
+		[usa_size] = {.num_value =  (long long unsigned)usi->bytes}
 	};
-	char *buf;
-	int ret = -E_LOOP_COMPLETE;
+	char *buf = format_items(fi, values);
+	int ret = output("%s", buf);
 
-	if (!usli->count)
-		return ret;
-
-	buf = format_items(usli->fi, values);
-	ret = output("%s", buf);
 	free(buf);
-	usli->count--;
 	return ret;
 }
 
-static int name_comp(struct user_info *a, struct user_info *b)
+static int name_comp(const void *a, const void *b)
 {
-	char *x = a->pw_name;
-	char *y = b->pw_name;
+	const struct user_summary_info *x = a, *y = b;
+	char *n1 = x->ui->pw_name;
+	char *n2 = y->ui->pw_name;
 
-	if (!x)
+	if (!n1)
 		return 1;
-	if (!y)
+	if (!n2)
 		return -1;
-	return strcmp(x, y);
+	return strcmp(n1, n2);
 }
 
-static int uid_comp(struct user_info *a, struct user_info *b)
+static int uid_comp(const void *a, const void *b)
 {
-	return -NUM_COMPARE(a->uid, b->uid);
+	const struct user_summary_info *x = a, *y = b;
+	return -NUM_COMPARE(x->ui->uid, y->ui->uid);
 }
 
-static int dir_count_comp(struct user_info *a, struct user_info *b)
+static int dir_count_comp(const void *a, const void *b)
 {
-	return NUM_COMPARE(a->dirs, b->dirs);
+	const struct user_summary_info *x = a, *y = b;
+	return NUM_COMPARE(x->dirs, y->dirs);
 }
 
-static int file_count_comp(struct user_info *a, struct user_info *b)
+static int file_count_comp(const void *a, const void *b)
 {
-	return NUM_COMPARE(a->files, b->files);
+	const struct user_summary_info *x = a, *y = b;
+	return NUM_COMPARE(x->files, y->files);
 }
 
-static int size_comp(struct user_info *a, struct user_info *b)
+static int size_comp(const void *a, const void *b)
 {
-	return NUM_COMPARE(a->bytes, b->bytes);
+	const struct user_summary_info *x = a, *y = b;
+	return NUM_COMPARE(x->bytes, y->bytes);
+}
+
+static int count_admissible_users(__a_unused struct user_info *ui, void *data)
+{
+	struct user_summary_loop_data *usld = data;
+	usld->num_admissible_users++;
+	return 1;
 }
 
 static int print_user_summary(struct format_info *fi)
 {
-	int ret;
-	int (*comp)(struct user_info *a, struct user_info *b);
-	struct user_summary_line_info usli = {
-		.fi = fi,
-		.count = select_conf.limit_arg
-	};
+	int i, ret;
+	int (*comp)(const void *a, const void *b);
+	struct user_summary_loop_data usld = { .fi = fi};
 	char *header = select_conf.header_given? select_conf.header_arg :
 		"User summary\n";
 
 	ret = output("%s", header);
 	if (ret < 0)
 		return ret;
-	ret = for_each_admissible_user(compute_user_summary, NULL);
+	ret = for_each_admissible_user(count_admissible_users, &usld);
 	if (ret < 0)
 		return ret;
+	if (usld.num_admissible_users == 0)
+		return 1;
+	usld.usis = adu_calloc(usld.num_admissible_users
+		* sizeof(struct user_summary_info));
+	usld.current = usld.usis;
+	ret = for_each_admissible_user(compute_user_summary, &usld);
+	if (ret < 0)
+		goto out;
 	switch (select_conf.user_summary_sort_arg) {
 	case user_summary_sort_arg_name:
 		comp = name_comp;
@@ -563,10 +585,15 @@ static int print_user_summary(struct format_info *fi)
 		comp = size_comp;
 		break;
 	}
-	sort_hash_table(comp);
-	ret = for_each_admissible_user(print_user_summary_line, &usli);
-	if (ret == -E_LOOP_COMPLETE)
-		ret = 1;
+	qsort(usld.usis, usld.num_admissible_users,
+		sizeof(struct user_summary_info), comp);
+	for (i = 0; i < usld.num_admissible_users; i++) {
+		if (select_conf.limit_arg >= 0 && i > select_conf.limit_arg)
+			break;
+		print_user_summary_line(usld.usis + i, usld.fi);
+	}
+out:
+	free(usld.usis);
 	return ret;
 }