X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=9a0e513d941338195ddab459fc854a3792c05391;hp=598919a9a73f06b2e41015bd53d60283757c3285;hb=cab88f141a9550dcceee0ad8eab978660e0ae0de;hpb=3ebfb15c8a53bd1e1fbd0d5f8d4f00c7eeb76fd0

diff --git a/adu.c b/adu.c
index 598919a..9a0e513 100644
--- a/adu.c
+++ b/adu.c
@@ -1,46 +1,54 @@
 #include "adu.h"
 #include <dirent.h> /* readdir() */
+#include <pwd.h>
 
 #include "gcc-compat.h"
+#include "cmdline.h"
 #include "fd.h"
 #include "string.h"
 #include "error.h"
+#include "portable_io.h"
 
 DEFINE_ERRLIST;
+int osl_errno;
 
+/** In case a signal is received, its number is stored here. */
+static int signum;
 
+/** Command line and config file options. */
+struct gengetopt_args_info conf;
 
-/** 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)))
+/** Global dir count. */
+uint64_t num_dirs = 0;
+/** Global files count. */
+uint64_t num_files = 0;
+/** Global bytes count. */
+uint64_t num_bytes = 0;
 
+/** The number of different uids found so far. */
+uint32_t num_uids = 0;
 
 /**
- * The log function.
- *
- * \param ll Loglevel.
- * \param fml Usual format string.
+ * Contains info for each user that owns at least one regular file.
  *
- * All XXX_LOG() macros use this function.
+ * Even users that are not taken into account because of the --uid
+ * option occupy a slot in this hash table. This allows to find out
+ * quicky whether a uid is admissible. And yes, this has to be fast.
  */
-__printf_2_3 void __log(int ll, const char* fmt,...)
-{
-	va_list argp;
-	FILE *outfd;
-	struct tm *tm;
-	time_t t1;
-	char str[255] = "";
+struct user_info *uid_hash_table = NULL;
 
-	if (ll < 4)
-		return;
-	outfd = stderr;
-	time(&t1);
-	tm = localtime(&t1);
-	strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
-	fprintf(outfd, "%s ", str);
-	va_start(argp, fmt);
-	vfprintf(outfd, fmt, argp);
-	va_end(argp);
-}
+/**
+ * The table containing the directory names and statistics.
+ */
+struct osl_table *dir_table = NULL;
+
+/**
+ * The array of all uid ranges that were given at the command line.
+ */
+struct uid_range *admissible_uids;
+
+/** 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)))
 
 /**
  * Compare the size of two directories
@@ -65,54 +73,47 @@ static int size_compare(const struct osl_object *obj1, const struct osl_object *
 }
 
 /**
- * Compare two osl objects of string type.
- *
- * \param obj1 Pointer to the first object.
- * \param obj2 Pointer to the second object.
+ * Compare two osl objects pointing to unsigned integers of 64 bit size.
  *
- * In any case, only \p MIN(obj1->size, obj2->size) characters of each string
- * are taken into account.
+ * \param obj1 Pointer to the first integer.
+ * \param obj2 Pointer to the second integer.
  *
- * \return It returns an integer less than, equal to, or greater than zero if
- * \a obj1 is found, respectively, to be less than, to match, or be greater than
- * obj2.
+ * \return The values required for an osl compare function.
  *
- * \sa strcmp(3), strncmp(3), osl_compare_func.
+ * \sa osl_compare_func, osl_hash_compare().
  */
-int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
+static int uint64_compare(const struct osl_object *obj1,
+		const struct osl_object *obj2)
 {
-	const char *str1 = (const char *)obj1->data;
-	const char *str2 = (const char *)obj2->data;
-	return strncmp(str1, str2, MIN(obj1->size, obj2->size));
-}
+	uint64_t d1 = read_u64((const char *)obj1->data);
+	uint64_t d2 = read_u64((const char *)obj2->data);
 
