calculate_sha1sum_of_staging_file

diff --git a/src/dentry.c b/src/dentry.c
index eb283688eae2e837c498fed45344357647c1bd58..85a4e64b5b8edec4e58ac20e27ef52d25466dd2a 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -103,6 +103,13 @@ struct ads_entry *dentry_get_ads_entry(struct dentry *dentry,
        return NULL;
 }
 
+static void ads_entry_init(struct ads_entry *ads_entry)
+{
+       memset(ads_entry, 0, sizeof(struct ads_entry));
+       INIT_LIST_HEAD(&ads_entry->lte_group_list.list);
+       ads_entry->lte_group_list.type = STREAM_TYPE_ADS;
+}
+
 /* Add an alternate stream entry to a dentry and return a pointer to it, or NULL
  * on failure. */
 struct ads_entry *dentry_add_ads(struct dentry *dentry, const char *stream_name)
@@ -116,18 +123,20 @@ struct ads_entry *dentry_add_ads(struct dentry *dentry, const char *stream_name)
        if (!ads_entries)
                return NULL;
 
+       memcpy(ads_entries, dentry->ads_entries,
+              (num_ads - 1) * sizeof(struct ads_entry));
+
        new_entry = &ads_entries[num_ads - 1];
        if (change_ads_name(new_entry, stream_name) != 0) {
                FREE(ads_entries);
                return NULL;
        }
+       ads_entry_init(new_entry);
 
-       memcpy(ads_entries, dentry->ads_entries,
-              (num_ads - 1) * sizeof(struct ads_entry));
        FREE(dentry->ads_entries);
        dentry->ads_entries = ads_entries;
        dentry->num_ads = num_ads;
-       return memset(new_entry, 0, sizeof(struct ads_entry));
+       return new_entry;
 }
 
 void dentry_remove_ads(struct dentry *dentry, struct ads_entry *ads_entry)
@@ -456,7 +465,8 @@ static inline void dentry_common_init(struct dentry *dentry)
        memset(dentry, 0, sizeof(struct dentry));
        dentry->refcnt = 1;
        dentry->security_id = -1;
-       dentry->link_group_master_status = GROUP_SLAVE;
+       dentry->link_group_master_status = GROUP_INDEPENDENT;
+       dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
 }
 
 /* 
@@ -795,7 +805,10 @@ static int calculate_dentry_statistics(struct dentry *dentry, void *arg)
        else
                ++*stats->file_count;
 
-       lte = __lookup_resource(stats->lookup_table, dentry->hash);
+       if (dentry->resolved)
+               lte = dentry->lte;
+       else
+               lte = __lookup_resource(stats->lookup_table, dentry->hash);
        i = 0;
        while (1) {
                if (lte) {
@@ -1132,6 +1145,7 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
 {
        u8 *orig_p = p;
        unsigned padding;
+       const u8 *hash;
 
        p = put_u64(p, dentry->length);
        p = put_u32(p, dentry->attributes);
@@ -1142,7 +1156,11 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
        p = put_u64(p, dentry->creation_time);
        p = put_u64(p, dentry->last_access_time);
        p = put_u64(p, dentry->last_write_time);
-       p = put_bytes(p, WIM_HASH_SIZE, dentry->hash);
+       if (dentry->resolved && dentry->lte)
+               hash = dentry->lte->hash;
+       else
+               hash = dentry->hash;
+       p = put_bytes(p, WIM_HASH_SIZE, hash);
        if (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
                p = put_zeroes(p, 4);
                p = put_u32(p, dentry->reparse_tag);

diff --git a/src/dentry.h b/src/dentry.h
index 9612836348152aaffb50cf38e17731e5ac5ddfe9..b6aa966f0501f2d568f879bcfc17c0ee3385c1d8 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -136,10 +136,6 @@ struct dentry {
         * entry's child files.  0 if the directory entry has no children. */
        u64 subdir_offset;
 
-       /* Reserved for future disuse.  Currently ignoring these fields. */
-       u64 unused1;
-       u64 unused2;
-
        /* Timestamps for the entry.  The timestamps are the number of
         * 100-nanosecond intervals that have elapsed since 12:00 A.M., January
         * 1st, 1601, UTC. */
