X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.h;h=6facf65adf7052ee6c282d7c719fcdc25d6189e6;hp=b59eff22a227ffcb52b7bad11d81a547a925e1e3;hb=5aff98df1f754cd809b88051caad99c58b50dfab;hpb=0bf41495dd9e04585be10794d7745a5baa7165a5 diff --git a/src/lookup_table.h b/src/lookup_table.h index b59eff22..6facf65a 100644 --- a/src/lookup_table.h +++ b/src/lookup_table.h @@ -2,6 +2,7 @@ #define _WIMLIB_LOOKUP_TABLE_H #include "wimlib_internal.h" #include "dentry.h" +#include "sha1.h" #include /* Size of each lookup table entry in the WIM file. */ @@ -16,20 +17,25 @@ * offsets and sizes of uncompressed or compressed file resources. It is * implemented as a hash table. */ struct lookup_table { - struct lookup_table_entry **array; + struct hlist_head *array; u64 num_entries; u64 capacity; }; struct wimlib_fd; - -/* An entry in the lookup table in the WIM file. */ +/* + * An entry in the lookup table in the WIM file. + * + * It is used to find data streams for files in the WIM. + * + * The lookup_table_entry for a given dentry in the WIM is found using the SHA1 + * message digest field. + */ struct lookup_table_entry { - /* The next struct lookup_table_entry in the hash bucket. NULL if this is the - * last one. */ - struct lookup_table_entry *next; + /* List of lookup table entries in this hash bucket */ + struct hlist_node hash_list; /* @resource_entry is read from the lookup table in the WIM * file; it says where to find the file resource in the WIM @@ -50,7 +56,7 @@ struct lookup_table_entry { union { /* SHA1 hash of the file resource pointed to by this lookup * table entry */ - u8 hash[WIM_HASH_SIZE]; + u8 hash[SHA1_HASH_SIZE]; /* First 4 or 8 bytes of the SHA1 hash, used for inserting the * entry into the hash table. Since the SHA1 hashes can be @@ -83,7 +89,10 @@ struct lookup_table_entry { /* Compression type used in other WIM. */ int other_wim_ctype; }; - struct { + + struct { /* Used for wimlib_mount */ + + /* File descriptors table for this data stream */ struct wimlib_fd **fds; u16 num_allocated_fds; u16 num_opened_fds; @@ -101,22 +110,35 @@ struct lookup_table_entry { * output_resource_entry is the struct resource_entry for the position of the * file resource when written to the output file. */ u32 out_refcnt; - union { - struct resource_entry output_resource_entry; - struct { - struct list_head staging_list; - struct list_head lte_group_list; - }; - }; + struct resource_entry output_resource_entry; + + /* Circular linked list of streams that share the same lookup table + * entry + * + * This list of streams may include streams from different hard link + * sets that happen to be the same. */ + struct list_head lte_group_list; + + /* List of lookup table entries that correspond to streams that have + * been extracted to the staging directory when modifying a read-write + * mounted WIM. */ + struct list_head staging_list; }; + extern struct lookup_table *new_lookup_table(size_t capacity); extern void lookup_table_insert(struct lookup_table *table, struct lookup_table_entry *lte); -extern void lookup_table_unlink(struct lookup_table *table, - struct lookup_table_entry *lte); +/* Unlinks a lookup table entry from the table; does not free it. */ +static inline void lookup_table_unlink(struct lookup_table *table, + struct lookup_table_entry *lte) +{ + hlist_del(<e->hash_list); + table->num_entries--; +} + extern struct lookup_table_entry * lookup_table_decrement_refcnt(struct lookup_table* table, const u8 hash[]); @@ -133,7 +155,7 @@ extern int for_lookup_table_entry(struct lookup_table *table, void *arg); extern struct lookup_table_entry * -__lookup_resource(const struct lookup_table *lookup_table, const u8 hash[]); +__lookup_resource(const struct lookup_table *table, const u8 hash[]); extern int lookup_resource(WIMStruct *w, const char *path, int lookup_flags, struct dentry **dentry_ret, @@ -142,7 +164,7 @@ extern int lookup_resource(WIMStruct *w, const char *path, extern int zero_out_refcnts(struct lookup_table_entry *entry, void *ignore); -extern int print_lookup_table_entry(struct lookup_table_entry *entry, void *ignore); +extern void print_lookup_table_entry(struct lookup_table_entry *entry); extern int read_lookup_table(FILE *fp, u64 offset, u64 size, struct lookup_table **table_ret); @@ -153,8 +175,7 @@ extern int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out) extern void free_lookup_table_entry(struct lookup_table_entry *lte); -extern void resolve_lookup_table_entries(struct dentry *root, - struct lookup_table *table); +extern int dentry_resolve_ltes(struct dentry *dentry, void *__table); /* Writes the lookup table to the output file. */ static inline int write_lookup_table(struct lookup_table *table, FILE *out) @@ -176,4 +197,118 @@ static inline struct resource_entry* wim_metadata_resource_entry(WIMStruct *w) w->current_image - 1].metadata_lte->resource_entry; } +static inline struct lookup_table_entry * +dentry_stream_lte_resolved(const struct dentry *dentry, unsigned stream_idx) +{ + wimlib_assert(dentry->resolved); + wimlib_assert(stream_idx <= dentry->num_ads); + if (stream_idx == 0) + return dentry->lte; + else + return dentry->ads_entries[stream_idx - 1].lte; +} + +static inline struct lookup_table_entry * +dentry_stream_lte_unresolved(const struct dentry *dentry, unsigned stream_idx, + const struct lookup_table *table) +{ + wimlib_assert(!dentry->resolved); + wimlib_assert(stream_idx <= dentry->num_ads); + if (!table) + return NULL; + if (stream_idx == 0) + return __lookup_resource(table, dentry->hash); + else + return __lookup_resource(table, + dentry->ads_entries[ + stream_idx - 1].hash); +} +/* + * Returns the lookup table entry for stream @stream_idx of the dentry, where + * stream_idx = 0 means the default un-named file stream, and stream_idx >= 1 + * corresponds to an alternate data stream. + * + * This works for both resolved and un-resolved dentries. + */ +static inline struct lookup_table_entry * +dentry_stream_lte(const struct dentry *dentry, unsigned stream_idx, + const struct lookup_table *table) +{ + if (dentry->resolved) + return dentry_stream_lte_resolved(dentry, stream_idx); + else + return dentry_stream_lte_unresolved(dentry, stream_idx, table); +} + + +static inline const u8 *dentry_stream_hash_unresolved(const struct dentry *dentry, + unsigned stream_idx) +{ + wimlib_assert(!dentry->resolved); + wimlib_assert(stream_idx <= dentry->num_ads); + if (stream_idx == 0) + return dentry->hash; + else + return dentry->ads_entries[stream_idx - 1].hash; +} + +static inline const u8 *dentry_stream_hash_resolved(const struct dentry *dentry, + unsigned stream_idx) +{ + struct lookup_table_entry *lte; + lte = dentry_stream_lte_resolved(dentry, stream_idx); + if (lte) + return lte->hash; + else + return NULL; +} + +/* + * Returns the hash for stream @stream_idx of the dentry, where stream_idx = 0 + * means the default un-named file stream, and stream_idx >= 1 corresponds to an + * alternate data stream. + * + * This works for both resolved and un-resolved dentries. + */ +static inline const u8 *dentry_stream_hash(const struct dentry *dentry, + unsigned stream_idx) +{ + if (dentry->resolved) + return dentry_stream_hash_resolved(dentry, stream_idx); + else + return dentry_stream_hash_unresolved(dentry, stream_idx); +} + +static inline struct lookup_table_entry * +dentry_first_lte_resolved(const struct dentry *dentry) +{ + struct lookup_table_entry *lte; + wimlib_assert(dentry->resolved); + + for (unsigned i = 0; i <= dentry->num_ads; i++) { + lte = dentry_stream_lte_resolved(dentry, i); + if (lte) + return lte; + } + return NULL; +} + +static inline struct lookup_table_entry * +dentry_first_lte_unresolved(const struct dentry *dentry, + const struct lookup_table *table) +{ + struct lookup_table_entry *lte; + wimlib_assert(!dentry->resolved); + + for (unsigned i = 0; i <= dentry->num_ads; i++) { + lte = dentry_stream_lte_unresolved(dentry, i, table); + if (lte) + return lte; + } + return NULL; +} + +extern struct lookup_table_entry * +dentry_first_lte(const struct dentry *dentry, const struct lookup_table *table); + #endif