return NUM_COMPARE(obj2->data, obj1->data);
}
-/**
- * Compare two osl objects of string type.
- *
- * \param obj1 Pointer to the first object.
- * \param obj2 Pointer to the second object.
- *
- * In any case, only \p MIN(obj1->size, obj2->size) characters of each string
- * are taken into account.
- *
- * \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.
- *
- * \sa strcmp(3), strncmp(3), osl_compare_func.
- */
-static int string_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));
-}
-
/**
* Compare two osl objects pointing to unsigned integers of 64 bit size.
*
DT_NAME,
/** The dir count number. */
DT_NUM,
+ /** The number of the parent directory. */
+ DT_PARENT_NUM,
/** The number of bytes of all regular files. */
DT_BYTES,
/** The number of all regular files. */
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,
.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,
.storage_flags = OSL_RBTREE | OSL_FIXED_SIZE,
static struct osl_table *dir_table;
-static int add_directory(char *dirname, uint64_t dir_num, uint64_t *dir_size,
- uint64_t *dir_files)
+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 #%llu: %s\n", (long long unsigned)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;
static uint64_t num_files;
static uint64_t num_bytes;
-int scan_dir(char *dirname)
+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;
- uint64_t this_dir_num = num_dirs++;
+ uint64_t this_dir_num = ++num_dirs;
DEBUG_LOG("----------------- %llu: %s\n", (long long unsigned)num_dirs, dirname);
ret = para_opendir(dirname, &dir, &cwd_fd);
}
while ((entry = readdir(dir))) {
mode_t m;
- char *tmp;
struct stat s;
uint32_t uid;
uint64_t size;
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);
+ ret = scan_dir(entry->d_name, &this_dir_num);
if (ret < 0)
goto out;
continue;
if (ret < 0)
goto out;
}
- ret = add_directory(dirname, this_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);
return ret;
}
-static int get_dir_name(struct osl_row *row, char **name)
+static int get_dir_name_by_number(uint64_t *dirnum, char **name)
+{
+ char *result = NULL, *tmp;
+ struct osl_row *row;
+ uint64_t val = *dirnum;
+ struct osl_object obj = {.data = &val, .size = sizeof(val)};
+ int ret;
+
+again:
+ ret = osl_get_row(dir_table, DT_NUM, &obj, &row);
+ if (ret < 0)
+ goto out;
+ ret = osl_get_object(dir_table, row, DT_NAME, &obj);
+ if (ret < 0)
+ goto out;
+ if (result) {
+ tmp = make_message("%s/%s", (char *)obj.data, result);
+ free(result);
+ result = tmp;
+ } else
+ result = para_strdup((char *)obj.data);
+ ret = osl_get_object(dir_table, row, DT_PARENT_NUM, &obj);
+ if (ret < 0)
+ goto out;
+ val = *(uint64_t *)obj.data;
+ if (val)
+ goto again;
+out:
+ if (ret < 0) {
+ free(result);
+ *name = NULL;
+ } else
+ *name = result;
+ return ret;
+}
+
+static int get_dir_name_of_row(struct osl_row *dir_table_row, char **name)
{
struct osl_object obj;
- int ret = osl_get_object(dir_table, row, DT_NAME, &obj);
+ int ret;
+ char *this_dir, *prefix = NULL;
+ *name = NULL;
+ ret = osl_get_object(dir_table, dir_table_row, DT_NAME, &obj);
if (ret < 0)
return ret;
- *name = obj.data;
- return 1;
+ this_dir = para_strdup((char *)obj.data);
+ ret = osl_get_object(dir_table, dir_table_row, DT_PARENT_NUM, &obj);
+ if (ret < 0)
+ goto out;
+ if (!*(uint64_t *)obj.data) {
+ *name = this_dir;
+ return 1;
+ }
+ ret = get_dir_name_by_number((uint64_t *)obj.data, &prefix);
+ if (ret < 0)
+ goto out;
+ *name = make_message("%s/%s", prefix, this_dir);
+ free(prefix);
+ ret = 1;
+out:
+ free(this_dir);
+ return ret;
}
const uint64_t size_unit_divisors[] = {
if (!gsi->count && !summary)
return -E_LOOP_COMPLETE;
if (gsi->count && (gsi->flags & GSF_PRINT_DIRNAME)) {
- ret = get_dir_name(row, &dirname);
+ ret = get_dir_name_of_row(row, &dirname);
if (ret < 0)
return ret;
printf("%s%s", dirname,
static int user_stats_loop_function(struct osl_row *row, void *data)
{
struct user_stats_info *usi = data;
- struct osl_row *dir_row;
struct osl_object obj;
int ret, summary = usi->flags & GSF_COMPUTE_SUMMARY;
char formated_value[25];
ret = osl_get_object(usi->ui->table, row, UT_DIR_NUM, &obj);
if (ret < 0)
return ret;
- ret = osl_get_row(dir_table, DT_NUM, &obj, &dir_row);
+ ret = get_dir_name_by_number((uint64_t *)obj.data, &dirname);
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%s",
dirname,
(usi->flags & (USF_PRINT_FILES | USF_PRINT_BYTES))?
static int com_create()
{
+ uint64_t zero = 0ULL;
int ret = create_tables();
+
if (ret < 0)
return ret;
ret = open_dir_table();
if (ret < 0)
return ret;
- ret = scan_dir(conf.base_dir_arg);
+ ret = scan_dir(conf.base_dir_arg, &zero);
if (ret < 0)
goto out;
ret = write_uid_list();
ret = read_uid_file();
if (ret < 0)
return ret;
- print_statistics();
+ ret = print_statistics();
close_all_tables();
- return 1;
+ return ret;
}
static int check_args(void)
projects / adu.git / blobdiff