/** This is always a power of two. It is set in create_hash_table(). */
static uint32_t uid_hash_table_size;
+/* Array of indices to the entries of \a uid_hash_table. */
+static int *uid_hash_table_sort_idx;
+
/** The number of used slots in the hash table. */
static uint32_t num_uids = 0;
int for_each_admissible_user(int (*func)(struct user_info *, void *),
void *data)
{
- struct user_info *ui;
+ int i;
assert(uid_hash_table);
- FOR_EACH_USER(ui) {
+ for (i = 0; i < uid_hash_table_size; i++) {
int ret;
+ struct user_info *ui = uid_hash_table +
+ uid_hash_table_sort_idx[i];
if (!ui_used(ui) || !ui_admissible(ui))
continue;
void create_hash_table(unsigned bits)
{
+ int i;
+
uid_hash_table_size = 1 << bits;
uid_hash_table = adu_calloc(uid_hash_table_size *
sizeof(struct user_info));
+ uid_hash_table_sort_idx = adu_malloc(uid_hash_table_size * sizeof(int));
+ for (i = 0; i < uid_hash_table_size; i++)
+ uid_hash_table_sort_idx[i] = i;
}
void close_user_tables(void)
}
free(uid_hash_table);
uid_hash_table = NULL;
+ free(uid_hash_table_sort_idx);
+ uid_hash_table_sort_idx = NULL;
}
/*
return make_message("%s/uid_list", conf.database_dir_arg);
}
-void sort_hash_table(int (*comp)(const void *, const void *))
+static int (*hash_table_comparator)(struct user_info *a, struct user_info *b);
+
+static int comp_wrapper(const void *a, const void *b)
+{
+ struct user_info *x = uid_hash_table + *(unsigned *)a;
+ struct user_info *y = uid_hash_table + *(unsigned *)b;
+ return hash_table_comparator(x, y);
+}
+
+void sort_hash_table(int (*comp)(struct user_info *, struct user_info *))
{
- qsort(uid_hash_table, uid_hash_table_size, sizeof(struct user_info),
- comp);
+ hash_table_comparator = comp;
+ qsort(uid_hash_table_sort_idx, uid_hash_table_size,
+ sizeof(*uid_hash_table_sort_idx), comp_wrapper);
}
int open_admissible_user_tables(struct uid_range *admissible_uids)