]> wimlib.net Git - wimlib/blobdiff - src/hardlink.c
wimfs_write(), dentry_to_stbuf()
[wimlib] / src / hardlink.c
index a5d8b9fae05fae57f56dae0fab55262bcb9456ef..4640c9cf12524471f7efb92b977e5c8ecaf73358 100644 (file)
@@ -6,20 +6,40 @@
 struct link_group {
        u64 link_group_id;
        struct link_group *next;
-       struct list_head dentry_list;
+       struct list_head *dentry_list;
 };
 
 struct link_group_table {
        struct link_group **array;
        u64 num_entries;
        u64 capacity;
+       struct link_group *singles;
 };
 
 #include <sys/mman.h>
 
 struct link_group_table *new_link_group_table(u64 capacity)
 {
-       return (struct link_group_table*)new_lookup_table(capacity);
+       struct link_group_table *table;
+       struct link_group **array;
+
+       table = MALLOC(sizeof(struct link_group_table));
+       if (!table)
+               goto err;
+       array = CALLOC(capacity, sizeof(array[0]));
+       if (!array) {
+               FREE(table);
+               goto err;
+       }
+       table->num_entries = 0;
+       table->capacity = capacity;
+       table->array = array;
+       table->singles = NULL;
+       return table;
+err:
+       ERROR("Failed to allocate memory for link group table with capacity %zu",
+             capacity);
+       return NULL;
 }
 
 /* Insert a dentry into the hard link group table based on its hard link group
@@ -37,7 +57,18 @@ int link_group_table_insert(struct dentry *dentry, struct link_group_table *tabl
        struct link_group *group;
 
        if (dentry->hard_link == 0) {
+               /* Single group--- Add to the singles list (we can't put it in
+                * the table itself because all the singles have a link group ID
+                * of 0) */
+               group = MALLOC(sizeof(struct link_group));
+               if (!group)
+                       return WIMLIB_ERR_NOMEM;
+               DEBUG("Insert single group `%s'", dentry->full_path_utf8);
+               group->link_group_id = 0;
+               group->next          = table->singles;
+               table->singles       = group;
                INIT_LIST_HEAD(&dentry->link_group_list);
+               group->dentry_list = &dentry->link_group_list;
                return 0;
        }
 
@@ -46,7 +77,7 @@ int link_group_table_insert(struct dentry *dentry, struct link_group_table *tabl
        group = table->array[pos];
        while (group) {
                if (group->link_group_id == dentry->hard_link) {
-                       list_add(&dentry->link_group_list, &group->dentry_list);
+                       list_add(&dentry->link_group_list, group->dentry_list);
                        return 0;
                }
                group = group->next;
@@ -59,8 +90,8 @@ int link_group_table_insert(struct dentry *dentry, struct link_group_table *tabl
                return WIMLIB_ERR_NOMEM;
        group->link_group_id   = dentry->hard_link;
        group->next            = table->array[pos];
-       INIT_LIST_HEAD(&group->dentry_list);
-       list_add(&dentry->link_group_list, &group->dentry_list);
+       INIT_LIST_HEAD(&dentry->link_group_list);
+       group->dentry_list = &dentry->link_group_list;
        table->array[pos]      = group;
 
        /* XXX Make the table grow when too many entries have been inserted. */
@@ -92,58 +123,80 @@ void free_link_group_table(struct link_group_table *table)
  * next available link group ID. */
 u64 assign_link_groups(struct link_group_table *table)
 {
-       struct link_group *remaining_groups = NULL;
+       DEBUG("Assigning link groups");
        u64 id = 1;
        for (u64 i = 0; i < table->capacity; i++) {
                struct link_group *group = table->array[i];
                struct link_group *next_group;
                struct dentry *dentry;
+               struct list_head *cur;
                while (group) {
-                       next_group = group->next;
-                       if (list_is_singular(&group->dentry_list)) {
-                               /* Hard link group of size 1.  Change the hard
-                                * link ID to 0 and discard the link_group */
-                               dentry = container_of(group->dentry_list.next,
+                       cur = group->dentry_list;
+                       do {
+                               dentry = container_of(cur,
                                                      struct dentry,
                                                      link_group_list);
-                               dentry->hard_link = 0;
-                               FREE(group);
-                       } else {
-                               /* Hard link group of size > 1.  Assign the
-                                * dentries in the group the next available hard
-                                * link IDs and queue the group to be
-                                * re-inserted into the table. */
-                               list_for_each_entry(dentry, &group->dentry_list,
-                                                   link_group_list)
-                                       dentry->hard_link = id;
-                               group->next = remaining_groups;
-                               remaining_groups = group;
-                               id++;
-                       }
-                       group = next_group;
+                               dentry->hard_link = id;
+                               cur = cur->next;
+                       } while (cur != group->dentry_list);
+                       id++;
+                       group = group->next;
                }
        }
-       memset(table->array, 0, table->capacity * sizeof(table->array[0]));
-       table->num_entries = 0;
-       while (remaining_groups) {
-               struct link_group *group = remaining_groups;
-               size_t pos = group->link_group_id % table->capacity;
-
-               table->num_entries++;
-               group->next = table->array[pos];
-               table->array[pos] = group;
-               remaining_groups = remaining_groups->next;
+       /* Singles */
+       struct link_group *single = table->singles;
+       while (single) {
+               struct dentry *dentry;
+               struct link_group *next_single;
+               size_t pos;
+
+               next_single = single->next;
+
+               dentry = container_of(single->dentry_list, struct dentry,
+                                     link_group_list);
+               dentry->hard_link = id;
+               DEBUG("Assign single `%s'", dentry->full_path_utf8);
+
+               pos = id % table->capacity;
+               single->next = table->array[pos];
+               table->array[pos] = single;
+
+               single = next_single;
+               id++;
        }
        return id;
 }
 
-#if 0
-/* Load a dentry tree into the link group table */
-int load_link_groups(struct link_group_table *table, struct dentry *root)
+static int link_group_free_duplicate_data(struct link_group *group)
 {
-       int ret = for_dentry_in_tree(dentry, link_group_table_insert, table);
-       if (ret == 0)
-               assign_link_groups(table);
-       return ret;
+       struct list_head *head;
+       struct dentry *master;
+
+       head = group->dentry_list;
+       master = container_of(head, struct dentry, link_group_list);
+       head = head->next;
+       master->link_group_master_status = GROUP_MASTER;
+       while (head != group->dentry_list) {
+               int ret = share_dentry_ads(master,
+                                          container_of(head, struct dentry,
+                                                       link_group_list));
+               if (ret != 0)
+                       return ret;
+               head = head->next;
+       }
+       return 0;
+}
+
+int link_groups_free_duplicate_data(struct link_group_table *table)
+{
+       for (u64 i = 0; i < table->capacity; i++) {
+               struct link_group *group = table->array[i];
+               while (group) {
+                       int ret = link_group_free_duplicate_data(group);
+                       if (ret != 0)
+                               return ret;
+                       group = group->next;
+               }
+       }
+       return 0;
 }
-#endif