@@ -147,6 +143,10 @@ struct dentry {
        u64 last_access_time;
        u64 last_write_time;
 
+       /* true if the dentry's lookup table entry has been resolved (i.e. the
+        * @lte field is invalid, but the @hash field is not valid) */
+       bool resolved;
+
        /* A hash of the file's contents, or a pointer to the lookup table entry
         * for this dentry if the lookup table entries have been resolved.
         *
@@ -243,6 +243,7 @@ struct dentry {
 /* Return hash of the "unnamed" (default) data stream. */
 static inline const u8 *dentry_hash(const struct dentry *dentry)
 {
+       wimlib_assert(!dentry->resolved);
        /* If there are alternate data streams, the dentry hash field is zeroed
         * out, and we need to find the hash in the un-named data stream (should
         * be the first one, but check them in order just in case, and fall back
@@ -258,6 +259,7 @@ static inline const u8 *dentry_hash(const struct dentry *dentry)
 static inline struct lookup_table_entry *
 dentry_lte(const struct dentry *dentry)
 {
+       wimlib_assert(dentry->resolved);
        for (u16 i = 0; i < dentry->num_ads; i++)
                if (dentry->ads_entries[i].stream_name_len == 0)
                        return dentry->ads_entries[i].lte;

diff --git a/src/lookup_table.c b/src/lookup_table.c
index e0cfaaf93f6d0b1838451d1ed0e5aa8e6d365a5c..38b9947ba814f0be1e655541c6156a9f8555fddb 100644 (file)
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -66,6 +66,7 @@ struct lookup_table_entry *new_lookup_table_entry()
 
        lte->part_number  = 1;
        lte->refcnt       = 1;
+       INIT_LIST_HEAD(&lte->lte_group_list);
        return lte;
 }
 
@@ -173,7 +174,6 @@ lte_decrement_refcnt(struct lookup_table_entry *lte, struct lookup_table *table)
        return lte;
 }
 
-
 /* 
  * Calls a function on all the entries in the lookup table.  Stop early and
  * return nonzero if any call to the function returns nonzero.
@@ -390,15 +390,20 @@ int lookup_resource(WIMStruct *w, const char *path,
                    struct lookup_table_entry **lte_ret,
                    unsigned *stream_idx_ret)
 {
-       struct dentry *dentry = get_dentry(w, path);
+       struct dentry *dentry;
        struct lookup_table_entry *lte;
-       unsigned stream_idx = 0;
-       lte = dentry->lte;
+       unsigned stream_idx;
+       dentry = get_dentry(w, path);
        if (!dentry)
                return -ENOENT;
+
+       wimlib_assert(dentry->resolved);
+
+       lte = dentry->lte;
        if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
              && dentry_is_directory(dentry))
                return -EISDIR;
+       stream_idx = 0;
        if (lookup_flags & LOOKUP_FLAG_ADS_OK) {
                const char *stream_name = path_stream_name(path);
                if (stream_name) {
@@ -426,12 +431,6 @@ out:
        return 0;
 }
 
-static int lte_init_lte_group_list(struct lookup_table_entry *lte, void *ignore)
-{
-       INIT_LIST_HEAD(&lte->lte_group_list);
-       return 0;
-}
-
 /* Resolve  a dentry's lookup table entries */
 static int dentry_resolve_ltes(struct dentry *dentry, void *__table)
 {
@@ -444,8 +443,9 @@ static int dentry_resolve_ltes(struct dentry *dentry, void *__table)
                list_add(&dentry->lte_group_list.list, &lte->lte_group_list);
        else
                INIT_LIST_HEAD(&dentry->lte_group_list.list);
-       dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
        dentry->lte = lte;
+       dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
+       dentry->resolved = true;
 
        /* Alternate data streams */
        if (dentry->link_group_master_status != GROUP_SLAVE) {
@@ -468,6 +468,5 @@ static int dentry_resolve_ltes(struct dentry *dentry, void *__table)
 /* Resolve all the lookup table entries of a dentry tree */
 void resolve_lookup_table_entries(struct dentry *root, struct lookup_table *table)
 {
-       for_lookup_table_entry(table, lte_init_lte_group_list, NULL);
        for_dentry_in_tree(root, dentry_resolve_ltes, table);
 }

diff --git a/src/mount.c b/src/mount.c
index ca6197cedb491e28a732968461dcd9e9096a971f..6d21e84127c16d5086ef7305ef512eec5023dfd3 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -177,23 +177,6 @@ static void remove_dentry(struct dentry *dentry,
        put_dentry(dentry);
 }
 
-static void dentry_increment_lookup_table_refcnts(struct dentry *dentry,
-                                                 struct lookup_table *lookup_table)
-{
-       u16 i = 0;
-       const u8 *hash = dentry->hash;
-       struct lookup_table_entry *lte;
-       while (1) {
-               lte = __lookup_resource(lookup_table, hash);
-               if (lte)
-                       lte->refcnt++;
-               if (i == dentry->num_ads)
-                       break;
-               hash = dentry->ads_entries[i].hash;
-               i++;
-       }
-}
-
 /* Transfers file attributes from a struct dentry to a `stat' buffer. */
 int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf)
 {
@@ -233,34 +216,6 @@ int dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf)
        return 0;
 }
 
-#if 0
-/* Change the hash value of the main or alternate file stream in a hard link
- * group.  This needs to be done if the hash of the corresponding lookup table
- * entry was changed. */
-static void link_group_set_stream_hash(struct dentry *dentry,
-                                      unsigned stream_idx,
-                                      const u8 new_hash[])
-{
-       struct list_head *head, *cur;
-
-       if (stream_idx == 0) {
-               head = &dentry->link_group_list;
-               cur = head;
-               do {
-                       dentry = container_of(cur, struct dentry, link_group_list);
-                       memcpy(dentry->hash, new_hash, WIM_HASH_SIZE);
-                       cur = cur->next;
-               } while (cur != head);
-       } else {
-               /* Dentries in the link group share their alternate stream
-                * entries. */
-               wimlib_assert(stream_idx <= dentry->num_ads);
-               memcpy(dentry->ads_entries[stream_idx - 1].hash, new_hash,
-                      WIM_HASH_SIZE);
-       }
-}
-#endif
-
 /* Creates a new staging file and returns its file descriptor opened for
  * writing.
  *
@@ -387,7 +342,7 @@ static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte,
                                        struct dentry *dentry,
                                        unsigned stream_idx)
 {
-       INIT_LIST_HEAD(&new_lte->lte_group_list);
+       /*INIT_LIST_HEAD(&new_lte->lte_group_list);*/
        if (stream_idx == 0) {
                struct list_head *pos;
                do {
@@ -404,64 +359,6 @@ static void lte_transfer_stream_entries(struct lookup_table_entry *new_lte,
        }
 }
 
-#if 0
-/*
- * Transfers streams part of a hard-link group from @old_lte to @new_lte.
- *
- * @dentry is one of the dentries in the hard link group
- * @stream_idx is the index of the stream that we're transferring.
- */
-static void lte_transfer_stream_entries(struct lookup_table_entry *old_lte,
-                                       struct lookup_table_entry *new_lte,
-                                       struct dentry *dentry, unsigned stream_idx)
-{
-       INIT_LIST_HEAD(&new_lte->lte_group_list);
-
-       if (stream_idx == 0) {
-               struct list_head *pos;
-               struct stream_list_head *head;
-               struct dentry *other_dentry;
-               list_for_each(pos, &old_lte->lte_group_list) {
-                       head = container_of(pos, struct stream_list_head, head);
-                       if (head->type != STREAM_TYPE_NORMAL) {
-                               continue;
-                       other_dentry = container_of(head, struct dentry,
-                                                   lte_group_list);
-                       if (other_dentry->hard_link != dentry->link_group)
-                               continue;
-
-                       list_del(&other_dentry->lte_group_list.list);
-                       list_add(&other_dentry->lte_group_list.list,
-                                &new_lte->lte_group_list);
-                       other_dentry->lte = new_lte;
-               }
-       } else {
-               /* ADS entries are shared within a hard link group. */
-               lte_load_ads_entry(new_lte, &dentry->ads_entries[stream_idx - 1]);
-       }
-}
-static void lte__stream_entries(struct lookup_table_entry *new_lte,
-                                   struct dentry *dentry, unsigned stream_idx)
-{
-       INIT_LIST_HEAD(new_lte->lte_group_list);
-       if (stream_idx == 0) {
-               struct list_head *cur;
-               do {
-                       struct dentry *d;
-
-                       d = container_of(cur, struct dentry, link_group_list);
-                       list_del(&d->lte_group_list);
-                       list_add(&d->lte_group_list, &new_lte->lte_group_list);
-                       d->lte = new_lte;
-                       cur = cur->next;
-               } while (cur != &dentry->link_group_list);
-       } else {
-               lte_load_ads_entry(new_lte, &dentry->ads_entries[stream_idx - 1]);
-       }
-}
-#endif
-
-
 /* 
  * Extract a WIM resource to the staging directory.
  *
@@ -472,6 +369,10 @@ static void lte__stream_entries(struct lookup_table_entry *new_lte,
  * - Transfer fds from the old lte to the new lte, but
  *   only if they share the same hard link group as this
  *   dentry
+ * - Transfer stream entries from the old lte's list to the new lte's list.
+ *
+ *   *lte is permitted to be NULL, in which case there is no old lookup table
+ *   entry.
  */
 static int extract_resource_to_staging_dir(struct dentry *dentry,
                                           unsigned stream_idx,
@@ -512,7 +413,7 @@ static int extract_resource_to_staging_dir(struct dentry *dentry,
                        /* This hard link group is the only user of the lookup
                         * table entry, so we can re-use it. */
                        DEBUG("Re-using lookup table entry");
-                       lookup_table_remove(w->lookup_table, old_lte);
+                       lookup_table_unlink(w->lookup_table, old_lte);
                        new_lte = old_lte;
                } else {
                        DEBUG("Splitting lookup table entry "
@@ -814,46 +715,59 @@ static int close_lte_fds(struct lookup_table_entry *lte)
        return 0;
 }
 
-
-/* Calculates the SHA1 sum for @dentry if its file resource is in a staging
- * file.  Updates the SHA1 sum in the dentry and the lookup table entry.  If
- * there is already a lookup table entry with the same checksum, increment its
- * reference count and destroy the lookup entry with the updated checksum. */
-static int calculate_sha1sum_of_staging_file(struct dentry *dentry,
-                                            void *__lookup_table)
+static void lte_list_change_lte_ptr(struct lookup_table_entry *lte,
+                                   struct lookup_table_entry *newptr)
 {
-       struct lookup_table *lookup_table =  __lookup_table;
-       u8 *hash = dentry->hash;
-       u16 i = 0;
-       while (1) {
-               struct lookup_table_entry *lte = __lookup_resource(lookup_table, hash);
-               if (lte && lte->staging_file_name) {
-                       struct lookup_table_entry *existing;
-                       int ret;
-
-                       DEBUG("Calculating SHA1 hash for file `%s'",
-                             dentry->file_name_utf8);
-                       ret = sha1sum(lte->staging_file_name, lte->hash);
-                       if (ret != 0)
-                               return ret;
-
-                       lookup_table_unlink(lookup_table, lte);
-                       memcpy(hash, lte->hash, WIM_HASH_SIZE);
-                       existing = __lookup_resource(lookup_table, hash);
-                       if (existing) {
-                               DEBUG("Merging duplicate lookup table entries for file "
-                                     "`%s'", dentry->file_name_utf8);
-                               free_lookup_table_entry(lte);
-                               existing->refcnt++;
-                       } else {
-                               lookup_table_insert(lookup_table, lte);
-                       }
+       struct list_head *pos;
+       struct stream_list_head *head;
+       list_for_each(pos, &lte->lte_group_list) {
+               head = container_of(pos, struct stream_list_head, list);
+               if (head->type == STREAM_TYPE_ADS) {
+                       struct ads_entry *ads_entry;
+                       ads_entry = container_of(head, struct ads_entry, lte_group_list);
+
+                       ads_entry->lte = newptr;
+               } else {
+                       wimlib_assert(head->type == STREAM_TYPE_NORMAL);
+
+                       struct dentry *dentry;
+                       dentry = container_of(head, struct dentry, lte_group_list);
+
+                       dentry->lte = newptr;
                }
-               if (i == dentry->num_ads)
-                       break;
-               hash = dentry->ads_entries[i].hash;
-               i++;
        }
+}
+
+
+static int calculate_sha1sum_of_staging_file(struct lookup_table_entry *lte,
+                                            struct lookup_table *table)
+{
+       struct lookup_table_entry *duplicate_lte;
+       int ret;
+       u8 hash[WIM_HASH_SIZE];
+
+       ret = sha1sum(lte->staging_file_name, hash);
+       if (ret != 0)
+               return ret;
+
+       lookup_table_unlink(table, lte);
+       memcpy(lte->hash, hash, WIM_HASH_SIZE);
+
+       duplicate_lte = __lookup_resource(table, hash);
+
+       if (duplicate_lte) {
+               /* Merge duplicate lookup table entries */
+
+               lte_list_change_lte_ptr(lte, duplicate_lte);
+               duplicate_lte->refcnt += lte->refcnt;
+               list_splice(&duplicate_lte->lte_group_list,
+                           &lte->lte_group_list);
+
+               free_lookup_table_entry(lte);
+       } else {
+               lookup_table_insert(table, lte);
+       }
+
        return 0;
 }
 
@@ -861,7 +775,7 @@ static int calculate_sha1sum_of_staging_file(struct dentry *dentry,
 static int rebuild_wim(WIMStruct *w, bool check_integrity)
 {
        int ret;
-       struct lookup_table_entry *lte;
+       struct lookup_table_entry *lte, *tmp;
 
        /* Close all the staging file descriptors. */
        DEBUG("Closing all staging file descriptors.");
@@ -874,8 +788,11 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity)
        /* Calculate SHA1 checksums for all staging files, and merge unnecessary
         * lookup table entries. */
        DEBUG("Calculating SHA1 checksums for all new staging files.");
-       ret = for_dentry_in_tree(wim_root_dentry(w),
-                                calculate_sha1sum_of_staging_file, w->lookup_table);
+       list_for_each_entry_safe(lte, tmp, &staging_list, staging_list) {
+               ret = calculate_sha1sum_of_staging_file(lte, w->lookup_table);
+               if (ret != 0)
+                       return ret;
+       }
        if (ret != 0)
                return ret;
 
@@ -1036,10 +953,27 @@ static int wimfs_link(const char *to, const char *from)
                FREE(from_dentry);
                return -ENOMEM;
        }
+
+       /* Add the new dentry to the dentry list for the link group */
        list_add(&from_dentry->link_group_list, &to_dentry->link_group_list);
-       link_dentry(from_dentry, from_dentry_parent);
-       dentry_increment_lookup_table_refcnts(from_dentry, w->lookup_table);
+
+       /* Increment reference counts for the unnamed file stream and all
+        * alternate data streams. */
+       if (from_dentry->lte) {
+               list_add(&from_dentry->lte_group_list.list,
+                        &to_dentry->lte_group_list.list);
+               from_dentry->lte->refcnt++;
+       }
+       for (u16 i = 0; i < from_dentry->num_ads; i++) {
+               struct ads_entry *ads_entry = &from_dentry->ads_entries[i];
+               if (ads_entry->lte)
+                       ads_entry->lte->refcnt++;
+       }
+
+       /* The ADS entries are owned by another dentry. */
        from_dentry->link_group_master_status = GROUP_SLAVE;
+
+       link_dentry(from_dentry, from_dentry_parent);
        return 0;
 }
 
@@ -1083,6 +1017,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
        const char *stream_name;
        if ((mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_WINDOWS)
             && (stream_name = path_stream_name(path))) {
+               /* Make an alternate data stream */
                struct ads_entry *new_entry;
                struct dentry *dentry;
 
@@ -1098,6 +1033,8 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
                struct dentry *dentry, *parent;
                const char *basename;
 
+               /* Make a normal file (not an alternate data stream) */
+
                /* Make sure that the parent of @path exists and is a directory, and
                 * that the dentry named by @path does not already exist.  */
                parent = get_parent_dentry(w, path);
@@ -1113,6 +1050,7 @@ static int wimfs_mknod(const char *path, mode_t mode, dev_t rdev)
                dentry = new_dentry(basename);
                if (!dentry)
                        return -ENOMEM;
+               dentry->resolved = true;
                dentry->hard_link = next_link_group_id++;
                link_dentry(dentry, parent);
        }
@@ -1548,6 +1486,7 @@ static int wimfs_write(const char *path, const char *buf, size_t size,
        struct wimlib_fd *fd = (struct wimlib_fd*)fi->fh;
        int ret;
 
+       wimlib_assert(fd);
        wimlib_assert(fd->lte);
        wimlib_assert(fd->lte->staging_file_name);
        wimlib_assert(fd->staging_fd != -1);