-/** The columns of the directory table. */
-enum dir_table_columns {
-	/** The name of the directory. */
-	DT_NAME,
-	/** The dir count number. */
-	DT_NUM,
-	/** The number of bytes of all regular files. */
-	DT_BYTES,
-	/** The number of all regular files. */
-	DT_FILES,
-	/** Number of columns in this table. */
-	NUM_DT_COLUMNS
-};
+	if (d1 < d2)
+		return 1;
+	if (d1 > d2)
+		return -1;
+	return 0;
+}
 
 static struct osl_column_description dir_table_cols[] = {
 	[DT_NAME] = {
 		.storage_type = OSL_MAPPED_STORAGE,
-		.storage_flags = OSL_RBTREE | OSL_UNIQUE,
+		.storage_flags = 0,
 		.name = "dir",
-		.compare_function = string_compare,
 	},
 	[DT_NUM] = {
 		.storage_type = OSL_MAPPED_STORAGE,
 		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
 		.name = "num",
-		.compare_function = uint32_compare,
-		.data_size = sizeof(uint32_t)
+		.compare_function = uint64_compare,
+		.data_size = sizeof(uint64_t)
+	},
+	[DT_PARENT_NUM] = {
+		.storage_type = OSL_MAPPED_STORAGE,
+		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
+		.name = "parent_num",
+		.compare_function = size_compare,
+		.data_size = sizeof(uint64_t)
 	},
 	[DT_BYTES] = {
 		.storage_type = OSL_MAPPED_STORAGE,
@@ -135,71 +136,6 @@ static struct osl_table_description dir_table_desc = {
 	.num_columns = NUM_DT_COLUMNS,
 	.flags = 0,
 	.column_descriptions = dir_table_cols,
-	.dir = "/tmp/adu"
-};
-
-/** The columns of the id table. */
-enum id_table_columns {
-	/** The user id. */
-	IDT_UID,
-	/** The number of bytes of all regular files owned by this id. */
-	IDT_BYTES,
-	/** The number of regular files owned by this id. */
-	IDT_FILES,
-	/** The user table for this uid. */
-	IDT_TABLE,
-	/** Number of columns in this table. */
-	NUM_IDT_COLUMNS
-};
-
-static struct osl_column_description id_table_cols[] = {
-	[IDT_UID] = {
-		.storage_type = OSL_MAPPED_STORAGE,
-		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
-		.name = "uid",
-		.compare_function = uint32_compare,
-		.data_size = sizeof(uint32_t)
-	},
-	[IDT_BYTES] = {
-		.storage_type = OSL_MAPPED_STORAGE,
-		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE,
-		.compare_function = size_compare,
-		.name = "num_bytes",
-		.data_size = sizeof(uint64_t)
-	},
-	[IDT_FILES] = {
-		.storage_type = OSL_MAPPED_STORAGE,
-		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE,
-		.compare_function = size_compare,
-		.name = "num_filess",
-		.data_size = sizeof(uint64_t)
-	},
-	[IDT_TABLE] = {
-		.storage_type = OSL_NO_STORAGE,
-		.storage_flags = OSL_FIXED_SIZE | OSL_UNIQUE,
-		.name = "user_table",
-		.data_size = sizeof(void *)
-	}
-};
-
-static struct osl_table_description id_table_desc = {
-	.name = "id_table",
-	.num_columns = NUM_IDT_COLUMNS,
-	.flags = 0,
-	.column_descriptions = id_table_cols,
-	.dir = "/tmp/adu"
-};
-
-/** The columns of the id table. */
-enum user_table_columns {
-	/** The numer of the directory. */
-	UT_DIR_NUM,
-	/** The number of bytes of all regular files in this dir owned by this id. */
-	UT_BYTES,
-	/** The number of files in this dir owned by this id. */
-	UT_FILES,
-	/** Number of columns in this table. */
-	NUM_UT_COLUMNS
 };
 
 static struct osl_column_description user_table_cols[] = {
@@ -207,17 +143,17 @@ static struct osl_column_description user_table_cols[] = {
 		.storage_type = OSL_MAPPED_STORAGE,
 		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE | OSL_UNIQUE,
 		.name = "dir_num",
-		.compare_function = uint32_compare,
-		.data_size = sizeof(uint32_t)
+		.compare_function = uint64_compare,
+		.data_size = sizeof(uint64_t)
 	},
-	[IDT_BYTES] = {
+	[UT_BYTES] = {
 		.storage_type = OSL_MAPPED_STORAGE,
 		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE,
 		.compare_function = size_compare,
 		.name = "num_bytes",
 		.data_size = sizeof(uint64_t)
 	},
-	[IDT_FILES] = {
+	[UT_FILES] = {
 		.storage_type = OSL_MAPPED_STORAGE,
 		.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE,
 		.compare_function = size_compare,
@@ -226,124 +162,331 @@ static struct osl_column_description user_table_cols[] = {
 	},
 };
 
-static struct osl_table_description user_table_desc = {
-	.num_columns = NUM_UT_COLUMNS,
-	.flags = 0,
-	.column_descriptions = user_table_cols,
-	.dir = "/tmp/adu"
-};
-static struct osl_table *dir_table;
-static struct osl_table *id_table;
-
-static int create_tables(void)
+static int check_uid_arg(const char *arg, uint32_t *uid)
 {
-	int ret = osl_create_table(&dir_table_desc);
-	if (ret < 0)
-		return ret;
-	ret = osl_create_table(&id_table_desc);
+	const uint32_t max = ~0U;
+	/*
+	 * we need an 64-bit int for string -> uid conversion because strtoll()
+	 * returns a signed value.
+	 */
+	int64_t val;
+	int ret = atoi64(arg, &val);
+
 	if (ret < 0)
 		return ret;
+	if (val < 0 || val > max)
+		return -ERRNO_TO_ERROR(EINVAL);
+	*uid = val;
 	return 1;
 }
 
-int add_directory(char *dirname, uint32_t dir_num, uint64_t *dir_size,
-		uint64_t *dir_files)
+static int parse_uid_range(const char *orig_arg, struct uid_range *ur)
+{
+	int ret;
+	char *arg = adu_strdup(orig_arg), *p = strchr(arg, '-');
+
+	if (!p || p == arg) { /* -42 or 42 */
+		ret = check_uid_arg(p? p + 1 : arg, &ur->high);
+		if (ret < 0)
+			goto out;
+		ur->low = p? 0 : ur->high;
+		ret = 1;
+		goto out;
+	}
+	/* 42- or 42-4711 */
+	*p = '\0';
+	p++;
+	ret = check_uid_arg(arg, &ur->low);
+	if (ret < 0)
+		goto out;
+	ur->high = ~0U;
+	if (*p) { /* 42-4711 */
+		ret = check_uid_arg(p, &ur->high);
+		if (ret < 0)
+			goto out;
+	}
+	if (ur->low > ur->high)
+		ret = -ERRNO_TO_ERROR(EINVAL);
+out:
+	if (ret < 0)
+		ERROR_LOG("bad uid option: %s\n", orig_arg);
+	else
+		INFO_LOG("admissible uid range: %u - %u\n", ur->low,
+			ur->high);
+	free(arg);
+	return ret;
+}
+
+/**
+ * The log function.
+ *
+ * \param ll Loglevel.
+ * \param fml Usual format string.
+ *
+ * All XXX_LOG() macros use this function.
+ */
+__printf_2_3 void __log(int ll, const char* fmt,...)
+{
+	va_list argp;
+	FILE *outfd;
+	struct tm *tm;
+	time_t t1;
+	char str[255] = "";
+
+	if (ll < conf.loglevel_arg)
+		return;
+	outfd = stderr;
+	time(&t1);
+	tm = localtime(&t1);
+	strftime(str, sizeof(str), "%b %d %H:%M:%S", tm);
+	fprintf(outfd, "%s ", str);
+	va_start(argp, fmt);
+	vfprintf(outfd, fmt, argp);
+	va_end(argp);
+}
+
+static int add_directory(char *dirname, uint64_t *dir_num, uint64_t *parent_dir_num,
+		uint64_t *dir_size, uint64_t *dir_files)
 {
 	struct osl_object dir_objects[NUM_DT_COLUMNS];
 
-	INFO_LOG("adding #%u: %s\n", dir_num, dirname);
+	INFO_LOG("adding #%llu: %s\n", (long long unsigned)*dir_num, dirname);
 	dir_objects[DT_NAME].data = dirname;
 	dir_objects[DT_NAME].size = strlen(dirname) + 1;
-	dir_objects[DT_NUM].data = &dir_num;
-	dir_objects[DT_NUM].size = sizeof(dir_num);
+	dir_objects[DT_NUM].data = dir_num;
+	dir_objects[DT_NUM].size = sizeof(*dir_num);
+	dir_objects[DT_PARENT_NUM].data = parent_dir_num;
+	dir_objects[DT_PARENT_NUM].size = sizeof(*parent_dir_num);
 	dir_objects[DT_BYTES].data = dir_size;
 	dir_objects[DT_BYTES].size = sizeof(*dir_size);
 	dir_objects[DT_FILES].data = dir_files;
 	dir_objects[DT_FILES].size = sizeof(*dir_files);
-
-	return osl_add_row(dir_table, dir_objects);
+	return osl(osl_add_row(dir_table, dir_objects));
 }
 
-int create_and_open_user_table(uint32_t uid, struct osl_table **t)
+static int open_user_table(struct user_info *ui, int create)
 {
 	int ret;
-	struct osl_table_description *desc = para_malloc(sizeof(*desc));
-
-	desc->num_columns = NUM_UT_COLUMNS;
-	desc->flags = 0;
-	desc->column_descriptions = user_table_cols;
-	desc->dir = para_strdup("/tmp/adu");
-	desc->name = make_message("%u", uid);
-	INFO_LOG("................................. %u\n", uid);
-//	user_table_desc.name = make_message("%u", uid);
-	ret = osl_create_table(desc);
+	struct passwd *pw;
+
+	ui->desc = adu_malloc(sizeof(*ui->desc));
+	ui->desc->num_columns = NUM_UT_COLUMNS;
+	ui->desc->flags = 0;
+	ui->desc->column_descriptions = user_table_cols;
+	ui->desc->dir = adu_strdup(conf.database_dir_arg);
+	ui->desc->name = make_message("%u", (unsigned)ui->uid);
+	pw = getpwuid(ui->uid);
+	if (pw && pw->pw_name)
+		ui->pw_name = adu_strdup(pw->pw_name);
+
+	INFO_LOG(".............................uid #%u: %u\n",
+		(unsigned)num_uids, (unsigned)ui->uid);
+	if (create) {
+		ret = osl(osl_create_table(ui->desc));
+		if (ret < 0)
+			goto err;
+		num_uids++;
+	}
+	ret = osl(osl_open_table(ui->desc, &ui->table));
 	if (ret < 0)
-		return ret;
-	return osl_open_table(desc, t);
+		goto err;
+	return 1;
+err:
+	free((char *)ui->desc->name);
+	free((char *)ui->desc->dir);
+	free(ui->pw_name);
+	free(ui->desc);
+	ui->desc->name = NULL;
+	ui->desc->dir = NULL;
+	ui->desc = NULL;
+	ui->table = NULL;
+	ui->flags = 0;
+	return ret;
+}
+
+#define uid_hash_bits 8
+uint32_t uid_hash_table_size = 1 << uid_hash_bits;
+#define PRIME1 0x811c9dc5
+#define PRIME2 0x01000193
+
+void create_hash_table(void)
+{
+	uid_hash_table = adu_calloc(uid_hash_table_size
+		* sizeof(struct user_info));
 }
 
-static int insert_id_row(uint32_t uid, struct osl_table *t, struct osl_row **row)
+static void free_hash_table(void)
 {
-	struct osl_object objects[NUM_IDT_COLUMNS];
-	uint64_t num = 0;
-
-	struct osl_table **table_ptr = para_malloc(sizeof(*table_ptr));
-	*table_ptr = t;
-
-	INFO_LOG("§§§§§§§§§§§§§§§§§§§§§ uid: %d, t: %p\n", uid, t);
-	objects[IDT_UID].data = &uid;
-	objects[IDT_UID].size = sizeof(uid);
-	objects[IDT_BYTES].data = &num;
-	objects[IDT_BYTES].size = sizeof(num);
-	objects[IDT_FILES].data = &num;
-	objects[IDT_FILES].size = sizeof(num);
-	objects[IDT_TABLE].data = table_ptr;
-	objects[IDT_TABLE].size = sizeof(*table_ptr);
-	return osl_add_and_get_row(id_table, objects, row);
+	free(uid_hash_table);
+	uid_hash_table = NULL;
 }
 
-static int get_user_table(struct osl_row *row, struct osl_table **t)
+static int create_tables(void)
 {
-	struct osl_object obj;
+	int ret;
 
-	int ret = osl_get_object(id_table, row, IDT_TABLE, &obj);
+	dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
+	ret = osl(osl_create_table(&dir_table_desc));
 	if (ret < 0)
 		return ret;
-	*t = *(struct osl_table **)obj.data;
-	INFO_LOG("^^^^^^^^^^^^^^^^^^ t: %p\n", *t);
+	create_hash_table();
 	return 1;
 }
 
-static int add_id_bytes(struct osl_row *row, uint64_t *add)
+static void close_dir_table(void)
 {
-	uint64_t num;
-	struct osl_object obj1, obj2 = {.data = &num, .size = sizeof(num)};
+	int ret;
 
-	/* update number of bytes */
-	int ret = osl_get_object(id_table, row, IDT_BYTES, &obj1);
-	if (ret < 0)
-		return ret;
-	num = *(uint64_t *)obj1.data + *add;
-	ret = osl_update_object(id_table, row, IDT_BYTES, &obj2);
+	if (!dir_table)
+		return;
+	ret = osl(osl_close_table(dir_table, OSL_MARK_CLEAN));
 	if (ret < 0)
-		return ret;
-	/* increment number of files */
-	ret = osl_get_object(id_table, row, IDT_FILES, &obj1);
+		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)
-		return ret;
-	num = *(uint64_t *)obj1.data + 1;
-	return osl_update_object(id_table, row, IDT_FILES, &obj2);
+		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->pw_name);
+	ui->pw_name = 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 int update_user_row(struct osl_table *t, uint32_t dir_num,
+void close_all_tables(void)
+{
+	close_dir_table();
+	close_user_tables();
+	free_hash_table();
+}
+
+static void signal_handler(int s)
+{
+	signum = s;
+}
+
+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.
+ * unused slots in the table are used to store different uids that hash to the
+ * same slot.
+ *
+ * If a hash collision occurs, different slots are successively probed in order
+ * to find an unused slot for the new uid. Probing is implemented via a second
+ * hash function that maps the uid to h=(uid * PRIME2) | 1, which is always an
+ * odd number.
+ *
+ * An odd number is sufficient to make sure each entry of the hash table gets
+ * probed for probe_num between 0 and s-1 because s is a power of two, hence
+ * the second hash value has never a common divisor with the hash table size.
+ * IOW: h is invertible in the ring [0..s].
+ */
+static uint32_t double_hash(uint32_t uid, uint32_t probe_num)
+{
+	return (uid * PRIME1 + ((uid * PRIME2) | 1) * probe_num)
+		% uid_hash_table_size;
+}
+
+static int uid_is_admissible(uint32_t uid)
+{
+	int i;
+
+	for (i = 0; i < conf.uid_given; i++) {
+		struct uid_range *ur = admissible_uids + i;
+
+		if (ur->low <= uid && ur->high >= uid)
+			break;
+	}
+	i = !conf.uid_given || i < conf.uid_given;
+	DEBUG_LOG("uid %u is %sadmissible\n", (unsigned)uid,
+		i? "" : "not ");
+	return i;
+}
+
+int search_uid(uint32_t uid, enum search_uid_flags flags,
+		struct user_info **ui_ptr)
+{
+	uint32_t p;
+
+	for (p = 0; p < uid_hash_table_size; p++) {
+		struct user_info *ui = uid_hash_table + double_hash(uid, p);
+
+		if (!ui_used(ui)) {
+			int ret;
+			if (!flags)
+				return -E_BAD_UID;
+			ui->uid = uid;
+			ui->flags |= UI_FL_SLOT_USED;
+			if (!uid_is_admissible(uid))
+				return 0;
+			ui->flags |= UI_FL_ADMISSIBLE;
+			ret = open_user_table(ui, flags & CREATE_USER_TABLE);
+			if (ret < 0)
+				return ret;
+
+			if (ui_ptr)
+				*ui_ptr = ui;
+			return 1;
+		}
+		if (ui->uid != uid)
+			continue;
+		if (ui_ptr)
+			*ui_ptr = ui;
+		return 0;
+	}
+	return flags? -E_HASH_TABLE_OVERFLOW : -E_BAD_UID;
+}
+
+static int update_user_row(struct osl_table *t, uint64_t dir_num,
 		uint64_t *add)
 {
 	struct osl_row *row;
 	struct osl_object obj = {.data = &dir_num, .size = sizeof(dir_num)};
 
-	int ret = osl_get_row(t, UT_DIR_NUM, &obj, &row);
+	int ret = osl(osl_get_row(t, UT_DIR_NUM, &obj, &row));
 
-	if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
+	if (ret == -E_OSL && osl_errno != E_OSL_RB_KEY_NOT_FOUND)
 		return ret;
 	if (ret < 0) { /* this is the first file we add */
 		struct osl_object objects[NUM_UT_COLUMNS];
@@ -356,40 +499,42 @@ static int update_user_row(struct osl_table *t, uint32_t dir_num,
 		objects[UT_FILES].data = &num_files;
 		objects[UT_FILES].size = sizeof(num_files);
 		INFO_LOG("######################### ret: %d\n", ret);
-		ret = osl_add_row(t, objects);
+		ret = osl(osl_add_row(t, objects));
 		INFO_LOG("######################### ret: %d\n", ret);
 		return ret;
 	} else { /* add size and increment file count */
 		uint64_t num;
 		struct osl_object obj1, obj2 = {.data = &num, .size = sizeof(num)};
 
-		ret = osl_get_object(t, row, UT_BYTES, &obj1);
+		ret = osl(osl_get_object(t, row, UT_BYTES, &obj1));
 		if (ret < 0)
 			return ret;
 		num = *(uint64_t *)obj1.data + *add;
-		ret = osl_update_object(t, row, UT_BYTES, &obj2);
+		ret = osl(osl_update_object(t, row, UT_BYTES, &obj2));
 		if (ret < 0)
 			return ret;
-		ret = osl_get_object(t, row, UT_FILES, &obj1);
+		ret = osl(osl_get_object(t, row, UT_FILES, &obj1));
 		if (ret < 0)
 			return ret;
 		num = *(uint64_t *)obj1.data + 1;
-		return osl_update_object(t, row, UT_FILES, &obj2);
+		return osl(osl_update_object(t, row, UT_FILES, &obj2));
 	}
 }
 
-static uint32_t dir_num;
+/* id of the device containing the base dir. */
+static dev_t device_id;
 
-int scan_dir(char *dirname)
+static int scan_dir(char *dirname, uint64_t *parent_dir_num)
 {
 	DIR *dir;
 	struct dirent *entry;
 	int ret, cwd_fd, ret2;
 	uint64_t dir_size = 0, dir_files = 0;
-	struct osl_object obj;
+	uint64_t this_dir_num = ++num_dirs;
 
-	INFO_LOG("----------------- %s\n", dirname);
-	ret = para_opendir(dirname, &dir, &cwd_fd);
+	check_signals();
+	DEBUG_LOG("----------------- %llu: %s\n", (long long unsigned)num_dirs, dirname);
+	ret = adu_opendir(dirname, &dir, &cwd_fd);
 	if (ret < 0) {
 		if (ret != -ERRNO_TO_ERROR(EACCES))
 			return ret;
@@ -398,26 +543,27 @@ int scan_dir(char *dirname)
 	}
 	while ((entry = readdir(dir))) {
 		mode_t m;
-		char *tmp;
 		struct stat s;
 		uint32_t uid;
 		uint64_t size;
-		struct osl_row *id_row;
-		struct osl_table *user_table;
+		struct user_info *ui;
 
 		if (!strcmp(entry->d_name, "."))
 			continue;
 		if (!strcmp(entry->d_name, ".."))
 			continue;
-		if (lstat(entry->d_name, &s) == -1)
+		if (lstat(entry->d_name, &s) == -1) {
+			WARNING_LOG("lstat error for %s/%s\n", dirname,
+				entry->d_name);
 			continue;
+		}
 		m = s.st_mode;
 		if (!S_ISREG(m) && !S_ISDIR(m))
 			continue;
 		if (S_ISDIR(m)) {
-			tmp = make_message("%s/%s", dirname, entry->d_name);
-			ret = scan_dir(tmp);
-			free(tmp);
+			if (conf.one_file_system_given && s.st_dev != device_id)
+				continue;
+			ret = scan_dir(entry->d_name, &this_dir_num);
 			if (ret < 0)
 				goto out;
 			continue;
@@ -425,221 +571,155 @@ int scan_dir(char *dirname)
 		/* regular file */
 		size = s.st_size;
 		dir_size += size;
+		num_bytes += size;
 		dir_files++;
+		num_files++;
 		uid = s.st_uid;
-		INFO_LOG("++++++++++++++++++++++++++ %s, uid: %u\n", entry->d_name, uid);
-		obj.data = &uid;
-		obj.size = sizeof(uid);
-		ret = osl_get_row(id_table, IDT_UID, &obj, &id_row);
-		if (ret < 0 && ret != -E_RB_KEY_NOT_FOUND)
-			goto out;
-		if (ret < 0) {
-			ret = create_and_open_user_table(uid, &user_table);
-			if (ret < 0)
-				goto out;
-			ret = insert_id_row(uid, user_table, &id_row);
-			if (ret < 0)
-				goto out;
-		} else {
-			ret = get_user_table(id_row, &user_table);
-			if (ret < 0)
-				goto out;
-		}
-		ret = add_id_bytes(id_row, &size);
+		ret = search_uid(uid, CREATE_USER_TABLE | OPEN_USER_TABLE, &ui);
 		if (ret < 0)
 			goto out;
-		INFO_LOG("user_table: %p\n", user_table);
-		ret = update_user_row(user_table, dir_num, &size);
-		INFO_LOG("update_user  ret: %d\n", ret);
+		ui->bytes += size;
+		ui->files++;
+		ret = update_user_row(ui->table, this_dir_num, &size);
 		if (ret < 0)
 			goto out;
 	}
-	ret = add_directory(dirname, dir_num++, &dir_size, &dir_files);
+	ret = add_directory(dirname, &this_dir_num, parent_dir_num,
+			&dir_size, &dir_files);
 out:
 	closedir(dir);
-	ret2 = para_fchdir(cwd_fd);
+	ret2 = adu_fchdir(cwd_fd);
 	if (ret2 < 0 && ret >= 0)
 		ret = ret2;
 	close(cwd_fd);
 	return ret;
 }
 
-static int get_dir_name(struct osl_row *row, char **name)
-{
-	struct osl_object obj;
-	int ret = osl_get_object(dir_table, row, DT_NAME, &obj);
-
-	if (ret < 0)
-		return ret;
-	*name = obj.data;
-	return 1;
-}
-
-static int print_dirname_and_size(struct osl_row *row, void *data)
+char *get_uid_list_name(void)
 {
-	unsigned *count = data;
-	struct osl_object obj;
-	char *name;
-	int ret;
-
-	if ((*count)++ > 100)
-		return -E_LOOP_COMPLETE;
-	ret = get_dir_name(row, &name);
-	if (ret < 0)
-		return ret;
-	ret = osl_get_object(dir_table, row, DT_BYTES, &obj);
-	if (ret < 0)
-		return ret;
-	printf("%s\t%llu\n", name, *(long long unsigned *)obj.data);
-	return 1;
+	return make_message("%s/uid_list", conf.database_dir_arg);
 }
 
-static int print_dirname_and_file_count(struct osl_row *row, void *data)
+static int write_uid_list(void)
 {
-	unsigned *count = data;
-	struct osl_object obj;
-	char *name;
+	char *buf, *filename;
+	uint32_t count = 0;
+	struct user_info *ui;
+	size_t size = num_uids * sizeof(uint32_t);
 	int ret;
 
-	if ((*count)++ > 100)
-		return -E_LOOP_COMPLETE;
-	ret = get_dir_name(row, &name);
-	if (ret < 0)
-		return ret;
-	ret = osl_get_object(dir_table, row, DT_FILES, &obj);
-	if (ret < 0)
-		return ret;
-	printf("%s\t%llu\n", name, *(long long unsigned *)obj.data);
-	return 1;
+	if (!num_uids)
+		return 0;
+	buf = adu_malloc(size);
+	FOR_EACH_USER(ui) {
+		if (!ui_used(ui) || !ui_admissible(ui))
+			continue;
+		DEBUG_LOG("saving uid %u\n", (unsigned) ui->uid);
+		write_u32(buf + count++ * sizeof(uint32_t), ui->uid);
+	}
+	filename = get_uid_list_name();
+	ret = adu_write_file(filename, buf, size);
+	free(filename);
+	free(buf);
+	return ret;
 }
 
-static int print_id_stats(struct osl_row *row, __a_unused void *data)
+int open_dir_table(void)
 {
-	struct osl_object obj;
-	uint32_t uid;
-	uint64_t bytes, files;
-	int ret = osl_get_object(id_table, row, IDT_UID, &obj);
-
-	if (ret < 0)
-		return ret;
-	uid = *(uint32_t *)obj.data;
-	ret = osl_get_object(id_table, row, IDT_BYTES, &obj);
-	if (ret < 0)
-		return ret;
-	bytes = *(uint64_t *)obj.data;
-	ret = osl_get_object(id_table, row, IDT_FILES, &obj);
-	if (ret < 0)
-		return ret;
-	files = *(uint64_t *)obj.data;
-
-	printf("%u\t%llu\t%llu\n", (unsigned)uid, (long long unsigned)files,
-		(long long unsigned)bytes);
-	return 1;
+	if (!dir_table_desc.dir) /* we did not create the table */
+		dir_table_desc.dir = adu_strdup(conf.database_dir_arg);
+	return osl(osl_open_table(&dir_table_desc, &dir_table));
 }
-
-struct id_dir_stat_info {
-	unsigned count;
-	struct osl_table *user_table;
-};
-
-static int print_big_dir(struct osl_row *row, void *data)
+static int com_create()
 {
-	struct id_dir_stat_info *info = data;
-	info->count++;
+	uint64_t zero = 0ULL;
 	int ret;
-	struct osl_row *dir_row;
-	char *dirname;
-	uint64_t bytes;
-	struct osl_object obj;
-
-	if (info->count > 10)
-		return -E_LOOP_COMPLETE;
-	ret = osl_get_object(info->user_table, row, UT_BYTES, &obj);
+	struct stat statbuf;
+
+	if (lstat(conf.base_dir_arg, &statbuf) == -1)
+		return -ERRNO_TO_ERROR(errno);
+	if (!S_ISDIR(statbuf.st_mode))
+		return -ERRNO_TO_ERROR(ENOTDIR);
+	device_id = statbuf.st_dev;
+	ret = create_tables();
 	if (ret < 0)
 		return ret;
-	bytes = *(uint64_t *)obj.data;
-	ret = osl_get_object(info->user_table, row, UT_DIR_NUM, &obj);
+	check_signals();
+	ret = open_dir_table();
 	if (ret < 0)
 		return ret;
-	ret = osl_get_row(dir_table, DT_NUM, &obj, &dir_row);
+	check_signals();
+	ret = scan_dir(conf.base_dir_arg, &zero);
 	if (ret < 0)
-		return ret;
-	ret = osl_get_object(dir_table, dir_row, DT_NAME, &obj);
-	if (ret < 0)
-		return ret;
-	dirname = obj.data;
-	printf("%s: %llu\n", dirname, (long long unsigned)bytes);
-	return 1;
+		goto out;
+	ret = write_uid_list();
+out:
+	close_all_tables();
+	return ret;
 }
 
-static int print_id_dir_stats(struct osl_row *row, __a_unused void *data)
+static int check_args(void)
 {
-	struct osl_object obj;
-	uint32_t uid;
-	int ret = osl_get_object(id_table, row, IDT_UID, &obj);
-	struct id_dir_stat_info info = {.count = 0};
-
-	if (ret < 0)
-		return ret;
-	uid = *(uint32_t *)obj.data;
-
-	ret = osl_get_object(id_table, row, IDT_TABLE, &obj);
-	if (ret < 0)
-		return ret;
-	info.user_table = *(struct osl_table **)obj.data;
-
-	printf("************************* Big dirs owned by uid %u\n", (unsigned) uid);
-	osl_rbtree_loop_reverse(info.user_table, IDT_BYTES, &info, print_big_dir);
+	int i, ret;
+
+	/* remove trailing slashes from base-dir arg */
+	if (conf.base_dir_given) {
+		size_t len = strlen(conf.base_dir_arg);
+		for (;;) {
+			if (!len) /* empty string */
+				return -ERRNO_TO_ERROR(EINVAL);
+			if (!--len) /* length 1 is always OK */
+				break;
+			if (conf.base_dir_arg[len] != '/')
+				break; /* no trailing slash, also OK */
+			conf.base_dir_arg[len] = '\0';
+		}
+	}
+	if (!conf.uid_given)
+		return 0;
+	admissible_uids = adu_malloc(conf.uid_given * sizeof(*admissible_uids));
+	for (i = 0; i < conf.uid_given; i++) {
+		ret = parse_uid_range(conf.uid_arg[i], admissible_uids + i);
+		if (ret < 0)
+			goto err;
+	}
 	return 1;
+err:
+	free(admissible_uids);
+	admissible_uids = NULL;
+	return ret;
 }
 
-static int print_statistics(void)
-{
-	unsigned count = 0;
-	int ret;
-
-	printf("************************* Biggest dirs\n");
-	ret = osl_rbtree_loop_reverse(dir_table, DT_BYTES, &count, print_dirname_and_size);
-	if (ret < 0 && ret != -E_LOOP_COMPLETE)
-		return ret;
-	count = 0;
-	printf("************************* dirs containing many files\n");
-	ret = osl_rbtree_loop_reverse(dir_table, DT_FILES, &count, print_dirname_and_file_count);
-	if (ret < 0 && ret != -E_LOOP_COMPLETE)
-		return ret;
-
-	printf("************************* dirs stats by owner\n");
-	ret = osl_rbtree_loop(id_table, IDT_BYTES, NULL, print_id_stats);
-	if (ret < 0)
-		return ret;
-
-	return osl_rbtree_loop(id_table, IDT_BYTES, NULL, print_id_dir_stats);
-}
-
-
 int main(int argc, char **argv)
 {
-	int ret = create_tables();
-	if (ret < 0)
-		goto out;
-	ret = osl_open_table(&dir_table_desc, &dir_table);
+	int ret;
+	struct cmdline_parser_params params = {
+		.override = 0,
+		.initialize = 1,
+		.check_required = 0,
+		.check_ambiguity = 0,
+		.print_errors = 1
+	};
+
+	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
+	ret = init_signals();
 	if (ret < 0)
 		goto out;
-	ret = osl_open_table(&id_table_desc, &id_table);
+	ret = check_args();
 	if (ret < 0)
 		goto out;
 	ret = -E_SYNTAX;
-	if (argc != 2)
-		goto out;
-	ret = scan_dir(argv[1]);
+	if (conf.select_given)
+		ret = com_select();
+	else
+		ret = com_create();
 	if (ret < 0)
 		goto out;
-	print_statistics();
 out:
+	free(admissible_uids);
 	if (ret < 0) {
-		ERROR_LOG("%s\n", error_txt(-ret));
+		ERROR_LOG("%s\n", adu_strerror(-ret));
 		return -EXIT_FAILURE;
 	}
 	return EXIT_SUCCESS;
 }
-